The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
fix(ui): share raised styling across dropdown triggers (#50830)
Danny Whiteb10511052d06
diff --git a/packages/config/css/utilities.css b/packages/config/css/utilities.cssindex 64ca4539e5f..755d29e45fb 100644--- a/packages/config/css/utilities.css+++ b/packages/config/css/utilities.css@@ -13,6 +13,60 @@background-color: var(--background);}+/* Contrast 0.5 produces (0.05 + 0.95 * 0.5)² = 0.275625. */+@utility control-surface-shadows {+ --button-shadow-opacity: 0.04;+ --button-edge-strength: calc(var(--contrast-border, 0.275625) / 0.275625 * 0.6);+ --button-edge-color: var(--colors-black);+ --button-shadow-drop: 0 1px 3px 0 hsl(var(--colors-black) / var(--button-shadow-opacity));+ --button-shadow-raised:+ var(--button-shadow-drop),+ inset 0 1px 0 0 hsl(var(--button-edge-color) / calc(0.04 * var(--button-edge-strength))),+ inset 0 0 0 1px hsl(var(--button-edge-color) / calc(0.06 * var(--button-edge-strength))),+ inset 0 0 0 1px hsl(var(--button-edge-color) / calc(0.1 * var(--button-edge-strength)));+ --button-shadow-default:+ var(--button-shadow-drop),+ inset 0 1px 0 0 hsl(var(--button-edge-color) / calc(0.04 * var(--button-edge-strength))),+ inset 0 0 0 1px hsl(var(--colors-black) / calc(0.06 * var(--button-edge-strength))),+ inset 0 -1px 0 0 hsl(var(--colors-black) / calc(0.06 * var(--button-edge-strength))),+ inset 0 0 0 1px hsl(var(--button-edge-color) / calc(0.1 * var(--button-edge-strength)));++ @variant dark {+ --button-shadow-opacity: 0.2;+ --button-edge-strength: calc(var(--contrast-border, 0.275625) / 0.275625);+ --button-edge-color: var(--colors-white);+ }+}++@utility raised-control-surface {+ @apply text-foreground bg-card shadow-[var(--button-shadow-default)];++ @variant hover {+ @apply bg-muted;+ }++ &[data-state='open'] {+ @apply bg-muted;+ }++ @variant dark {+ @apply bg-muted;+ background-image: linear-gradient(+ to bottom,+ hsl(var(--colors-white) / 0.015),+ hsl(var(--colors-black) / 0.01)+ );++ @variant hover {+ @apply bg-accent;+ }++ &[data-state='open'] {+ @apply bg-accent;+ }+ }+}+/** Soft shimmer gradient used by LoadingLine.*/diff --git a/packages/ui-patterns/src/SkipToContent/SkipToContent.test.tsx b/packages/ui-patterns/src/SkipToContent/SkipToContent.test.tsxindex 0f4ff2b68e1..15635dde71b 100644--- a/packages/ui-patterns/src/SkipToContent/SkipToContent.test.tsx+++ b/packages/ui-patterns/src/SkipToContent/SkipToContent.test.tsx@@ -30,12 +30,12 @@ describe('SkipToContent', () => {expect(wrapper.className).toContain('left-[10px]')})- it('uses an unmodified default Button for hover and fill styles', () => {+ it('uses the default Button surface without custom overrides', () => {render(<SkipToContent href="#main" />)const link = screen.getByRole('link', { name: 'Skip to content' })- expect(link.className).toContain('hover:bg-muted')- expect(link.className).toContain('dark:hover:bg-accent')+ expect(link.className).toContain('raised-control-surface')+ expect(link.className).toContain('control-surface-shadows')expect(link.className).not.toContain('bg-surface-300')expect(link.className).not.toContain('hover:bg-secondary')})diff --git a/packages/ui-patterns/src/multi-select/multi-select.test.tsx b/packages/ui-patterns/src/multi-select/multi-select.test.tsxindex 4df62c599a9..cd5b935c547 100644--- a/packages/ui-patterns/src/multi-select/multi-select.test.tsx+++ b/packages/ui-patterns/src/multi-select/multi-select.test.tsx@@ -48,6 +48,42 @@ function MultiSelectDemo() {}describe('multi-select', () => {+ it('shares the raised trigger surface and radius when empty', () => {+ render(+ <MultiSelector size="small" values={[]} onValuesChange={() => undefined}>+ <MultiSelectorTrigger label="Select fruits" />+ </MultiSelector>+ )++ expect(screen.getByRole('combobox')).toHaveClass(+ 'control-surface-shadows',+ 'raised-control-surface',+ 'border-0',+ 'rounded-[calc(var(--radius-md)*(1+(34/26-1)*0.35))]',+ 'pl-3',+ 'pr-3',+ 'min-h-[34px]'+ )+ expect(screen.getByRole('combobox')).not.toHaveClass('pl-1.5')+ })++ it('keeps the selected-chip field surface and shared radius', () => {+ render(+ <MultiSelector size="small" values={['Apple']} onValuesChange={() => undefined}>+ <MultiSelectorTrigger label="Select fruits" />+ </MultiSelector>+ )++ expect(screen.getByRole('combobox')).toHaveClass(+ 'bg-field',+ 'rounded-[calc(var(--radius-md)*(1+(34/26-1)*0.35))]',+ 'pl-1.5',+ 'pr-3'+ )+ expect(screen.getByRole('combobox')).not.toHaveClass('raised-control-surface')+ expect(screen.getByRole('combobox')).not.toHaveClass('control-surface-shadows')+ })+it('supports the tiny control size', () => {render(<MultiSelector size="tiny" values={['Apple']} onValuesChange={() => undefined}>@@ -60,6 +96,18 @@ describe('multi-select', () => {expect(trigger.querySelector('.lucide-chevron-down')).toHaveAttribute('aria-hidden', 'true')})+ it('aligns the tiny empty label with the trigger inset', () => {+ render(+ <MultiSelector size="tiny" values={[]} onValuesChange={() => undefined}>+ <MultiSelectorTrigger label="Select fruits" />+ </MultiSelector>+ )++ expect(screen.getByRole('combobox')).toHaveClass('pl-2.5', 'pr-2.5')+ expect(screen.getByRole('combobox')).not.toHaveClass('pl-0.5')+ expect(screen.getByText('Select fruits')).not.toHaveClass('ml-2')+ })+it('swaps the label for a badge when the first value is selected', () => {const { rerender } = render(<MultiSelector values={[]} onValuesChange={() => undefined}>diff --git a/packages/ui-patterns/src/multi-select/multi-select.tsx b/packages/ui-patterns/src/multi-select/multi-select.tsxindex 41fd9a82dff..e707ed93586 100644--- a/packages/ui-patterns/src/multi-select/multi-select.tsx+++ b/packages/ui-patterns/src/multi-select/multi-select.tsx@@ -13,6 +13,7 @@ import {CommandInput,CommandItem,CommandList,+ controlRadiusBySize,Popover,PopoverAnchor,PopoverContent,@@ -233,16 +234,14 @@ export interface MultiSelectorTriggerProps extends React.HTMLAttributes<HTMLButt// The tiny control has no vertical padding to spare, so its children stretch to the// control height and drop their line-height; the larger sizes center normally.-const asMinHeight = (height: string) => height.replace('h-', 'min-h-')-const MultiSelectorTriggerVariants = cva('', {variants: {size: {- tiny: `${SIZE.text.tiny} ${SIZE.height.tiny} p-0.5 items-stretch`,- small: `${SIZE.text.small} ${asMinHeight(SIZE.height.small)} p-1.5 items-center`,- medium: `${SIZE.text.medium} ${asMinHeight(SIZE.height.medium)} ${SIZE.padding.medium} items-center`,- large: `${SIZE.text.large} ${asMinHeight(SIZE.height.large)} ${SIZE.padding.large} items-center`,- xlarge: `${SIZE.text.xlarge} ${asMinHeight(SIZE.height.xlarge)} ${SIZE.padding.xlarge} items-center`,+ tiny: `${SIZE.text.tiny} ${SIZE.height.tiny} pl-0.5 pr-2.5 py-0.5 items-stretch ${controlRadiusBySize.tiny}`,+ small: `${SIZE.text.small} ${SIZE.minHeight.small} pl-1.5 pr-3 py-1.5 items-center ${controlRadiusBySize.small}`,+ medium: `${SIZE.text.medium} ${SIZE.minHeight.medium} ${SIZE.padding.medium} items-center ${controlRadiusBySize.medium}`,+ large: `${SIZE.text.large} ${SIZE.minHeight.large} ${SIZE.padding.large} items-center ${controlRadiusBySize.large}`,+ xlarge: `${SIZE.text.xlarge} ${SIZE.minHeight.xlarge} ${SIZE.padding.xlarge} items-center ${controlRadiusBySize.xlarge}`,},},defaultVariants: {@@ -271,8 +270,8 @@ const MultiSelectorBadgeVariants = cva(variants: {size: {tiny: 'h-full py-0',- small: '',- medium: '',+ small: 'py-px',+ medium: 'py-px',large: '',xlarge: '',},@@ -355,7 +354,6 @@ const MultiSelectorTrigger = React.forwardRef<HTMLButtonElement, MultiSelectorTrconst SHOULD_WRAP_BADGES = wrapBadges || badgeLimit === 'wrap'const IS_NUMERIC_LIMIT = typeof badgeLimit === 'number'const IS_INLINE_MODE = mode === 'inline-combobox'- const HAS_TINY_PLACEHOLDER = size === 'tiny' && values.length === 0React.useEffect(() => {if (!inputRef?.current || !badgesRef.current) return@@ -403,17 +401,21 @@ const MultiSelectorTrigger = React.forwardRef<HTMLButtonElement, MultiSelectorTrdisabled={disabled}type="button"role="combobox"+ aria-expanded={open}+ data-state={open ? 'open' : 'closed'}className={cn(- 'flex w-full min-w-50 justify-between rounded-md border',- 'border-strong',+ 'flex w-full min-w-50 justify-between',// Empty: raised plate. Filled: sunk well for chips.- values.length > 0 ? 'bg-field' : 'bg-control-raised',+ values.length > 0+ ? 'border border-strong bg-field hover:border-control-hover'+ : 'border-0 control-surface-shadows raised-control-surface','placeholder:text-muted-foreground','ring-border-control focus-ring','disabled:cursor-not-allowed disabled:opacity-50',- 'hover:border-control-hover transition-colors duration-200',- open && 'border-control-hover',+ 'transition-colors duration-200',+ open && values.length > 0 && 'border-control-hover',MultiSelectorTriggerVariants({ size }),+ values.length === 0 && (size === 'tiny' ? 'pl-2.5' : size === 'small' && 'pl-3'),className)}{...props}@@ -462,7 +464,6 @@ const MultiSelectorTrigger = React.forwardRef<HTMLButtonElement, MultiSelectorTr<spanclassName={cn(MultiSelectorLabelVariants({ size }),- HAS_TINY_PLACEHOLDER && 'ml-2',!IS_INLINE_MODE &&(persistLabel || values.length === 0) &&'opacity-100 visible inline'@@ -481,7 +482,7 @@ const MultiSelectorTrigger = React.forwardRef<HTMLButtonElement, MultiSelectorTrMultiSelectorInlineInputWrapperVariants({ size }),SHOULD_WRAP_BADGES && 'min-w-21.25')}- className={cn(INLINE_INPUT_CLASSES, HAS_TINY_PLACEHOLDER && 'pl-3')}+ className={INLINE_INPUT_CLASSES}/>)}</div>@@ -491,7 +492,10 @@ const MultiSelectorTrigger = React.forwardRef<HTMLButtonElement, MultiSelectorTraria-hidden="true"size={16}strokeWidth={1.5}- className="text-foreground-lighter shrink-0 ml-1.5 self-center"+ className={cn(+ 'text-foreground-lighter shrink-0 ml-1.5 self-center',+ values.length > 0 && 'translate-x-px'+ )}/>)}</button>diff --git a/packages/ui/index.tsx b/packages/ui/index.tsxindex 2d7de7f58c6..113929b9c06 100644--- a/packages/ui/index.tsx+++ b/packages/ui/index.tsx@@ -27,6 +27,7 @@ export * from './src/components/Loading'export * from './src/components/LogoLoader'export * from './src/components/AnimatedCounter'export * from './src/lib/utils'+export { controlRadiusBySize } from './src/lib/raised-control-surface'// DATA ENTRYexport * from './src/components/ExpandingTextArea'diff --git a/packages/ui/src/components/Button/Button.test.tsx b/packages/ui/src/components/Button/Button.test.tsxindex 117fb0a8fdc..0748e78bc57 100644--- a/packages/ui/src/components/Button/Button.test.tsx+++ b/packages/ui/src/components/Button/Button.test.tsx@@ -30,8 +30,9 @@ describe('#Button', () => {render(<Button>Neutral</Button>)const button = screen.getByRole('button', { name: 'Neutral' })- expect(button.className).toContain('bg-card')- expect(button.className).toContain('hover:bg-muted')+ expect(button.className).toContain('control-surface-shadows')+ expect(button.className).toContain('raised-control-surface')+ expect(button.className).toContain('border-0')expect(button.className).not.toContain('bg-primary-solid')})diff --git a/packages/ui/src/components/Button/Button.tsx b/packages/ui/src/components/Button/Button.tsxindex 9c4a6672f1d..cfba89ea915 100644--- a/packages/ui/src/components/Button/Button.tsx+++ b/packages/ui/src/components/Button/Button.tsx@@ -6,11 +6,11 @@ import { Slot } from 'radix-ui'import { cloneElement, forwardRef, isValidElement, ReactNode } from 'react'import { SIZE_VARIANTS } from '../../lib/constants'+import { controlRadiusBySize } from '../../lib/raised-control-surface'import { cn } from '../../lib/utils/cn'import { getExplicitTabIndex } from '../../lib/utils/getExplicitTabIndex'export type ButtonVariantProps = VariantProps<typeof buttonVariants>-// Normalize the shared border curve at contrast 0.5: (0.05 + 0.95 * 0.5)² = 0.275625.const buttonVariants = cva(`relativeinline-flex items-center justify-center@@ -25,13 +25,7 @@ const buttonVariants = cva([&:not([aria-haspopup])]:motion-safe:active:scale-[0.97]focus-ringborder- [--button-shadow-opacity:0.04] dark:[--button-shadow-opacity:0.2]- [--button-edge-strength:calc(var(--contrast-border,0.275625)/0.275625*0.6)]- dark:[--button-edge-strength:calc(var(--contrast-border,0.275625)/0.275625)]- [--button-edge-color:var(--colors-black)] dark:[--button-edge-color:var(--colors-white)]- [--button-shadow-drop:0_1px_3px_0_hsl(var(--colors-black)/var(--button-shadow-opacity))]- [--button-shadow-raised:var(--button-shadow-drop),inset_0_1px_0_0_hsl(var(--button-edge-color)/calc(0.04*var(--button-edge-strength))),inset_0_0_0_1px_hsl(var(--button-edge-color)/calc(0.06*var(--button-edge-strength))),inset_0_0_0_1px_hsl(var(--button-edge-color)/calc(0.1*var(--button-edge-strength)))]- [--button-shadow-default:var(--button-shadow-drop),inset_0_1px_0_0_hsl(var(--button-edge-color)/calc(0.04*var(--button-edge-strength))),inset_0_0_0_1px_hsl(var(--colors-black)/calc(0.06*var(--button-edge-strength))),inset_0_-1px_0_0_hsl(var(--colors-black)/calc(0.06*var(--button-edge-strength))),inset_0_0_0_1px_hsl(var(--button-edge-color)/calc(0.1*var(--button-edge-strength)))]+ control-surface-shadows`,{variants: {@@ -45,14 +39,7 @@ const buttonVariants = cva(hover:bg-[var(--primary-solid-hover)]data-[state=open]:bg-[var(--primary-solid-hover)]`,- default: `- text-foreground- border-0- bg-card hover:bg-muted dark:bg-muted dark:hover:bg-accent- dark:bg-[linear-gradient(to_bottom,hsl(var(--colors-white)/0.015),hsl(var(--colors-black)/0.01))]- shadow-[var(--button-shadow-default)]- data-[state=open]:bg-muted dark:data-[state=open]:bg-accent- `,+ default: 'border-0 raised-control-surface',secondary: `bg-foregroundtext-background@@ -113,13 +100,11 @@ const buttonVariants = cva(true: 'w-full flex items-center justify-center',},size: {- // Larger sizes soften the curve; cn() merges these over base rounded-md.- // Radius stays on Button (not SIZE_VARIANTS) because that map is shared with Input/Select.- tiny: `${SIZE_VARIANTS.tiny} rounded-md`,- small: `${SIZE_VARIANTS.small} rounded-[calc(var(--radius-md)*(1+(34/26-1)*0.35))]`,- medium: `${SIZE_VARIANTS.medium} rounded-[calc(var(--radius-md)*(1+(38/26-1)*0.35))]`,- large: `${SIZE_VARIANTS.large} rounded-[calc(var(--radius-md)*(1+(42/26-1)*0.35))]`,- xlarge: `${SIZE_VARIANTS.xlarge} rounded-[calc(var(--radius-md)*(1+(50/26-1)*0.35))]`,+ tiny: `${SIZE_VARIANTS.tiny} ${controlRadiusBySize.tiny}`,+ small: `${SIZE_VARIANTS.small} ${controlRadiusBySize.small}`,+ medium: `${SIZE_VARIANTS.medium} ${controlRadiusBySize.medium}`,+ large: `${SIZE_VARIANTS.large} ${controlRadiusBySize.large}`,+ xlarge: `${SIZE_VARIANTS.xlarge} ${controlRadiusBySize.xlarge}`,},overlay: {base: `absolute inset-0 bg-background opacity-50`,diff --git a/packages/ui/src/components/shadcn/ui/combobox-trigger.test.tsx b/packages/ui/src/components/shadcn/ui/combobox-trigger.test.tsxindex beea03b5a6c..699f799b8a6 100644--- a/packages/ui/src/components/shadcn/ui/combobox-trigger.test.tsx+++ b/packages/ui/src/components/shadcn/ui/combobox-trigger.test.tsx@@ -2,21 +2,74 @@ import { render, screen } from '@testing-library/react'import { describe, expect, it } from 'vitest'import { ComboboxTrigger } from './combobox-trigger'+import { Select, SelectTrigger, SelectValue } from './select'describe('ComboboxTrigger', () => {- it('matches the raised select trigger styling', () => {+ it('shares the raised surface with SelectTrigger', () => {render(<ComboboxTrigger aria-expanded={false}>Select publication</ComboboxTrigger>)const trigger = screen.getByRole('combobox')expect(trigger).toHaveTextContent('Select publication')expect(trigger).toHaveClass(- 'bg-control-raised',- 'border-strong',+ 'control-surface-shadows',+ 'raised-control-surface',+ 'border-0','cursor-pointer','focus-ring','text-left')- expect(trigger).not.toHaveClass('bg-background')expect(trigger.querySelector('svg')).toHaveAttribute('aria-hidden', 'true')})++ it('uses the same surface on SelectTrigger', () => {+ render(+ <Select defaultValue="first">+ <SelectTrigger>+ <SelectValue />+ </SelectTrigger>+ </Select>+ )++ expect(screen.getByRole('combobox')).toHaveClass(+ 'control-surface-shadows',+ 'raised-control-surface',+ 'border-0'+ )+ })++ it('shows the invalid border on a raised SelectTrigger', () => {+ render(+ <Select defaultValue="first">+ <SelectTrigger aria-invalid="true">+ <SelectValue />+ </SelectTrigger>+ </Select>+ )++ expect(screen.getByRole('combobox')).toHaveClass(+ 'border-0',+ 'aria-[invalid=true]:border',+ 'aria-[invalid=true]:border-destructive-400',+ 'aria-[invalid=true]:bg-destructive-200'+ )+ })++ it('matches Button radius at the same size', () => {+ render(+ <>+ <ComboboxTrigger size="small" aria-label="Type">+ Type+ </ComboboxTrigger>+ <Select defaultValue="first">+ <SelectTrigger size="small" aria-label="Default value">+ <SelectValue />+ </SelectTrigger>+ </Select>+ </>+ )++ const radius = 'rounded-[calc(var(--radius-md)*(1+(34/26-1)*0.35))]'+ expect(screen.getByRole('combobox', { name: 'Type' })).toHaveClass(radius)+ expect(screen.getByRole('combobox', { name: 'Default value' })).toHaveClass(radius)+ })})diff --git a/packages/ui/src/components/shadcn/ui/select-trigger.tsx b/packages/ui/src/components/shadcn/ui/select-trigger.tsxindex be51e32667d..03919f08603 100644--- a/packages/ui/src/components/shadcn/ui/select-trigger.tsx+++ b/packages/ui/src/components/shadcn/ui/select-trigger.tsx@@ -3,17 +3,22 @@import { cva, type VariantProps } from 'class-variance-authority'import { SIZE_VARIANTS, SIZE_VARIANTS_DEFAULT } from '../../../lib/constants'+import { controlRadiusBySize } from '../../../lib/raised-control-surface'import { cn } from '../../../lib/utils'export const selectTriggerVariants = cva(cn(- 'flex w-full cursor-pointer items-center justify-between rounded-md border border-strong hover:border-control-hover bg-control-raised text-xs data-[placeholder]:text-foreground-lighter ring-border-control focus-ring disabled:cursor-not-allowed disabled:opacity-50 transition-colors duration-200 data-[state=open]:border-control-hover gap-2 [&>span]:truncate text-left',- 'aria-[invalid=true]:bg-destructive-200 aria-[invalid=true]:border-destructive-400 aria-[invalid=true]:hover:border-destructive aria-[invalid=true]:focus:border-destructive aria-[invalid=true]:focus-visible:border-destructive'+ 'flex w-full cursor-pointer items-center justify-between rounded-md border-0 text-xs data-[placeholder]:text-foreground-lighter ring-border-control focus-ring disabled:cursor-not-allowed disabled:opacity-50 transition-colors duration-200 gap-2 [&>span]:truncate text-left control-surface-shadows raised-control-surface',+ 'aria-[invalid=true]:border aria-[invalid=true]:bg-destructive-200 aria-[invalid=true]:border-destructive-400 aria-[invalid=true]:hover:border-destructive aria-[invalid=true]:focus:border-destructive aria-[invalid=true]:focus-visible:border-destructive'),{variants: {size: {- ...SIZE_VARIANTS,+ tiny: `${SIZE_VARIANTS.tiny} ${controlRadiusBySize.tiny}`,+ small: `${SIZE_VARIANTS.small} ${controlRadiusBySize.small}`,+ medium: `${SIZE_VARIANTS.medium} ${controlRadiusBySize.medium}`,+ large: `${SIZE_VARIANTS.large} ${controlRadiusBySize.large}`,+ xlarge: `${SIZE_VARIANTS.xlarge} ${controlRadiusBySize.xlarge}`,},},defaultVariants: {diff --git a/packages/ui/src/lib/constants.ts b/packages/ui/src/lib/constants.tsindex 8bfe0329373..c1d134115c4 100644--- a/packages/ui/src/lib/constants.ts+++ b/packages/ui/src/lib/constants.ts@@ -64,6 +64,13 @@ export const SIZE = {large: 'h-[42px]',xlarge: 'h-[50px]',},+ minHeight: {+ tiny: 'min-h-[26px]',+ small: 'min-h-[34px]',+ medium: 'min-h-[38px]',+ large: 'min-h-[42px]',+ xlarge: 'min-h-[50px]',+ },}// used for internal badges/buttonsdiff --git a/packages/ui/src/lib/raised-control-surface.ts b/packages/ui/src/lib/raised-control-surface.tsnew file mode 100644index 00000000000..58347a35317--- /dev/null+++ b/packages/ui/src/lib/raised-control-surface.ts@@ -0,0 +1,7 @@+export const controlRadiusBySize = {+ tiny: 'rounded-md',+ small: 'rounded-[calc(var(--radius-md)*(1+(34/26-1)*0.35))]',+ medium: 'rounded-[calc(var(--radius-md)*(1+(38/26-1)*0.35))]',+ large: 'rounded-[calc(var(--radius-md)*(1+(42/26-1)*0.35))]',+ xlarge: 'rounded-[calc(var(--radius-md)*(1+(50/26-1)*0.35))]',+}