The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
feat(ui): align combobox trigger with select styling (#49665)
Danny White6a4cbefbcf17
diff --git a/apps/design-system/content/docs/components/combobox.mdx b/apps/design-system/content/docs/components/combobox.mdxindex 21d55d94ae8..3ad33b0124e 100644--- a/apps/design-system/content/docs/components/combobox.mdx+++ b/apps/design-system/content/docs/components/combobox.mdx@@ -19,18 +19,21 @@ See installation instructions for the [Popover](/docs/components/popover#install```tsx'use client'-import { Check, ChevronsUpDown } from 'lucide-react'+import { Check } from 'lucide-react'import * as React from 'react'--import { Button } from '@/components/ui/button'import {+ ComboboxTrigger,Command,CommandEmpty,CommandGroup,CommandInput,CommandItem,-} from '@/components/ui/command'-import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'+ CommandList,+ Popover,+ PopoverContent,+ PopoverTrigger,+} from 'ui'+import { cn } from '@/lib/utils'const frameworks = [@@ -63,17 +66,15 @@ export function ComboboxDemo() {return (<Popover open={open} onOpenChange={setOpen}><PopoverTrigger asChild>- <Button- variant="outline"- role="combobox"+ <ComboboxTriggeraria-expanded={open}- className="w-[200px] justify-between"+ data-state={open ? 'open' : 'closed'}+ className={cn('w-[200px]', !value && 'text-foreground-lighter')}>{value? frameworks.find((framework) => framework.value === value)?.label: 'Select framework...'}- <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />- </Button>+ </ComboboxTrigger></PopoverTrigger><PopoverContent className="w-[200px] p-0"><Command>diff --git a/apps/design-system/registry/default/example/combobox-demo.tsx b/apps/design-system/registry/default/example/combobox-demo.tsxindex 5216f8b4ada..280d9b772b5 100644--- a/apps/design-system/registry/default/example/combobox-demo.tsx+++ b/apps/design-system/registry/default/example/combobox-demo.tsx@@ -1,9 +1,9 @@'use client'-import { Check, ChevronsUpDown } from 'lucide-react'+import { Check } from 'lucide-react'import * as React from 'react'import {- Button,+ ComboboxTrigger,Command,CommandEmpty,CommandGroup,@@ -47,18 +47,15 @@ export default function ComboboxDemo() {return (<Popover open={open} onOpenChange={setOpen}><PopoverTrigger asChild>- <Button- variant="default"- role="combobox"- size={'small'}+ <ComboboxTriggeraria-expanded={open}- className="w-[200px] justify-between"- iconRight={<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />}+ data-state={open ? 'open' : 'closed'}+ className={cn('w-[200px]', !value && 'text-foreground-lighter')}>{value? frameworks.find((framework) => framework.value === value)?.label: 'Select framework...'}- </Button>+ </ComboboxTrigger></PopoverTrigger><PopoverContent className="w-[200px] p-0"><Command>diff --git a/apps/design-system/registry/default/example/combobox-form.tsx b/apps/design-system/registry/default/example/combobox-form.tsxindex a0a71ccd955..44545f313a2 100644--- a/apps/design-system/registry/default/example/combobox-form.tsx+++ b/apps/design-system/registry/default/example/combobox-form.tsx@@ -1,11 +1,13 @@'use client'import { zodResolver } from '@hookform/resolvers/zod'-import { Check, ChevronsUpDown } from 'lucide-react'+import { Check } from 'lucide-react'+import { useState } from 'react'import { useForm } from 'react-hook-form'import { toast } from 'sonner'import {Button,+ ComboboxTrigger,Command,CommandEmpty,CommandGroup,@@ -46,6 +48,7 @@ const FormSchema = z.object({})export default function ComboboxForm() {+ const [open, setOpen] = useState(false)const form = useForm<z.infer<typeof FormSchema>>({resolver: zodResolver(FormSchema),})@@ -69,28 +72,18 @@ export default function ComboboxForm() {render={({ field }) => (<FormItem className="flex flex-col"><FormLabel>Language</FormLabel>- <Popover>+ <Popover open={open} onOpenChange={setOpen}><PopoverTrigger asChild><FormControl>- <Button- variant="default"- role="combobox"- className={cn(- 'w-[200px] justify-between',- !field.value && 'text-muted-foreground'- )}- size="small"- iconRight={- <ChevronsUpDown- className="ml-2 h-4 w-4 shrink-0 opacity-50"- strokeWidth={1}- />- }+ <ComboboxTrigger+ aria-expanded={open}+ data-state={open ? 'open' : 'closed'}+ className={cn('w-[200px]', !field.value && 'text-foreground-lighter')}>{field.value? languages.find((language) => language.value === field.value)?.label: 'Select language'}- </Button>+ </ComboboxTrigger></FormControl></PopoverTrigger><PopoverContent className="w-[200px] p-0">@@ -105,6 +98,7 @@ export default function ComboboxForm() {key={language.value}onSelect={() => {form.setValue('language', language.value)+ setOpen(false)}}><Checkdiff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/PublicationsComboBox.tsx b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/PublicationsComboBox.tsxindex 85ce0544d12..b47c5289670 100644--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/PublicationsComboBox.tsx+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/PublicationsComboBox.tsx@@ -1,10 +1,10 @@import { useParams } from 'common'-import { Check, ChevronsUpDown, Plus } from 'lucide-react'+import { Check, Plus } from 'lucide-react'import { useState } from 'react'import { ControllerRenderProps } from 'react-hook-form'import {- Button,cn,+ ComboboxTrigger,Command,CommandEmpty,CommandGroup,@@ -78,19 +78,16 @@ export const PublicationsComboBox = ({}}><PopoverTrigger asChild>- <Button- variant="default"+ <ComboboxTrigger+ aria-expanded={isDropdownOpen}+ data-state={isDropdownOpen ? 'open' : 'closed'}size="small"- className={cn(- 'w-full [&>span]:w-full text-left',- !selectedPublication && 'text-foreground-muted'- )}- iconRight={<ChevronsUpDown />}+ className={cn(!selectedPublication && 'text-foreground-muted')}name={field.name}onBlur={field.onBlur}>{selectedPublication || 'Select publication'}- </Button>+ </ComboboxTrigger></PopoverTrigger><PopoverContentsameWidthAsTriggerdiff --git a/packages/ui-patterns/src/multi-select/multi-select.test.tsx b/packages/ui-patterns/src/multi-select/multi-select.test.tsxindex 50d3ae3e528..0cb12015c6b 100644--- a/packages/ui-patterns/src/multi-select/multi-select.test.tsx+++ b/packages/ui-patterns/src/multi-select/multi-select.test.tsx@@ -58,6 +58,7 @@ describe('multi-select', () => {const trigger = screen.getByRole('combobox')expect(trigger).toHaveClass('h-[26px]', 'p-0.5')expect(trigger.firstElementChild).toHaveClass('gap-0.5')+ expect(trigger.querySelector('.lucide-chevron-down')).toHaveAttribute('aria-hidden', 'true')})it('renders selected values with a custom label', () => {diff --git a/packages/ui-patterns/src/multi-select/multi-select.tsx b/packages/ui-patterns/src/multi-select/multi-select.tsxindex a26425c0220..01de5c3354a 100644--- a/packages/ui-patterns/src/multi-select/multi-select.tsx+++ b/packages/ui-patterns/src/multi-select/multi-select.tsx@@ -1,7 +1,7 @@'use client'import { cva, VariantProps } from 'class-variance-authority'-import { Check, ChevronsUpDown, X as RemoveIcon } from 'lucide-react'+import { Check, ChevronDown, X as RemoveIcon } from 'lucide-react'// @ts-ignore Required to avoid TS error: The inferred type of MultiSelectorContent cannot be named without a reference to @radix-uiimport type { Popover as PopoverPrimitive } from 'radix-ui'import React, { Children, useEffect } from 'react'@@ -489,7 +489,8 @@ const MultiSelectorTrigger = React.forwardRef<HTMLButtonElement, MultiSelectorTr</div>{showIcon && (- <ChevronsUpDown+ <ChevronDown+ aria-hidden="true"size={16}strokeWidth={1.5}className="text-foreground-lighter shrink-0 ml-1.5 self-center"diff --git a/packages/ui/src/components/shadcn/ui/combobox-trigger.test.tsx b/packages/ui/src/components/shadcn/ui/combobox-trigger.test.tsxnew file mode 100644index 00000000000..beea03b5a6c--- /dev/null+++ b/packages/ui/src/components/shadcn/ui/combobox-trigger.test.tsx@@ -0,0 +1,22 @@+import { render, screen } from '@testing-library/react'+import { describe, expect, it } from 'vitest'++import { ComboboxTrigger } from './combobox-trigger'++describe('ComboboxTrigger', () => {+ it('matches the raised select trigger styling', () => {+ 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',+ 'cursor-pointer',+ 'focus-ring',+ 'text-left'+ )+ expect(trigger).not.toHaveClass('bg-background')+ expect(trigger.querySelector('svg')).toHaveAttribute('aria-hidden', 'true')+ })+})diff --git a/packages/ui/src/components/shadcn/ui/combobox-trigger.tsx b/packages/ui/src/components/shadcn/ui/combobox-trigger.tsxnew file mode 100644index 00000000000..22f9f1227ae--- /dev/null+++ b/packages/ui/src/components/shadcn/ui/combobox-trigger.tsx@@ -0,0 +1,37 @@+'use client'++import { ChevronDown } from 'lucide-react'+import * as React from 'react'++import { cn } from '../../../lib/utils/cn'+import { getExplicitTabIndex } from '../../../lib/utils/getExplicitTabIndex'+import { selectTriggerVariants, type SelectTriggerVariantProps } from './select-trigger'++const ComboboxTrigger = React.forwardRef<+ HTMLButtonElement,+ Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'size'> & SelectTriggerVariantProps+>(({ className, children, disabled, size, tabIndex, ...props }, ref) => {+ const computedTabIndex = getExplicitTabIndex(tabIndex, disabled)++ return (+ <button+ ref={ref}+ type="button"+ role="combobox"+ disabled={disabled}+ className={cn(selectTriggerVariants({ size }), className)}+ tabIndex={computedTabIndex}+ {...props}+ >+ <span className="min-w-0 flex-1 truncate text-left">{children}</span>+ <ChevronDown+ aria-hidden="true"+ className="h-4 w-4 shrink-0 text-foreground-lighter"+ strokeWidth={1.5}+ />+ </button>+ )+})+ComboboxTrigger.displayName = 'ComboboxTrigger'++export { ComboboxTrigger }diff --git a/packages/ui/src/components/shadcn/ui/select-trigger.tsx b/packages/ui/src/components/shadcn/ui/select-trigger.tsxnew file mode 100644index 00000000000..67c9fd3b4e4--- /dev/null+++ b/packages/ui/src/components/shadcn/ui/select-trigger.tsx@@ -0,0 +1,21 @@+'use client'++import { cva, type VariantProps } from 'class-variance-authority'++import { SIZE_VARIANTS, SIZE_VARIANTS_DEFAULT } from '../../../lib/constants'++export const selectTriggerVariants = cva(+ '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',+ {+ variants: {+ size: {+ ...SIZE_VARIANTS,+ },+ },+ defaultVariants: {+ size: SIZE_VARIANTS_DEFAULT,+ },+ }+)++export type SelectTriggerVariantProps = VariantProps<typeof selectTriggerVariants>diff --git a/packages/ui/src/components/shadcn/ui/select.tsx b/packages/ui/src/components/shadcn/ui/select.tsxindex 9bacd99420f..7cde4b248cd 100644--- a/packages/ui/src/components/shadcn/ui/select.tsx+++ b/packages/ui/src/components/shadcn/ui/select.tsx@@ -1,12 +1,13 @@'use client'-import { cva, VariantProps } from 'class-variance-authority'+import { type VariantProps } from 'class-variance-authority'import { Check, ChevronDown, ChevronUp } from 'lucide-react'import { Select as SelectPrimitive } from 'radix-ui'import * as React from 'react'-import { SIZE_VARIANTS, SIZE_VARIANTS_DEFAULT } from '../../../lib/constants'import { cn } from '../../../lib/utils/cn'+import { ComboboxTrigger } from './combobox-trigger'+import { selectTriggerVariants } from './select-trigger'const Select = SelectPrimitive.Root@@ -16,8 +17,7 @@ const SelectGroup = SelectPrimitive.Group// https://github.com/radix-ui/primitives/issues/2578#issuecomment-1890801041 for more info.const SelectValue = React.forwardRef<React.ElementRef<typeof SelectPrimitive.Value>,- React.ComponentPropsWithoutRef<typeof SelectPrimitive.Value> &- VariantProps<typeof SelectTriggerVariants>+ React.ComponentPropsWithoutRef<typeof SelectPrimitive.Value>>(({ placeholder, ...props }, ref) => (<SelectPrimitive.Valueplaceholder={typeof placeholder === 'string' ? <span>{placeholder}</span> : placeholder}@@ -28,32 +28,17 @@ const SelectValue = React.forwardRef<SelectValue.displayName = SelectPrimitive.Value.displayName-const SelectTriggerVariants = cva('', {- variants: {- size: {- ...SIZE_VARIANTS,- },- },- defaultVariants: {- size: SIZE_VARIANTS_DEFAULT,- },-})+type SelectTriggerSize = NonNullable<VariantProps<typeof selectTriggerVariants>['size']>const SelectTrigger = React.forwardRef<React.ElementRef<typeof SelectPrimitive.Trigger>,- React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger> &- VariantProps<typeof SelectTriggerVariants>+ React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger> & {+ size?: SelectTriggerSize+ }>(({ className, children, size, ...props }, ref) => (<SelectPrimitive.Triggerref={ref}- className={cn(- 'flex w-full 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', // [kemal] This is to prevent double lines rendering when a string is particularly long.- SelectTriggerVariants({ size }),- className- )}+ className={cn(selectTriggerVariants({ size }), className)}tabIndex={0}{...props}>@@ -187,6 +172,7 @@ const SelectSeparator = React.forwardRef<SelectSeparator.displayName = SelectPrimitive.Separator.displayNameexport {+ ComboboxTrigger,Select,SelectContent,SelectGroup,