mirror of
https://github.com/supabase/supabase.git
synced 2026-10-08 10:55:06 +03:00
## What kind of change does this PR introduce? Bug fix and design-system update. Resolves DEPR-316. Follow-up rename (`text-brand` → `text-primary`) is in a dedicated PR (https://github.com/supabase/supabase/pull/50564) stacked on this one. ## What is the current behavior? `text-brand` resolves to the canonical bright brand green in places that need readable text, which fails WCAG AA on light surfaces. A separate `text-brand-display` token adds another green for large type. ## What is the new behavior? - `text-brand` maps to accessible `--primary` (light mode darkened to meet ~4.5:1 AA) - `--hue` / `--primary-hue` aligned to 157.5 - `text-brand-display` removed; former display callsites use `text-brand` - Bright fills/borders stay on `brand-default` - Design-system colour and typography docs updated | Before | After | | --- | --- | | <img width="514" height="112" alt="CleanShot 2026-09-02 at 11 13 09@2x" src="https://github.com/user-attachments/assets/4e0138a9-a32d-4e4c-a426-90736706e1e7" /> | <img width="512" height="138" alt="CleanShot 2026-09-21 at 11 42 05@2x" src="https://github.com/user-attachments/assets/164cc5b1-a0c5-4e93-95f1-80016641a114" /> | | <img width="864" height="266" alt="CleanShot 2026-09-02 at 11 13 53@2x" src="https://github.com/user-attachments/assets/3c1ca53f-bf9e-431e-bc15-816b4a275b8e" /> | <img width="882" height="248" alt="CleanShot 2026-09-21 at 11 41 37@2x" src="https://github.com/user-attachments/assets/24828e7b-ed6b-44cb-b9dc-becc3398bdfc" /> | | <img width="782" height="692" alt="CleanShot 2026-09-02 at 11 16 30@2x" src="https://github.com/user-attachments/assets/fc871977-77bc-47fb-9e0e-9284e0ecd5cc" /> | <img width="730" height="690" alt="CleanShot 2026-09-21 at 11 42 52@2x" src="https://github.com/user-attachments/assets/bf479515-d5f9-471e-b82d-f097c0f4b56c" /> | | <img width="480" height="306" alt="CleanShot 2026-09-02 at 11 18 53@2x" src="https://github.com/user-attachments/assets/03f341f4-f02e-44f8-a2b2-8c31670d0427" /> | <img width="470" height="300" alt="CleanShot 2026-09-21 at 11 43 19@2x" src="https://github.com/user-attachments/assets/9df18217-d5e6-48b8-ba0b-579d2664b94b" /> | | <img width="960" height="300" alt="CleanShot 2026-09-02 at 11 32 04@2x" src="https://github.com/user-attachments/assets/6b1d9373-7a71-4247-81ff-26441604b09d" /> | <img width="980" height="306" alt="CleanShot 2026-09-21 at 11 44 13@2x" src="https://github.com/user-attachments/assets/41ad4784-02ec-4b29-b860-32af9fa79aa8" /> | | <img width="924" height="214" alt="CleanShot 2026-09-02 at 11 34 44@2x" src="https://github.com/user-attachments/assets/1de661fe-c7b6-499b-a94f-e4737436ec79" /> | <img width="752" height="162" alt="CleanShot 2026-09-21 at 11 44 56@2x" src="https://github.com/user-attachments/assets/1811890f-0660-4445-84e9-447720954fa1" /> | ## To test Test each callsite **in light mode** (dark mode is largely unchanged). ### WWW - [Homepage](https://zone-www-dot-com-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/): “Scale to millions” uses readable brand text (display token is gone) - [Careers](https://zone-www-dot-com-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/careers): small “Careers” eyebrow readable; green dividers stay bright `brand-default` - [Contact](https://zone-www-dot-com-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/contact-us): email / policy links use readable brand text - [Regions](https://zone-www-dot-com-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/regions): “Ask about early access to BYOC” readable ### Docs - [Docs homepage](https://docs-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/docs): “DOCS” wordmark and resource links readable - [Database overview](https://docs-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/docs/guides/database/overview): nav / footer brand links readable - [JavaScript reference](https://docs-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/docs/reference/javascript/introduction): active sidebar treatment readable ### Design system - [Typography](https://design-system-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/docs/typography): documents `text-brand` only (no display) - [Colour usage](https://design-system-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/docs/color-usage): `text-brand` vs `bg-brand-default` - [Design-system homepage](https://design-system-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/): brand text examples across themes ### Studio - [Auth providers](https://studio-staging-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/dashboard/project/_/auth/providers): enabled provider badge text readable; status dot stays bright - [Database policies](https://studio-staging-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/dashboard/project/_/database/policies?new=true): template hover text more legible - [Database connections](https://studio-staging-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/dashboard/project/_/observability/connections): “Live” status readable; animated dot stays bright green --------- Co-authored-by: Joshen Lim <joshenlimek@gmail.com>
221 lines
7.9 KiB
TypeScript
221 lines
7.9 KiB
TypeScript
import { ChevronDown } from 'lucide-react'
|
|
import { useMemo, useState, type ReactNode } from 'react'
|
|
import { cn, Collapsible, CollapsibleContent, CollapsibleTrigger, SuccessCheck } from 'ui'
|
|
|
|
import {
|
|
CreateOrganizationCard,
|
|
OrganizationCard,
|
|
} from '@/components/interfaces/Organization/OrganizationCard'
|
|
import { useLastVisitedOrganization } from '@/hooks/misc/useLastVisitedOrganization'
|
|
import type { Organization } from '@/types'
|
|
|
|
const VISIBLE_ORGANIZATIONS_LIMIT = 3
|
|
const CONNECT_DISCLOSURE_TRIGGER_CLASSNAME = cn(
|
|
'mx-auto flex h-7 cursor-pointer items-center justify-center gap-1.5 rounded-md px-2',
|
|
'text-xs text-foreground-lighter transition-colors',
|
|
'hover:bg-surface-200 hover:text-foreground',
|
|
'[&[data-state=open]>svg]:-rotate-180!'
|
|
)
|
|
|
|
export const OrganizationSelector = ({
|
|
organizations,
|
|
unavailableOrganizations = [],
|
|
selectedSlug,
|
|
disabled = false,
|
|
description,
|
|
createLabel,
|
|
createHrefParams,
|
|
onCreate,
|
|
onSelect,
|
|
getOrganizationDescription,
|
|
getUnavailableOrganizationDescription,
|
|
unavailableReason,
|
|
}: {
|
|
organizations: Organization[]
|
|
unavailableOrganizations?: Organization[]
|
|
selectedSlug?: string | null
|
|
disabled?: boolean
|
|
description?: ReactNode
|
|
createLabel?: string
|
|
createHrefParams?: { [key: string]: string }
|
|
onCreate?: () => void
|
|
onSelect: (slug: string) => void
|
|
getOrganizationDescription?: (organization: Organization) => ReactNode
|
|
getUnavailableOrganizationDescription?: (organization: Organization) => ReactNode
|
|
unavailableReason?: ReactNode
|
|
}) => {
|
|
const [showMore, setShowMore] = useState(false)
|
|
const { lastVisitedOrganization } = useLastVisitedOrganization()
|
|
|
|
const { visibleOrganizations, overflowOrganizations } = useMemo(() => {
|
|
const lastVisitedOrg = organizations.find(({ slug }) => slug === lastVisitedOrganization)
|
|
const selectedIndex = organizations.findIndex(({ slug }) => slug === selectedSlug)
|
|
const selectedInOverflow = selectedIndex >= VISIBLE_ORGANIZATIONS_LIMIT
|
|
|
|
if (!!lastVisitedOrg) {
|
|
const withoutLastVisited = organizations.filter(
|
|
({ slug }) => slug !== lastVisitedOrganization
|
|
)
|
|
return {
|
|
visibleOrganizations: [
|
|
lastVisitedOrg,
|
|
...withoutLastVisited.slice(0, VISIBLE_ORGANIZATIONS_LIMIT - 1),
|
|
],
|
|
overflowOrganizations: withoutLastVisited.slice(VISIBLE_ORGANIZATIONS_LIMIT - 1),
|
|
}
|
|
}
|
|
|
|
if (!selectedInOverflow || !selectedSlug) {
|
|
return {
|
|
visibleOrganizations: organizations.slice(0, VISIBLE_ORGANIZATIONS_LIMIT),
|
|
overflowOrganizations: organizations.slice(VISIBLE_ORGANIZATIONS_LIMIT),
|
|
}
|
|
}
|
|
|
|
const selected = organizations[selectedIndex]
|
|
const withoutSelected = organizations.filter(({ slug }) => slug !== selectedSlug)
|
|
|
|
return {
|
|
visibleOrganizations: [
|
|
...withoutSelected.slice(0, VISIBLE_ORGANIZATIONS_LIMIT - 1),
|
|
selected,
|
|
],
|
|
overflowOrganizations: withoutSelected.slice(VISIBLE_ORGANIZATIONS_LIMIT - 1),
|
|
}
|
|
}, [lastVisitedOrganization, organizations, selectedSlug])
|
|
|
|
const hasOverflow = overflowOrganizations.length > 0
|
|
const hasUnavailableOrganizations = unavailableOrganizations.length > 0
|
|
|
|
return (
|
|
<section className="space-y-2" aria-label="Organizations">
|
|
<div className="space-y-1">
|
|
<p className="text-xs font-medium uppercase tracking-wider text-foreground-light">
|
|
Organization
|
|
</p>
|
|
{description && <p className="text-xs text-foreground-lighter pr-4">{description}</p>}
|
|
</div>
|
|
<div className="space-y-2">
|
|
{visibleOrganizations.map((organization) => (
|
|
<ConnectOrganizationButton
|
|
key={organization.slug}
|
|
organization={organization}
|
|
selected={selectedSlug === organization.slug}
|
|
disabled={disabled}
|
|
onClick={() => onSelect(organization.slug)}
|
|
description={
|
|
getOrganizationDescription?.(organization) ?? getPlanDescription(organization)
|
|
}
|
|
/>
|
|
))}
|
|
|
|
{!!createLabel && (!!createHrefParams || !!onCreate) && (
|
|
<CreateOrganizationCard
|
|
params={createHrefParams}
|
|
label={createLabel}
|
|
disabled={disabled}
|
|
onClick={onCreate}
|
|
/>
|
|
)}
|
|
|
|
{hasOverflow && (
|
|
<Collapsible open={showMore} onOpenChange={setShowMore}>
|
|
<CollapsibleTrigger className={CONNECT_DISCLOSURE_TRIGGER_CLASSNAME}>
|
|
<span>{showMore ? 'Show fewer' : `Show ${overflowOrganizations.length} more`}</span>
|
|
<ChevronDown className="size-3.5 transition-transform" />
|
|
</CollapsibleTrigger>
|
|
<CollapsibleContent className="data-closed:animate-collapsible-up data-open:animate-collapsible-down overflow-hidden">
|
|
<div className="space-y-2 pt-1">
|
|
{overflowOrganizations.map((organization) => (
|
|
<ConnectOrganizationButton
|
|
key={organization.slug}
|
|
organization={organization}
|
|
selected={selectedSlug === organization.slug}
|
|
disabled={disabled}
|
|
onClick={() => onSelect(organization.slug)}
|
|
description={
|
|
getOrganizationDescription?.(organization) ?? getPlanDescription(organization)
|
|
}
|
|
/>
|
|
))}
|
|
</div>
|
|
</CollapsibleContent>
|
|
</Collapsible>
|
|
)}
|
|
|
|
{hasUnavailableOrganizations && (
|
|
<Collapsible>
|
|
<CollapsibleTrigger className={CONNECT_DISCLOSURE_TRIGGER_CLASSNAME}>
|
|
<span>Organizations that can't be linked</span>
|
|
<ChevronDown className="size-3.5 transition-transform" />
|
|
</CollapsibleTrigger>
|
|
<CollapsibleContent className="data-closed:animate-collapsible-up data-open:animate-collapsible-down overflow-hidden">
|
|
<div className="space-y-2 pt-1">
|
|
{unavailableOrganizations.map((organization) => (
|
|
<ConnectOrganizationButton
|
|
key={organization.slug}
|
|
organization={organization}
|
|
disabled
|
|
description={
|
|
getUnavailableOrganizationDescription?.(organization) ??
|
|
getPlanDescription(organization)
|
|
}
|
|
/>
|
|
))}
|
|
{unavailableReason && (
|
|
<p className="mx-auto max-w-xs text-center text-xs text-foreground-lighter text-balance">
|
|
{unavailableReason}
|
|
</p>
|
|
)}
|
|
</div>
|
|
</CollapsibleContent>
|
|
</Collapsible>
|
|
)}
|
|
</div>
|
|
</section>
|
|
)
|
|
}
|
|
|
|
const getPlanDescription = (organization: Organization) => `${organization.plan.name} Plan`
|
|
|
|
const ConnectOrganizationButton = ({
|
|
organization,
|
|
selected,
|
|
disabled,
|
|
onClick,
|
|
description,
|
|
}: {
|
|
organization: Organization
|
|
selected?: boolean
|
|
disabled?: boolean
|
|
onClick?: () => void
|
|
description?: ReactNode
|
|
}) => (
|
|
<button
|
|
type="button"
|
|
tabIndex={disabled ? -1 : 0}
|
|
disabled={disabled}
|
|
onClick={onClick}
|
|
aria-pressed={selected}
|
|
className={cn(
|
|
'group relative block w-full cursor-pointer text-left disabled:cursor-not-allowed disabled:opacity-50',
|
|
disabled && 'pointer-events-none'
|
|
)}
|
|
>
|
|
<OrganizationCard
|
|
isLink={false}
|
|
organization={organization}
|
|
description={description}
|
|
className={cn(
|
|
'pointer-events-none shadow-none transition-colors',
|
|
!disabled && !selected && 'group-hover:border-default group-hover:bg-surface-200',
|
|
selected &&
|
|
'border-brand-default bg-brand-200/20 dark:bg-brand-300 pr-10 group-hover:border-brand-default group-hover:bg-brand-200/20'
|
|
)}
|
|
/>
|
|
{selected && (
|
|
<SuccessCheck className="pointer-events-none absolute right-3 top-1/2 -translate-y-1/2" />
|
|
)}
|
|
</button>
|
|
)
|