Files
Danny White a31ca2bad0 fix(ui): make brand text readable across themes (#49871)
## 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>
2026-09-22 10:07:28 +10:00

334 lines
13 KiB
TypeScript

import { useParams } from 'common'
import dayjs from 'dayjs'
import { partition, uniqBy } from 'lodash'
import { MoreVertical } from 'lucide-react'
import Link from 'next/link'
import { parseAsBoolean, useQueryState } from 'nuqs'
import { useEffect, useState } from 'react'
import {
ComposableMap,
Geographies,
Geography,
Line,
Marker,
ZoomableGroup,
} from 'react-simple-maps'
import {
Badge,
Button,
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
ScrollArea,
} from 'ui'
import { TimestampInfo } from 'ui-patterns/TimestampInfo'
import { AVAILABLE_REPLICA_REGIONS } from './InstanceConfiguration.constants'
import GeographyData from './MapData.json'
import { getReadReplicaPath } from '@/components/interfaces/Settings/Infrastructure/Infrastructure.utils'
import { REPLICA_STATUS } from '@/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicas.constants'
import { RegionFlag } from '@/components/ui/RegionFlag'
import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'
import { formatDatabaseID } from '@/data/read-replicas/replicas.utils'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { useDatabaseSelectorStateSnapshot } from '@/state/database-selector'
const MapView = () => {
const { ref } = useParams()
const dbSelectorState = useDatabaseSelectorStateSnapshot()
const { projectHomepageShowInstanceSize } = useIsFeatureEnabled([
'project_homepage:show_instance_size',
])
const [mount, setMount] = useState(false)
const [zoom, setZoom] = useState<number>(1.5)
const [center, setCenter] = useState<[number, number]>([14, 7])
const [tooltip, setTooltip] = useState<{
x: number
y: number
region: { key: string; country?: string; name?: string; region?: string }
}>()
const [, setShowConnect] = useQueryState('showConnect', parseAsBoolean.withDefault(false))
const { data } = useReadReplicasQuery({ projectRef: ref })
const databases = data ?? []
const [[primary], replicas] = partition(databases, (db) => db.identifier === ref)
const primaryCoordinates = AVAILABLE_REPLICA_REGIONS.find((region) =>
primary.region.includes(region.region)
)?.coordinates ?? [0, 0]
const uniqueRegionsByReplicas = uniqBy(replicas, (r) => {
return AVAILABLE_REPLICA_REGIONS.find((region) => r.region.includes(region.region))?.key
})
const selectedRegionKey =
AVAILABLE_REPLICA_REGIONS.find((region) => region.coordinates === center)?.region ?? ''
const showRegionDetails = zoom === 2.0 && selectedRegionKey !== undefined
const selectedRegion = AVAILABLE_REPLICA_REGIONS.find(
(region) => region.region === selectedRegionKey
)
const databasesInSelectedRegion = databases
.filter((database) => database.region.includes(selectedRegionKey))
.sort((a, b) => (a.inserted_at > b.inserted_at ? 1 : 0))
.sort((database) => (database.identifier === ref ? -1 : 0))
useEffect(() => {
setTimeout(() => setMount(true), 100)
}, [])
return (
<div className="bg-studio h-[500px] relative">
<ComposableMap projectionConfig={{ scale: 155 }} className="w-full h-full">
<ZoomableGroup
className={mount ? 'transition-all duration-300' : ''}
center={center}
zoom={zoom}
minZoom={1.5}
maxZoom={2.0}
filterZoomEvent={({ constructor: { name } }) =>
!['MouseEvent', 'WheelEvent'].includes(name)
}
>
<Geographies geography={GeographyData}>
{({ geographies }) =>
geographies.map((geo) => (
<Geography
key={geo.rsmKey}
geography={geo}
strokeWidth={0.3}
pointerEvents="none"
className="fill-gray-800 stroke-gray-900 dark:fill-gray-300 dark:stroke-gray-200"
/>
))
}
</Geographies>
{uniqueRegionsByReplicas.map((database) => {
const coordinates = AVAILABLE_REPLICA_REGIONS.find((region) =>
database.region.includes(region.region)
)?.coordinates
if (coordinates !== primaryCoordinates) {
return (
<Line
key={`line-${database.identifier}-${primary.identifier}`}
from={coordinates}
to={primaryCoordinates}
stroke="white"
strokeWidth={1}
strokeLinecap="round"
strokeOpacity={0.2}
strokeDasharray={'3, 3'}
className="map-path"
/>
)
} else {
return null
}
})}
{AVAILABLE_REPLICA_REGIONS.map((region) => {
const dbs =
databases.filter((database) => database.region.includes(region.region)) ?? []
const coordinates = AVAILABLE_REPLICA_REGIONS.find(
(r) => r.region === region.region
)?.coordinates
const hasNoDatabases = dbs.length === 0
const hasPrimary = dbs.some((database) => database.identifier === ref)
const replicas = dbs.filter((database) => database.identifier !== ref) ?? []
return (
<Marker
key={region.key}
coordinates={coordinates}
onMouseEnter={() => {
setTooltip({
x: coordinates![0],
y: coordinates![1],
region: {
key: region.key,
country: region.name,
region: region.region,
name: hasNoDatabases
? undefined
: hasPrimary
? `Primary Database${
replicas.length > 0
? ` + ${replicas.length} replica${replicas.length > 1 ? 's' : ''} `
: ''
}`
: `${replicas.length} Read Replica${
replicas.length > 1 ? 's' : ''
} deployed`,
},
})
}}
onMouseLeave={() => setTooltip(undefined)}
onClick={() => {
if (coordinates) {
setCenter(coordinates)
setZoom(2.0)
}
}}
>
{selectedRegionKey === region.region && (
<circle
r={4}
className={`animate-ping ${
hasNoDatabases ? 'fill-border-stronger' : 'fill-brand-default'
}`}
/>
)}
<circle
r={4}
className={`cursor-pointer ${
hasNoDatabases
? 'fill-background-surface-300 stroke-border-stronger'
: hasPrimary
? 'fill-brand-default stroke-brand-500'
: 'fill-brand-500 stroke-brand-400'
}`}
/>
</Marker>
)
})}
{tooltip !== undefined && zoom === 1.5 && (
<Marker coordinates={[tooltip.x - 47, tooltip.y - 5]}>
<foreignObject width={220} height={66.25}>
<div className="bg-studio/50 rounded-sm border">
<div className="px-3 py-2 flex flex-col">
<div className="flex items-center gap-x-2">
<RegionFlag className="w-4" region={tooltip.region.region ?? ''} />
<p className="text-[10px]">{tooltip.region.country}</p>
</div>
<p
className={`text-[10px] ${
tooltip.region.name === undefined ? 'text-foreground-light' : ''
}`}
>
{tooltip.region.name ?? 'No databases deployed'}
</p>
</div>
</div>
</foreignObject>
</Marker>
)}
</ZoomableGroup>
</ComposableMap>
{showRegionDetails && selectedRegion && (
<div className="absolute bottom-4 right-4 flex flex-col bg-studio/50 backdrop-blur-xs border rounded-sm w-[400px]">
<div className="flex items-center justify-between py-4 px-4 border-b">
<div>
<p className="text-xs text-foreground-light">
{databasesInSelectedRegion.length} database
{databasesInSelectedRegion.length > 1 ? 's' : ''} deployed in
</p>
<p className="text-sm">{selectedRegion.name}</p>
</div>
<RegionFlag className="w-10" region={selectedRegion.region} />
</div>
{databasesInSelectedRegion.length > 0 && (
<ScrollArea style={{ height: databasesInSelectedRegion.length > 2 ? '180px' : 'auto' }}>
<ul className={`flex flex-col divide-y`}>
{databasesInSelectedRegion.map((database) => {
const created = dayjs(database.inserted_at).format('DD MMM YYYY')
return (
<li
key={database.identifier}
className="text-sm px-4 py-2 flex items-center justify-between"
>
<div className="flex flex-col gap-y-1">
<p className="flex items-center gap-x-2">
{database.identifier === ref
? 'Primary Database'
: `Read Replica ${
database.identifier.length > 0 &&
`(ID: ${formatDatabaseID(database.identifier)})`
}`}
{database.status === REPLICA_STATUS.ACTIVE_HEALTHY ? (
<Badge variant="success">Healthy</Badge>
) : database.status === REPLICA_STATUS.COMING_UP ? (
<Badge>Coming up</Badge>
) : database.status === REPLICA_STATUS.RESTARTING ? (
<Badge>Restarting</Badge>
) : database.status === REPLICA_STATUS.RESIZING ? (
<Badge>Resizing</Badge>
) : (
<Badge variant="warning">Unhealthy</Badge>
)}
</p>
<div>
<p className="text-xs text-foreground-light">
AWS{projectHomepageShowInstanceSize ? ` • ${database.size}` : ''}
</p>
{database.identifier !== ref && (
<p className="text-xs text-foreground-light">
Created on:{' '}
<TimestampInfo label={created} utcTimestamp={database.inserted_at} />
</p>
)}
</div>
</div>
{database.identifier !== ref && (
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant="text" icon={<MoreVertical />} className="px-1" />
</DropdownMenuTrigger>
<DropdownMenuContent className="w-40" side="bottom" align="end">
<DropdownMenuItem
className="gap-x-2"
disabled={database.status !== REPLICA_STATUS.ACTIVE_HEALTHY}
onClick={() => {
setShowConnect(true)
dbSelectorState.setSelectedDatabaseId(database.identifier)
}}
>
View connection string
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem className="gap-x-2" asChild>
<Link href={getReadReplicaPath(ref, database.identifier)}>
Manage replica
</Link>
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
)}
</li>
)
})}
</ul>
</ScrollArea>
)}
<div
className={`flex items-center justify-end gap-x-2 px-4 py-2 ${
databasesInSelectedRegion.length > 0 ? 'border-t' : ''
}`}
>
<Button
onClick={() => {
setCenter([14, 7])
setZoom(1.5)
}}
>
Close
</Button>
</div>
</div>
)}
</div>
)
}
export default MapView