mirror of
https://github.com/supabase/supabase.git
synced 2026-10-05 17:35:10 +03:00
## Problem Primary colour serves readable text and selected controls, but those uses need different shades. Light mode needs darker text, while dark mode needs a deeper button fill. Fixed brand green on interactive chrome also prevents a custom primary hue from carrying through the interface. Some slider tracks and selected text are hard to read. ## Solution - Keep `--primary` for accessible text and small selected indicators. Use `--primary-solid` for button fills, which need a deeper shade in dark mode. - Add `--primary-bright` for focus rings, selected control chrome, chart accents, and other interactive highlights. It follows `--primary-hue`; `brand-*` stays fixed for Supabase identity. - Make slider troughs clearer and text selection translucent with theme foreground text. - Document the split in the design-system colour guide. | Before | After | | --- | --- | | <img width="980" height="244" alt="Before: light mode primary controls" src="https://github.com/user-attachments/assets/dfae325d-0dfe-4231-8bcd-3f89c4b9d793" /> | <img width="982" height="204" alt="After: light mode primary controls" src="https://github.com/user-attachments/assets/5fdcb531-a6e3-4549-8a13-9d9a5ebe6e20" /> | | <img width="610" height="120" alt="Before: slider track" src="https://github.com/user-attachments/assets/04f768e0-51e8-4d06-9b97-c52f4a34f122" /> | <img width="622" height="126" alt="After: slider track" src="https://github.com/user-attachments/assets/95127f4e-13dc-4f0f-b63c-cf5d70a28b42" /> | | <img width="652" height="512" alt="Before: dark mode controls" src="https://github.com/user-attachments/assets/3f88de66-90cc-40ee-8cf1-b5f4eb87b09a" /> | <img width="658" height="498" alt="After: dark mode controls" src="https://github.com/user-attachments/assets/906bec30-6ca1-4614-9fb3-6cf5e5feec22" /> | ## Review instructions 1. Compare light and dark mode in the [colour usage guide](https://design-system-git-dnywh-fix-bright-brand-chrome-supabase.vercel.app/design-system/docs/color-usage#primary-and-brand-colors). Check primary ink, primary-solid, primary-bright, and fixed brand swatches. 2. In Studio, open the ‘new table’ sheet in [Table Editor](https://studio-staging-git-dnywh-fix-bright-brand-chrome-supabase.vercel.app/dashboard/project/_/editor). Tab through the new table sheet's fields and toggles. Check the focus rings, selected controls, and the sheet's edges in both themes. You do not need to save a table. 3. Select text in Studio in both themes, including a link or primary-coloured label. The selection and text should remain legible. 4. Check the [Field](https://design-system-git-dnywh-fix-bright-brand-chrome-supabase.vercel.app/design-system/docs/components/field) Price Range slider: the unused track should remain visible in both themes. The selected field card border should follow primary-bright. 5. Check the [Button](https://design-system-git-dnywh-fix-bright-brand-chrome-supabase.vercel.app/design-system/docs/components/button) and [Radio Group](https://design-system-git-dnywh-fix-bright-brand-chrome-supabase.vercel.app/design-system/docs/components/radio-group) previews. In dark mode, `primary` button fill should be deeper than primary [text](https://design-system-git-dnywh-fix-bright-brand-chrome-supabase.vercel.app/design-system/docs/color-usage#text); selected radios should remain readable.
84 lines
2.6 KiB
TypeScript
84 lines
2.6 KiB
TypeScript
import { useParams } from 'common'
|
|
import { GitMerge } from 'lucide-react'
|
|
import { useRouter } from 'next/router'
|
|
import { toast } from 'sonner'
|
|
|
|
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
|
|
import { useBranchUpdateMutation } from '@/data/branches/branch-update-mutation'
|
|
import { useBranchesQuery } from '@/data/branches/branches-query'
|
|
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
|
|
import { useTrack } from '@/lib/telemetry/track'
|
|
|
|
export const MergeRequestButton = () => {
|
|
const { ref } = useParams()
|
|
const router = useRouter()
|
|
const { data: projectDetails } = useSelectedProjectQuery()
|
|
const track = useTrack()
|
|
|
|
const projectRef = projectDetails?.parent_project_ref || ref
|
|
|
|
const { data: branches } = useBranchesQuery({ projectRef }, { enabled: Boolean(projectDetails) })
|
|
|
|
const { mutate: updateBranch, isPending: isUpdating } = useBranchUpdateMutation({
|
|
onError: () => {
|
|
toast.error(`Failed to open merge request`)
|
|
},
|
|
})
|
|
|
|
const selectedBranch = branches?.find((branch) => branch.project_ref === ref)
|
|
|
|
if (!projectRef || !selectedBranch || selectedBranch.is_default || selectedBranch.git_branch)
|
|
return null
|
|
|
|
const hasReviewRequested = !!selectedBranch.review_requested_at
|
|
const buttonLabel = hasReviewRequested ? 'Review merge request' : 'Open merge request'
|
|
|
|
const handleClick = () => {
|
|
track('header_merge_request_button_clicked', { hasReviewRequested })
|
|
if (hasReviewRequested) {
|
|
router.push(`/project/${selectedBranch.project_ref}/merge`)
|
|
} else {
|
|
updateBranch(
|
|
{
|
|
branchRef: selectedBranch.project_ref,
|
|
projectRef,
|
|
requestReview: true,
|
|
},
|
|
{
|
|
onSuccess: () => {
|
|
toast.success('Merge request created')
|
|
router.push(`/project/${selectedBranch.project_ref}/merge`)
|
|
track('branch_create_merge_request_button_clicked', {
|
|
branchType: selectedBranch.persistent ? 'persistent' : 'preview',
|
|
origin: 'header',
|
|
})
|
|
},
|
|
}
|
|
)
|
|
}
|
|
}
|
|
|
|
return (
|
|
<ButtonTooltip
|
|
className="rounded-full w-[26px] h-[26px]"
|
|
onClick={handleClick}
|
|
loading={isUpdating}
|
|
tooltip={{
|
|
content: {
|
|
text: buttonLabel,
|
|
side: 'bottom',
|
|
align: 'center',
|
|
},
|
|
}}
|
|
icon={
|
|
<div className="relative">
|
|
{hasReviewRequested && (
|
|
<span className="w-1 h-1 absolute top-0 right-0 rounded-full bg-primary-bright" />
|
|
)}
|
|
<GitMerge size={16} strokeWidth={1.5} />
|
|
</div>
|
|
}
|
|
/>
|
|
)
|
|
}
|