From f00ac8f5291bfa8b9471fe52ac956883e1a26f75 Mon Sep 17 00:00:00 2001 From: Benjamin Canac Date: Thu, 12 Nov 2026 15:39:28 +0100 Subject: [PATCH 01/31] feat(components)!: render the menu filter as an inset field --- .../popover/PopoverCommandPaletteExample.vue | 1 - .../docs/1.getting-started/3.migration.md | 32 ++++ src/runtime/components/CommandPalette.vue | 4 +- src/runtime/components/DashboardSearch.vue | 2 +- .../components/content/ContentSearch.vue | 2 +- src/runtime/theme/command-palette.ts | 25 ++- src/runtime/theme/dropdown-menu.ts | 8 +- src/runtime/theme/listbox.ts | 8 +- src/runtime/theme/select-menu.ts | 13 +- .../CommandPalette-vue.spec.ts.snap | 172 +++++++++--------- .../__snapshots__/CommandPalette.spec.ts.snap | 172 +++++++++--------- .../DashboardSearch-vue.spec.ts.snap | 56 +++--- .../DashboardSearch.spec.ts.snap | 56 +++--- .../DropdownMenu-vue.spec.ts.snap | 4 +- .../__snapshots__/DropdownMenu.spec.ts.snap | 4 +- .../__snapshots__/Listbox-vue.spec.ts.snap | 4 +- .../__snapshots__/Listbox.spec.ts.snap | 4 +- .../__snapshots__/SelectMenu-vue.spec.ts.snap | 120 ++++++------ .../__snapshots__/SelectMenu.spec.ts.snap | 120 ++++++------ .../__snapshots__/ContentSearch.spec.ts.snap | 60 +++--- 20 files changed, 455 insertions(+), 412 deletions(-) diff --git a/docs/app/components/content/examples/popover/PopoverCommandPaletteExample.vue b/docs/app/components/content/examples/popover/PopoverCommandPaletteExample.vue index ebf73b337a..21bb213950 100644 --- a/docs/app/components/content/examples/popover/PopoverCommandPaletteExample.vue +++ b/docs/app/components/content/examples/popover/PopoverCommandPaletteExample.vue @@ -43,7 +43,6 @@ const label = ref([]) multiple :filter="{ placeholder: 'Search labels...' }" :groups="[{ id: 'labels', items }]" - :ui="{ filter: '[&>input]:h-8 [&>input]:text-sm' }" /> diff --git a/docs/content/docs/1.getting-started/3.migration.md b/docs/content/docs/1.getting-started/3.migration.md index 567c4e64a5..a929f98c68 100644 --- a/docs/content/docs/1.getting-started/3.migration.md +++ b/docs/content/docs/1.getting-started/3.migration.md @@ -1330,6 +1330,38 @@ The theme slot of that input follows the prop on all six components: `input` is A prop left behind fails silently: Vue passes an unknown prop on as an attribute, so the filter input shows again where you hid it, and a `placeholder` or an `icon` set on a CommandPalette, a DashboardSearch or a ContentSearch is ignored. `search-input` can be renamed with a find and replace. The rest can't: `placeholder`, `icon`, `trailing-icon` and `autofocus` have to be merged into the `filter` object, and they keep their meaning on other components. The `input` prop and slot only change on the six components above: AuthForm keeps its `input` slot, and `input` is also the app config key of the Input component. Props passed through `v-bind` or `` have to be found by hand. TypeScript reports a leftover `input` slot in `app.config.ts` and on the `ui` prop, not in a `ui` object built at runtime. :: +### Filter field + +The filter input of CommandPalette, DashboardSearch, ContentSearch, SelectMenu, DropdownMenu and Listbox is now a field inside the menu instead of a full-width bar with a border under it. It has a `bg-soft` fill and a `ring-default` ring, sits 4px from the edges like the items, and takes their padding through `--ui-control-px` in each `size`, so its icon and text line up with the items and the group labels. + +```diff +-
++
+``` + +On CommandPalette, the filter no longer sets the height of its input and is as tall as an Input of the same `size`. The divider under it is gone: `root` loses `divide-y divide-default` and `footer` gets `border-t border-default`. The close button uses the `link` variant like the back button, and both take back the inset of the field with `-me-1` and `-ms-1`. + +```diff +-
+-
++
++
+``` + +A class you set on `filter` to remove the border, like `border-b-0`, is no longer needed. A `variant` passed in the `filter` prop keeps its hover and focus styles, but the fill and the ring of the slot win over its own. To get the bar back, reset the slot in your `app.config.ts`: + +```ts [app.config.ts] +export default defineAppConfig({ + ui: { + selectMenu: { + slots: { + filter: 'm-0 rounded-none bg-transparent ring-0 border-b border-default' + } + } + } +}) +``` + ### Stacked toasts Toasts are now stacked by default: the `expand` prop of the Toaster defaults to `false`, and hovering or focusing the stack expands it. Set it back to `true` on the App to keep every toast visible: diff --git a/src/runtime/components/CommandPalette.vue b/src/runtime/components/CommandPalette.vue index cfea52a6f8..df0d7ffb55 100644 --- a/src/runtime/components/CommandPalette.vue +++ b/src/runtime/components/CommandPalette.vue @@ -90,7 +90,7 @@ export interface CommandPaletteProps = CommandP childrenIcon?: IconProps['name'] /** * Display a close button in the input (useful when inside a Modal for example). - * `{ size: 'md', color: 'neutral', variant: 'ghost' }`{lang="ts-type"} + * `{ size: 'md', color: 'neutral', variant: 'link' }`{lang="ts-type"} * @emits 'update:open' * @defaultValue false */ @@ -622,7 +622,7 @@ function onSelect(e: Event, item: T) { :size="props.size" :icon="props.closeIcon || appConfig.ui.icons.close" color="neutral" - variant="ghost" + variant="link" :aria-label="t('commandPalette.close')" v-bind="(typeof props.close === 'object' ? props.close : {})" data-slot="command-palette-close" diff --git a/src/runtime/components/DashboardSearch.vue b/src/runtime/components/DashboardSearch.vue index c892b16936..d1b04009b1 100644 --- a/src/runtime/components/DashboardSearch.vue +++ b/src/runtime/components/DashboardSearch.vue @@ -19,7 +19,7 @@ export interface DashboardSearchPropsinput]:h-10', + filter: '[--ui-control-px:var(--ui-control-py-xs)]', empty: 'py-3 text-xs', label: 'px-(--ui-control-py) py-[calc(var(--ui-control-py)-(var(--ui-control-text-xs--leading)-var(--ui-control-text-xs--line-height))/2)] text-[calc(var(--ui-control-text-xs)-0.125rem)]/[calc(var(--ui-control-text-xs--leading)-0.25rem)] gap-(--ui-control-gap)', item: 'p-(--ui-control-py) text-(length:--ui-control-text-xs)/(--ui-control-text-xs--line-height) gap-(--ui-control-gap)', @@ -56,7 +55,7 @@ export default defineTheme({ }, sm: { content: '[--ui-control-py:var(--ui-control-py-sm)] [--ui-control-gap:var(--ui-control-gap-sm)] [--ui-control-icon-size:var(--ui-control-icon-size-sm)]', - filter: '[&>input]:h-11', + filter: '[--ui-control-px:var(--ui-control-py-sm)]', empty: 'py-4 text-xs', label: 'px-(--ui-control-py) py-[calc(var(--ui-control-py)-(var(--ui-control-text-sm--leading)-var(--ui-control-text-sm--line-height))/2)] text-[calc(var(--ui-control-text-sm)-0.125rem)]/[calc(var(--ui-control-text-sm--leading)-0.25rem)] gap-(--ui-control-gap)', item: 'p-(--ui-control-py) text-(length:--ui-control-text-sm)/(--ui-control-text-sm--line-height) gap-(--ui-control-gap)', @@ -70,7 +69,7 @@ export default defineTheme({ }, md: { content: '[--ui-control-py:var(--ui-control-py-md)] [--ui-control-gap:var(--ui-control-gap-md)] [--ui-control-icon-size:var(--ui-control-icon-size-md)]', - filter: '[&>input]:h-12', + filter: '[--ui-control-px:var(--ui-control-py-md)]', empty: 'py-6 text-sm', label: 'px-(--ui-control-py) py-[calc(var(--ui-control-py)-(var(--ui-control-text-md--leading)-var(--ui-control-text-md--line-height))/2)] text-[calc(var(--ui-control-text-md)-0.125rem)]/[calc(var(--ui-control-text-md--leading)-0.25rem)] gap-(--ui-control-gap)', item: 'p-(--ui-control-py) text-(length:--ui-control-text-md)/(--ui-control-text-md--line-height) gap-(--ui-control-gap)', @@ -84,7 +83,7 @@ export default defineTheme({ }, lg: { content: '[--ui-control-py:var(--ui-control-py-lg)] [--ui-control-gap:var(--ui-control-gap-lg)] [--ui-control-icon-size:var(--ui-control-icon-size-lg)]', - filter: '[&>input]:h-13', + filter: '[--ui-control-px:var(--ui-control-py-lg)]', empty: 'py-7 text-sm', label: 'px-(--ui-control-py) py-[calc(var(--ui-control-py)-(var(--ui-control-text-lg--leading)-var(--ui-control-text-lg--line-height))/2)] text-[calc(var(--ui-control-text-lg)-0.125rem)]/[calc(var(--ui-control-text-lg--leading)-0.25rem)] gap-(--ui-control-gap)', item: 'p-(--ui-control-py) text-(length:--ui-control-text-lg)/(--ui-control-text-lg--line-height) gap-(--ui-control-gap)', @@ -98,7 +97,7 @@ export default defineTheme({ }, xl: { content: '[--ui-control-py:var(--ui-control-py-xl)] [--ui-control-gap:var(--ui-control-gap-xl)] [--ui-control-icon-size:var(--ui-control-icon-size-xl)]', - filter: '[&>input]:h-14', + filter: '[--ui-control-px:var(--ui-control-py-xl)]', empty: 'py-8 text-base', label: 'px-(--ui-control-py) py-[calc(var(--ui-control-py)-(var(--ui-control-text-xl--leading)-var(--ui-control-text-xl--line-height))/2)] text-[calc(var(--ui-control-text-xl)-0.125rem)]/[calc(var(--ui-control-text-xl--leading)-0.25rem)] gap-(--ui-control-gap)', item: 'p-(--ui-control-py) text-(length:--ui-control-text-xl)/(--ui-control-text-xl--line-height) gap-(--ui-control-gap)', diff --git a/src/runtime/theme/dropdown-menu.ts b/src/runtime/theme/dropdown-menu.ts index f80274b253..cf14dd3f6c 100644 --- a/src/runtime/theme/dropdown-menu.ts +++ b/src/runtime/theme/dropdown-menu.ts @@ -4,7 +4,8 @@ import { defineTheme } from '../utils/theme' export default defineTheme({ slots: { content: 'min-w-32 max-h-(--reka-dropdown-menu-content-available-height) bg-overlay shadow-lg rounded-md ring ring-default overflow-hidden data-[state=open]:animate-[scale-in_100ms_var(--ease-out)] data-[state=closed]:animate-[scale-out_100ms_var(--ease-out)] origin-(--reka-dropdown-menu-content-transform-origin) flex flex-col', - filter: 'rounded-none border-b border-default', + // A field inset like the items: its padding is theirs, so its text lines up with them + filter: 'mx-1 mt-1 bg-soft ring ring-inset ring-default', empty: 'p-[calc(var(--ui-control-py)+(--spacing(1)))] text-center text-muted', viewport: 'relative divide-y divide-default scroll-py-1 overflow-y-auto flex-1', arrow: 'fill-bg stroke-default', @@ -42,6 +43,7 @@ export default defineTheme({ size: { xs: { content: '[--ui-control-py:var(--ui-control-py-xs)] [--ui-control-gap:var(--ui-control-gap-xs)] [--ui-control-icon-size:var(--ui-control-icon-size-xs)]', + filter: '[--ui-control-px:var(--ui-control-py-xs)]', label: 'px-(--ui-control-py) py-[calc(var(--ui-control-py)-(var(--ui-control-text-xs--leading)-var(--ui-control-text-xs--line-height))/2)] text-[calc(var(--ui-control-text-xs)-0.125rem)]/[calc(var(--ui-control-text-xs--leading)-0.25rem)] gap-(--ui-control-gap)', item: 'p-(--ui-control-py) text-(length:--ui-control-text-xs)/(--ui-control-text-xs--line-height) gap-(--ui-control-gap)', itemDescription: 'leading-(--ui-control-text-xs--leading)', @@ -52,6 +54,7 @@ export default defineTheme({ }, sm: { content: '[--ui-control-py:var(--ui-control-py-sm)] [--ui-control-gap:var(--ui-control-gap-sm)] [--ui-control-icon-size:var(--ui-control-icon-size-sm)]', + filter: '[--ui-control-px:var(--ui-control-py-sm)]', label: 'px-(--ui-control-py) py-[calc(var(--ui-control-py)-(var(--ui-control-text-sm--leading)-var(--ui-control-text-sm--line-height))/2)] text-[calc(var(--ui-control-text-sm)-0.125rem)]/[calc(var(--ui-control-text-sm--leading)-0.25rem)] gap-(--ui-control-gap)', item: 'p-(--ui-control-py) text-(length:--ui-control-text-sm)/(--ui-control-text-sm--line-height) gap-(--ui-control-gap)', itemDescription: 'leading-(--ui-control-text-sm--leading)', @@ -62,6 +65,7 @@ export default defineTheme({ }, md: { content: '[--ui-control-py:var(--ui-control-py-md)] [--ui-control-gap:var(--ui-control-gap-md)] [--ui-control-icon-size:var(--ui-control-icon-size-md)]', + filter: '[--ui-control-px:var(--ui-control-py-md)]', label: 'px-(--ui-control-py) py-[calc(var(--ui-control-py)-(var(--ui-control-text-md--leading)-var(--ui-control-text-md--line-height))/2)] text-[calc(var(--ui-control-text-md)-0.125rem)]/[calc(var(--ui-control-text-md--leading)-0.25rem)] gap-(--ui-control-gap)', item: 'p-(--ui-control-py) text-(length:--ui-control-text-md)/(--ui-control-text-md--line-height) gap-(--ui-control-gap)', itemDescription: 'leading-(--ui-control-text-md--leading)', @@ -72,6 +76,7 @@ export default defineTheme({ }, lg: { content: '[--ui-control-py:var(--ui-control-py-lg)] [--ui-control-gap:var(--ui-control-gap-lg)] [--ui-control-icon-size:var(--ui-control-icon-size-lg)]', + filter: '[--ui-control-px:var(--ui-control-py-lg)]', label: 'px-(--ui-control-py) py-[calc(var(--ui-control-py)-(var(--ui-control-text-lg--leading)-var(--ui-control-text-lg--line-height))/2)] text-[calc(var(--ui-control-text-lg)-0.125rem)]/[calc(var(--ui-control-text-lg--leading)-0.25rem)] gap-(--ui-control-gap)', item: 'p-(--ui-control-py) text-(length:--ui-control-text-lg)/(--ui-control-text-lg--line-height) gap-(--ui-control-gap)', itemDescription: 'leading-(--ui-control-text-lg--leading)', @@ -82,6 +87,7 @@ export default defineTheme({ }, xl: { content: '[--ui-control-py:var(--ui-control-py-xl)] [--ui-control-gap:var(--ui-control-gap-xl)] [--ui-control-icon-size:var(--ui-control-icon-size-xl)]', + filter: '[--ui-control-px:var(--ui-control-py-xl)]', label: 'px-(--ui-control-py) py-[calc(var(--ui-control-py)-(var(--ui-control-text-xl--leading)-var(--ui-control-text-xl--line-height))/2)] text-[calc(var(--ui-control-text-xl)-0.125rem)]/[calc(var(--ui-control-text-xl--leading)-0.25rem)] gap-(--ui-control-gap)', item: 'p-(--ui-control-py) text-(length:--ui-control-text-xl)/(--ui-control-text-xl--line-height) gap-(--ui-control-gap)', itemDescription: 'leading-(--ui-control-text-xl--leading)', diff --git a/src/runtime/theme/listbox.ts b/src/runtime/theme/listbox.ts index ada4ff01d1..1909cfe7c4 100644 --- a/src/runtime/theme/listbox.ts +++ b/src/runtime/theme/listbox.ts @@ -4,7 +4,8 @@ import { defineTheme } from '../utils/theme' export default defineTheme({ slots: { root: 'flex flex-col min-h-0 min-w-0 ring ring-inset ring-default rounded-lg overflow-hidden outline-accent-focus has-focus-visible:outline-(length:--ui-focus-width) has-focus-visible:ring-accent', - filter: 'rounded-none border-b border-default', + // A field inset like the items: its padding is theirs, so its text lines up with them + filter: 'mx-1 mt-1 bg-soft ring ring-inset ring-default', content: 'relative overflow-y-auto flex-1 max-h-60 scroll-py-1 focus:outline-none', group: 'p-1 isolate', label: 'font-semibold text-strong', @@ -26,6 +27,7 @@ export default defineTheme({ size: { xs: { content: '[--ui-control-py:var(--ui-control-py-xs)] [--ui-control-gap:var(--ui-control-gap-xs)] [--ui-control-icon-size:var(--ui-control-icon-size-xs)]', + filter: '[--ui-control-px:var(--ui-control-py-xs)]', label: 'px-(--ui-control-py) py-[calc(var(--ui-control-py)-(var(--ui-control-text-xs--leading)-var(--ui-control-text-xs--line-height))/2)] text-[calc(var(--ui-control-text-xs)-0.125rem)]/[calc(var(--ui-control-text-xs--leading)-0.25rem)] gap-(--ui-control-gap)', empty: 'py-3 text-xs', loading: 'py-3', @@ -38,6 +40,7 @@ export default defineTheme({ }, sm: { content: '[--ui-control-py:var(--ui-control-py-sm)] [--ui-control-gap:var(--ui-control-gap-sm)] [--ui-control-icon-size:var(--ui-control-icon-size-sm)]', + filter: '[--ui-control-px:var(--ui-control-py-sm)]', label: 'px-(--ui-control-py) py-[calc(var(--ui-control-py)-(var(--ui-control-text-sm--leading)-var(--ui-control-text-sm--line-height))/2)] text-[calc(var(--ui-control-text-sm)-0.125rem)]/[calc(var(--ui-control-text-sm--leading)-0.25rem)] gap-(--ui-control-gap)', empty: 'py-4 text-xs', loading: 'py-4', @@ -50,6 +53,7 @@ export default defineTheme({ }, md: { content: '[--ui-control-py:var(--ui-control-py-md)] [--ui-control-gap:var(--ui-control-gap-md)] [--ui-control-icon-size:var(--ui-control-icon-size-md)]', + filter: '[--ui-control-px:var(--ui-control-py-md)]', label: 'px-(--ui-control-py) py-[calc(var(--ui-control-py)-(var(--ui-control-text-md--leading)-var(--ui-control-text-md--line-height))/2)] text-[calc(var(--ui-control-text-md)-0.125rem)]/[calc(var(--ui-control-text-md--leading)-0.25rem)] gap-(--ui-control-gap)', empty: 'py-6 text-sm', loading: 'py-6', @@ -62,6 +66,7 @@ export default defineTheme({ }, lg: { content: '[--ui-control-py:var(--ui-control-py-lg)] [--ui-control-gap:var(--ui-control-gap-lg)] [--ui-control-icon-size:var(--ui-control-icon-size-lg)]', + filter: '[--ui-control-px:var(--ui-control-py-lg)]', label: 'px-(--ui-control-py) py-[calc(var(--ui-control-py)-(var(--ui-control-text-lg--leading)-var(--ui-control-text-lg--line-height))/2)] text-[calc(var(--ui-control-text-lg)-0.125rem)]/[calc(var(--ui-control-text-lg--leading)-0.25rem)] gap-(--ui-control-gap)', empty: 'py-7 text-sm', loading: 'py-7', @@ -74,6 +79,7 @@ export default defineTheme({ }, xl: { content: '[--ui-control-py:var(--ui-control-py-xl)] [--ui-control-gap:var(--ui-control-gap-xl)] [--ui-control-icon-size:var(--ui-control-icon-size-xl)]', + filter: '[--ui-control-px:var(--ui-control-py-xl)]', label: 'px-(--ui-control-py) py-[calc(var(--ui-control-py)-(var(--ui-control-text-xl--leading)-var(--ui-control-text-xl--line-height))/2)] text-[calc(var(--ui-control-text-xl)-0.125rem)]/[calc(var(--ui-control-text-xl--leading)-0.25rem)] gap-(--ui-control-gap)', empty: 'py-8 text-base', loading: 'py-8', diff --git a/src/runtime/theme/select-menu.ts b/src/runtime/theme/select-menu.ts index 4952833698..4917859edc 100644 --- a/src/runtime/theme/select-menu.ts +++ b/src/runtime/theme/select-menu.ts @@ -3,7 +3,8 @@ import { extendTheme } from '../utils/theme' export default extendTheme(select, { slots: { - filter: 'rounded-none border-b border-default', + // A field inset like the items: its padding is theirs, so its text lines up with them + filter: 'mx-1 mt-1 bg-soft ring ring-inset ring-default', focusScope: 'flex flex-col min-h-0 focus:outline-none', viewport: () => 'relative scroll-py-1 overflow-y-auto flex-1', content: (content: string) => [content, 'max-h-[min(15rem,var(--reka-combobox-content-available-height,15rem))] origin-(--reka-combobox-content-transform-origin) w-(--reka-combobox-trigger-width)'], @@ -12,11 +13,11 @@ export default extendTheme(select, { }, variants: { size: { - xs: { empty: 'text-(length:--ui-control-text-xs)/(--ui-control-text-xs--line-height)' }, - sm: { empty: 'text-(length:--ui-control-text-sm)/(--ui-control-text-sm--line-height)' }, - md: { empty: 'text-(length:--ui-control-text-md)/(--ui-control-text-md--line-height)' }, - lg: { empty: 'text-(length:--ui-control-text-lg)/(--ui-control-text-lg--line-height)' }, - xl: { empty: 'text-(length:--ui-control-text-xl)/(--ui-control-text-xl--line-height)' } + xs: { filter: '[--ui-control-px:var(--ui-control-py-xs)]', empty: 'text-(length:--ui-control-text-xs)/(--ui-control-text-xs--line-height)' }, + sm: { filter: '[--ui-control-px:var(--ui-control-py-sm)]', empty: 'text-(length:--ui-control-text-sm)/(--ui-control-text-sm--line-height)' }, + md: { filter: '[--ui-control-px:var(--ui-control-py-md)]', empty: 'text-(length:--ui-control-text-md)/(--ui-control-text-md--line-height)' }, + lg: { filter: '[--ui-control-px:var(--ui-control-py-lg)]', empty: 'text-(length:--ui-control-text-lg)/(--ui-control-text-lg--line-height)' }, + xl: { filter: '[--ui-control-px:var(--ui-control-py-xl)]', empty: 'text-(length:--ui-control-text-xl)/(--ui-control-text-xl--line-height)' } }, virtualize: { true: { diff --git a/test/components/__snapshots__/CommandPalette-vue.spec.ts.snap b/test/components/__snapshots__/CommandPalette-vue.spec.ts.snap index a26afbee99..eda9a7218a 100644 --- a/test/components/__snapshots__/CommandPalette-vue.spec.ts.snap +++ b/test/components/__snapshots__/CommandPalette-vue.spec.ts.snap @@ -1,8 +1,8 @@ // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html exports[`CommandPalette > renders with as correctly 1`] = ` -"
-
+"
+
@@ -51,8 +51,8 @@ exports[`CommandPalette > renders with as correctly 1`] = ` `; exports[`CommandPalette > renders with by correctly 1`] = ` -"
-
+"
+
@@ -100,8 +100,8 @@ exports[`CommandPalette > renders with by correctly 1`] = ` `; exports[`CommandPalette > renders with childrenIcon correctly 1`] = ` -"
-
+"
+
@@ -150,8 +150,8 @@ exports[`CommandPalette > renders with childrenIcon correctly 1`] = ` `; exports[`CommandPalette > renders with class correctly 1`] = ` -"
-
+"
+
@@ -200,8 +200,8 @@ exports[`CommandPalette > renders with class correctly 1`] = ` `; exports[`CommandPalette > renders with close correctly 1`] = ` -"
-
+"
+