mirror of
https://github.com/supabase/supabase.git
synced 2026-10-06 01:45: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.
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-primary-bright!' : 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-primary-bright',
|
|
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>
|
|
)
|
|
}
|