mirror of
https://github.com/supabase/supabase.git
synced 2026-10-08 19:05: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>
208 lines
5.7 KiB
TypeScript
208 lines
5.7 KiB
TypeScript
import {
|
|
BaseEdge,
|
|
Edge,
|
|
EdgeLabelRenderer,
|
|
EdgeProps,
|
|
getSmoothStepPath,
|
|
Position,
|
|
useReactFlow,
|
|
} from '@xyflow/react'
|
|
import { ArrowLeft, ArrowRight } from 'lucide-react'
|
|
import { memo, useCallback, useState } from 'react'
|
|
import { Badge, cn } from 'ui'
|
|
|
|
import { useSchemaGraphContext } from './SchemaGraphContext'
|
|
import { EdgeData } from './Schemas.constants'
|
|
import { useQuerySchemaState } from '@/hooks/misc/useSchemaQueryState'
|
|
|
|
const DefaultEdgeComponent = ({
|
|
id,
|
|
animated,
|
|
data,
|
|
deletable,
|
|
selectable,
|
|
source,
|
|
sourceX,
|
|
sourceY,
|
|
sourceHandleId,
|
|
sourcePosition = Position.Bottom,
|
|
target,
|
|
targetX,
|
|
targetY,
|
|
targetHandleId,
|
|
targetPosition = Position.Top,
|
|
selected,
|
|
pathOptions,
|
|
...props
|
|
}: EdgeProps<Edge<EdgeData>>) => {
|
|
const { isDownloading } = useSchemaGraphContext()
|
|
const [edgePath, labelX, labelY] = getSmoothStepPath({
|
|
sourceX,
|
|
sourceY,
|
|
targetX,
|
|
targetY,
|
|
sourcePosition,
|
|
targetPosition,
|
|
borderRadius: pathOptions?.borderRadius,
|
|
offset: pathOptions?.offset,
|
|
stepPosition: pathOptions?.stepPosition,
|
|
})
|
|
return (
|
|
<>
|
|
<BaseEdge
|
|
id={id}
|
|
path={edgePath}
|
|
className={cn(
|
|
selected ? 'stroke-brand-default!' : isDownloading ? 'stroke-black!' : undefined
|
|
)}
|
|
stroke="#000000"
|
|
{...props}
|
|
/>
|
|
{data && selected ? (
|
|
<EdgeRelationInfo
|
|
source={source}
|
|
target={target}
|
|
edgePath={edgePath}
|
|
labelX={labelX}
|
|
labelY={labelY}
|
|
sourceX={sourceX}
|
|
targetX={targetX}
|
|
data={data}
|
|
/>
|
|
) : null}
|
|
</>
|
|
)
|
|
}
|
|
|
|
export const DefaultEdge = memo(DefaultEdgeComponent)
|
|
|
|
const EdgeRelationInfo = ({
|
|
data,
|
|
source,
|
|
target,
|
|
labelX,
|
|
labelY,
|
|
targetX,
|
|
sourceX,
|
|
}: {
|
|
data: EdgeData
|
|
edgePath: string
|
|
source: string
|
|
target: string
|
|
labelX: number
|
|
labelY: number
|
|
sourceX: number
|
|
targetX: number
|
|
}) => {
|
|
const [show, setShow] = useState(false)
|
|
const reactFlowInstance = useReactFlow()
|
|
|
|
const checkIfShouldBeDisplayed = useCallback(
|
|
(relationInfoElement: HTMLDivElement | null) => {
|
|
if (!relationInfoElement) return
|
|
const sourceNode = reactFlowInstance.getNode(source)
|
|
const targetNode = reactFlowInstance.getNode(target)
|
|
if (!sourceNode || !targetNode) return
|
|
|
|
const relationInfoRect = relationInfoElement.getBoundingClientRect()
|
|
// Get the origin position of the relation information badge in the ReactFlow coordinates
|
|
const relationInfoOriginPositionInReactFlow = reactFlowInstance.screenToFlowPosition({
|
|
x: relationInfoRect.x,
|
|
y: relationInfoRect.y,
|
|
})
|
|
// Get the end position (origin + dimensions) of the relation information badge in the ReactFlow coordinates
|
|
const relationInfoTargetPositionInReactFlow = reactFlowInstance.screenToFlowPosition({
|
|
x: relationInfoRect.x + relationInfoRect.width,
|
|
y: relationInfoRect.y + relationInfoRect.height,
|
|
})
|
|
// Create a ReactFlow Rect from the computed position above
|
|
const relationInfoReactFlowRect = {
|
|
x: relationInfoOriginPositionInReactFlow.x,
|
|
y: relationInfoOriginPositionInReactFlow.y,
|
|
width: relationInfoTargetPositionInReactFlow.x - relationInfoOriginPositionInReactFlow.x,
|
|
height: relationInfoTargetPositionInReactFlow.y - relationInfoOriginPositionInReactFlow.y,
|
|
}
|
|
// Check whether the relation information badge is intersecting with either the source or target node
|
|
const isNodeIntersectingWithSource = reactFlowInstance.isNodeIntersecting(
|
|
sourceNode,
|
|
relationInfoReactFlowRect
|
|
)
|
|
const isNodeIntersectingWithTarget = reactFlowInstance.isNodeIntersecting(
|
|
targetNode,
|
|
relationInfoReactFlowRect
|
|
)
|
|
|
|
// If it is, hide it as they are too close
|
|
setShow(!isNodeIntersectingWithSource && !isNodeIntersectingWithTarget)
|
|
},
|
|
[reactFlowInstance, source, target]
|
|
)
|
|
|
|
return (
|
|
<EdgeLabelRenderer>
|
|
<Badge
|
|
ref={checkIfShouldBeDisplayed}
|
|
className={cn(
|
|
'absolute pointer-events-auto z-50 p-1 rounded-[4px] gap-1 outline outline-1 outline-brand-default',
|
|
show ? 'opacity-100' : 'opacity-0'
|
|
)}
|
|
style={{
|
|
transform: `translate(-50%, -50%) translate(${labelX}px, ${labelY}px)`,
|
|
}}
|
|
>
|
|
{
|
|
// Show the columns in the order of the schema instead of the Postgre relation order
|
|
sourceX < targetX ? (
|
|
<>
|
|
<EdgeNodeData
|
|
schema={data.sourceSchemaName}
|
|
table={data.sourceName}
|
|
column={data.sourceColumnName}
|
|
/>
|
|
<ArrowRight size={12} />
|
|
<EdgeNodeData
|
|
schema={data.targetSchemaName}
|
|
table={data.targetName}
|
|
column={data.targetColumnName}
|
|
/>
|
|
</>
|
|
) : (
|
|
<>
|
|
<EdgeNodeData
|
|
schema={data.targetSchemaName}
|
|
table={data.targetName}
|
|
column={data.targetColumnName}
|
|
/>
|
|
<ArrowLeft size={12} />
|
|
<EdgeNodeData
|
|
schema={data.sourceSchemaName}
|
|
table={data.sourceName}
|
|
column={data.sourceColumnName}
|
|
/>
|
|
</>
|
|
)
|
|
}
|
|
</Badge>
|
|
</EdgeLabelRenderer>
|
|
)
|
|
}
|
|
|
|
const EdgeNodeData = ({
|
|
schema,
|
|
table,
|
|
column,
|
|
}: {
|
|
schema: string
|
|
table: string
|
|
column: string
|
|
}) => {
|
|
const { selectedSchema } = useQuerySchemaState()
|
|
|
|
return (
|
|
<Badge className="normal-case text-[8px]">
|
|
{selectedSchema === schema ? '' : `${schema}.`}
|
|
{table}.{column}
|
|
</Badge>
|
|
)
|
|
}
|