Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

fix(ui-patterns): stabilise multi-select trigger height (#50163)

Danny Whitebfe07a593736
diff --git a/apps/design-system/content/docs/fragments/multi-select.mdx b/apps/design-system/content/docs/fragments/multi-select.mdx
index 1dcb568f23e..73e09df3899 100644
--- a/apps/design-system/content/docs/fragments/multi-select.mdx
+++ b/apps/design-system/content/docs/fragments/multi-select.mdx
@@ -41,6 +41,12 @@ import {
<ComponentPreview name="multi-select-disabled" />
+### Without trigger icon
+
+Set `showIcon={false}` to hide the trigger icon.
+
+<ComponentPreview name="multi-select-without-icon" />
+
### Badge Combo Box
Use `MultiSelectorInput`to add a search input.
diff --git a/apps/design-system/registry/default/example/multi-select-badge-limit-wrap.tsx b/apps/design-system/registry/default/example/multi-select-badge-limit-wrap.tsx
index a16ac5b47d4..7b1b8b283ad 100644
--- a/apps/design-system/registry/default/example/multi-select-badge-limit-wrap.tsx
+++ b/apps/design-system/registry/default/example/multi-select-badge-limit-wrap.tsx
@@ -23,7 +23,6 @@ export default function MultiSelectDemo() {
label="Select fruits"
persistLabel
badgeLimit="wrap"
- showIcon={false}
deletableBadge={false}
/>
<MultiSelectorContent>
diff --git a/apps/design-system/registry/default/example/multi-select-deletable-badge.tsx b/apps/design-system/registry/default/example/multi-select-deletable-badge.tsx
index daf693d3edf..21950f05e61 100644
--- a/apps/design-system/registry/default/example/multi-select-deletable-badge.tsx
+++ b/apps/design-system/registry/default/example/multi-select-deletable-badge.tsx
@@ -17,7 +17,6 @@ export default function MultiSelectDemo() {
label="Select fruits"
deletableBadge
badgeLimit="wrap"
- showIcon={false}
/>
<MultiSelectorContent>
<MultiSelectorList>
diff --git a/apps/design-system/registry/default/example/multi-select-demo.tsx b/apps/design-system/registry/default/example/multi-select-demo.tsx
index fafed2a1c4c..65668b5e314 100644
--- a/apps/design-system/registry/default/example/multi-select-demo.tsx
+++ b/apps/design-system/registry/default/example/multi-select-demo.tsx
@@ -25,12 +25,7 @@ export default function MultiSelectDemo() {
return (
<MultiSelector values={selectedValues} onValuesChange={setSelectedValues}>
- <MultiSelectorTrigger
- className="w-72"
- label="Select fruits"
- badgeLimit="wrap"
- showIcon={false}
- />
+ <MultiSelectorTrigger className="w-72" label="Select fruits" badgeLimit="wrap" />
<MultiSelectorContent>
<MultiSelectorList>
{fruits.map(({ value, isDisabled }) => (
diff --git a/apps/design-system/registry/default/example/multi-select-in-dialog.tsx b/apps/design-system/registry/default/example/multi-select-in-dialog.tsx
index a5975fa3aa1..4e44a6ad574 100644
--- a/apps/design-system/registry/default/example/multi-select-in-dialog.tsx
+++ b/apps/design-system/registry/default/example/multi-select-in-dialog.tsx
@@ -49,7 +49,7 @@ export default function MultiSelectDemo() {
<div>
<Label htmlFor="fruits">Fruits</Label>
<MultiSelector id="fruits" values={selectedValues} onValuesChange={setSelectedValues}>
- <MultiSelectorTrigger label="Select fruits" badgeLimit="wrap" showIcon={false} />
+ <MultiSelectorTrigger label="Select fruits" badgeLimit="wrap" />
<MultiSelectorContent>
<MultiSelectorList>
{fruits.map(({ value, isDisabled }) => (
diff --git a/apps/design-system/registry/default/example/multi-select-inline-search-input.tsx b/apps/design-system/registry/default/example/multi-select-inline-search-input.tsx
index 775762a39f5..08efdb9d7f0 100644
--- a/apps/design-system/registry/default/example/multi-select-inline-search-input.tsx
+++ b/apps/design-system/registry/default/example/multi-select-inline-search-input.tsx
@@ -18,7 +18,6 @@ export default function MultiSelectDemo() {
label="Select fruits"
deletableBadge
badgeLimit="wrap"
- showIcon={false}
/>
<MultiSelectorContent>
<MultiSelectorList>
diff --git a/apps/design-system/registry/default/example/multi-select-without-icon.tsx b/apps/design-system/registry/default/example/multi-select-without-icon.tsx
new file mode 100644
index 00000000000..64ff5fd4180
--- /dev/null
+++ b/apps/design-system/registry/default/example/multi-select-without-icon.tsx
@@ -0,0 +1,25 @@
+import { useState } from 'react'
+import {
+ MultiSelector,
+ MultiSelectorContent,
+ MultiSelectorItem,
+ MultiSelectorList,
+ MultiSelectorTrigger,
+} from 'ui-patterns/multi-select'
+
+export default function MultiSelectWithoutIcon() {
+ const [selectedValues, setSelectedValues] = useState<string[]>([])
+
+ return (
+ <MultiSelector values={selectedValues} onValuesChange={setSelectedValues}>
+ <MultiSelectorTrigger className="w-72" label="Select fruits" showIcon={false} />
+ <MultiSelectorContent>
+ <MultiSelectorList>
+ <MultiSelectorItem value="Apple">Apple</MultiSelectorItem>
+ <MultiSelectorItem value="Banana">Banana</MultiSelectorItem>
+ <MultiSelectorItem value="Cherry">Cherry</MultiSelectorItem>
+ </MultiSelectorList>
+ </MultiSelectorContent>
+ </MultiSelector>
+ )
+}
diff --git a/apps/design-system/registry/examples.ts b/apps/design-system/registry/examples.ts
index 04b6a3ec5b6..3f5025f384f 100644
--- a/apps/design-system/registry/examples.ts
+++ b/apps/design-system/registry/examples.ts
@@ -1513,6 +1513,11 @@ export const examples: Registry = [
type: 'components:example',
files: ['example/multi-select-disabled.tsx'],
},
+ {
+ name: 'multi-select-without-icon',
+ type: 'components:example',
+ files: ['example/multi-select-without-icon.tsx'],
+ },
{
name: 'multi-select-badge-limit-wrap',
type: 'components:example',
diff --git a/packages/ui-patterns/src/multi-select/multi-select.test.tsx b/packages/ui-patterns/src/multi-select/multi-select.test.tsx
index 0cb12015c6b..a3278b7d6f6 100644
--- a/packages/ui-patterns/src/multi-select/multi-select.test.tsx
+++ b/packages/ui-patterns/src/multi-select/multi-select.test.tsx
@@ -61,6 +61,30 @@ describe('multi-select', () => {
expect(trigger.querySelector('.lucide-chevron-down')).toHaveAttribute('aria-hidden', 'true')
})
+ it('keeps the default trigger height stable when the first value is selected', () => {
+ const { rerender } = render(
+ <MultiSelector values={[]} onValuesChange={() => undefined}>
+ <MultiSelectorTrigger label="Select fruits" />
+ </MultiSelector>
+ )
+
+ const trigger = screen.getByRole('combobox')
+ expect(trigger).toHaveClass('min-h-[34px]', 'py-1.5')
+ expect(screen.getByText('Select fruits')).toHaveClass('leading-5')
+
+ rerender(
+ <MultiSelector values={['Apple']} onValuesChange={() => undefined}>
+ <MultiSelectorTrigger label="Select fruits" />
+ </MultiSelector>
+ )
+
+ expect(screen.getByText('Apple').closest('[class*=rounded]')).toHaveClass(
+ 'text-xs/none',
+ 'py-[3px]'
+ )
+ expect(trigger).toHaveClass('min-h-[34px]', 'py-1.5')
+ })
+
it('renders selected values with a custom label', () => {
render(
<MultiSelector values={['101']} onValuesChange={() => undefined}>
diff --git a/packages/ui-patterns/src/multi-select/multi-select.tsx b/packages/ui-patterns/src/multi-select/multi-select.tsx
index 01de5c3354a..6771530488d 100644
--- a/packages/ui-patterns/src/multi-select/multi-select.tsx
+++ b/packages/ui-patterns/src/multi-select/multi-select.tsx
@@ -262,11 +262,11 @@ const MultiSelectorBadgesVariants = cva('flex overflow-hidden flex-1 min-w-0', {
})
const MultiSelectorBadgeVariants = cva(
- 'rounded-sm shrink-0 px-1.5 bg-surface-75 dark:bg-white/5 normal-case tracking-normal text-xs',
+ 'rounded-sm shrink-0 px-1.5 bg-surface-75 dark:bg-white/5 normal-case tracking-normal text-xs/none',
{
variants: {
size: {
- tiny: 'h-full py-0 leading-none',
+ tiny: 'h-full py-0',
small: '',
medium: '',
large: '',
@@ -285,10 +285,10 @@ const MultiSelectorLabelVariants = cva(
variants: {
size: {
tiny: 'leading-none',
- small: 'ml-1 leading-5.5',
- medium: 'ml-1 leading-5.5',
- large: 'ml-1 leading-5.5',
- xlarge: 'ml-1 leading-5.5',
+ small: 'ml-1 leading-5',
+ medium: 'ml-1 leading-5',
+ large: 'ml-1 leading-5',
+ xlarge: 'ml-1 leading-5',
},
},
defaultVariants: {