@adea-ai/ui 0.110.0 → 0.111.0

package/src/components/composites/appearance-editor/accent-swatch-groups.tsx

@@ -22,11 +22,7 @@
  * SOFTWARE.
  */
 import { RadioGroup as Radio } from '@kobalte/core/radio-group'
-import { For, Show } from 'solid-js'
-import { cn } from '#lib/utils'
-
-export const PRIMARY_ACCENT_IDS = ['blue', 'green', 'amber', 'cyan', 'pink'] as const
-const primaryAccentIds: ReadonlySet<string> = new Set(PRIMARY_ACCENT_IDS)
+import { For } from 'solid-js'
 
 type AccentOption = Readonly<{
   id: string
@@ -37,104 +33,55 @@ type AccentOption = Readonly<{
 
 type AccentSwatchGroupsProps = {
   accentOptions: readonly AccentOption[]
-  themeAccentOptions: readonly AccentOption[]
+  /**
+   * Accepted for host compatibility and no longer rendered. The picker offers
+   * one theme-scoped group — the theme's own primary followed by the presets —
+   * instead of splitting additional presets and the theme pair's accent slots
+   * into labelled groups of their own. A stored theme-accent id still resolves
+   * (`resolveAccentPreset`) and is still described by the row; it is just no
+   * longer offered as a swatch, and a host can stop feeding this list.
+   */
+  themeAccentOptions?: readonly AccentOption[]
   resolvedAppearance: 'light' | 'dark'
   themeDefaultColor: string
 }
 
+/**
+ * The accent choices, as ONE group: the theme's own primary first, then every
+ * preset the host feeds, each painted with its value for the resolved
+ * appearance — which is what makes the group theme-scoped rather than a
+ * catalogue table. The custom-color entry is the host's (`AccentChoices`
+ * renders it beside this grid), because whether a free-form colour is accepted
+ * is the host's validation to own.
+ */
 export function AccentSwatchGroups(props: AccentSwatchGroupsProps) {
-  const primaryAccents = () =>
-    PRIMARY_ACCENT_IDS.flatMap((id) => {
-      const option = props.accentOptions.find((candidate) => candidate.id === id)
-      return option ? [option] : []
-    })
-  const additionalAccents = () =>
-    props.accentOptions.filter(
-      (option) => option.id !== 'theme' && !primaryAccentIds.has(option.id)
-    )
+  const presets = () => props.accentOptions.filter((option) => option.id !== 'theme')
 
   return (
-    <>
-      <div class="grid grid-cols-3 gap-2" data-primary-accent-grid>
-        <AccentSwatch
-          id="theme"
-          label="Theme default"
-          color={props.themeDefaultColor}
-          group="primary"
-        />
-        <For each={primaryAccents()}>
-          {(option) => (
-            <AccentSwatch
-              id={option.id}
-              label={option.label}
-              color={(props.resolvedAppearance === 'light' ? option.light : option.dark) ?? ''}
-              group="primary"
-            />
-          )}
-        </For>
-      </div>
-      <Show when={additionalAccents().length > 0}>
-        <div class="flex flex-col gap-1">
-          <span class="text-xs font-medium text-muted-foreground">Additional colors</span>
-          <div class="flex flex-wrap gap-2">
-            <For each={additionalAccents()}>
-              {(option) => (
-                <AccentSwatch
-                  id={option.id}
-                  label={option.label}
-                  color={(props.resolvedAppearance === 'light' ? option.light : option.dark) ?? ''}
-                  group="additional"
-                />
-              )}
-            </For>
-          </div>
-        </div>
-      </Show>
-      <Show when={props.themeAccentOptions.length > 0}>
-        <div class="flex flex-col gap-1">
-          <span class="text-xs font-medium text-muted-foreground">Theme accents</span>
-          <div class="grid grid-cols-3 gap-2">
-            <For each={props.themeAccentOptions}>
-              {(option) => (
-                <AccentSwatch
-                  id={option.id}
-                  label={'Theme ' + option.label.toLowerCase()}
-                  color={(props.resolvedAppearance === 'light' ? option.light : option.dark) ?? ''}
-                  group="theme"
-                  dashed
-                />
-              )}
-            </For>
-          </div>
-        </div>
-      </Show>
-    </>
+    <div class="grid grid-cols-4 gap-2" data-accent-grid>
+      <AccentSwatch id="theme" label="Theme default" color={props.themeDefaultColor} />
+      <For each={presets()}>
+        {(option) => (
+          <AccentSwatch
+            id={option.id}
+            label={option.label}
+            color={(props.resolvedAppearance === 'light' ? option.light : option.dark) ?? ''}
+          />
+        )}
+      </For>
+    </div>
   )
 }
 
-function AccentSwatch(props: {
-  id: string
-  label: string
-  color: string
-  group: 'primary' | 'additional' | 'theme'
-  dashed?: boolean
-}) {
+function AccentSwatch(props: { id: string; label: string; color: string }) {
   return (
     <Radio.Item
       value={props.id}
       data-accent-option={props.id}
-      data-primary-accent={props.group === 'primary' ? props.id : undefined}
-      data-additional-accent={props.group === 'additional' ? props.id : undefined}
-      data-theme-accent={props.group === 'theme' ? props.id : undefined}
       class="rounded-full focus-within:ring-3 focus-within:ring-ring/50"
     >
       <Radio.ItemInput />
-      <Radio.ItemLabel
-        class={cn(
-          'block size-7 cursor-pointer rounded-full border p-0.5 data-[checked]:border-primary data-[checked]:ring-1 data-[checked]:ring-primary',
-          { 'border-dashed data-[checked]:border-solid': props.dashed }
-        )}
-      >
+      <Radio.ItemLabel class="block size-7 cursor-pointer rounded-full border p-0.5 data-[checked]:border-primary data-[checked]:ring-1 data-[checked]:ring-primary">
         <span
           class="block size-full rounded-full"
           aria-hidden="true"

package/src/components/composites/appearance-editor/appearance-choices.tsx

@@ -104,8 +104,6 @@ export function AccentChoices(props: AppearanceEditorProps) {
   // user will see it.
   const resolvedAppearance = () =>
     props.draft.mode === 'system' ? props.resolvedAppearance : props.draft.mode
-  // The accents the previewed theme pair carries, offered after the presets.
-  const themeAccents = () => props.themeAccentOptions ?? []
   const accentSelection = () => (isCustomAccent(props) ? 'custom' : props.draft.accent)
   return (
     <Radio
@@ -122,7 +120,6 @@ export function AccentChoices(props: AppearanceEditorProps) {
     >
       <AccentSwatchGroups
         accentOptions={props.accentOptions}
-        themeAccentOptions={themeAccents()}
         resolvedAppearance={resolvedAppearance()}
         themeDefaultColor={
           resolvedAppearance() === 'light'

package/src/components/composites/appearance-editor/font-settings-group.tsx

@@ -11,7 +11,6 @@ import {
   DropdownMenuTrigger,
 } from '../../ui/dropdown-menu/dropdown-menu'
 import { InputControl } from '../../ui/input/input-control'
-import { SettingsRow } from './appearance-rows'
 import {
   APPEARANCE_EDITOR_FONT_SIZE_MAX,
   APPEARANCE_EDITOR_FONT_SIZE_MIN,
@@ -142,7 +141,7 @@ function FontFamilyMenu(props: {
         size="sm"
         aria-label={`${props.label} font family`}
         disabled={props.disabled}
-        class="w-40 max-w-full justify-between"
+        class="w-32 max-w-full justify-between"
       >
         <span class="truncate">{selectedLabel()}</span>
         <ChevronDown aria-hidden="true" class="ms-2 size-4 shrink-0 text-muted-foreground" />
@@ -298,8 +297,22 @@ export function AppearanceFontSettingsGroup(props: AppearanceFontSettingsGroupPr
             )
           }
           return (
-            <SettingsRow title={row.label} icon={<Icon />} description={row.description}>
-              <div class="flex min-w-0 max-w-full flex-wrap items-center gap-2">
+            <section class="flex items-center gap-3 px-4 py-4" data-font-settings-row={row.axis}>
+              <span
+                class="flex size-9 shrink-0 items-center justify-center rounded-lg border bg-foreground/5 text-muted-foreground [&_svg]:size-4"
+                aria-hidden="true"
+              >
+                <Icon />
+              </span>
+              {/* One line, always: the copy truncates rather than wrapping the
+                  controls to a second line, so the family menu, the size field
+                  and the title/subtitle stay aligned. The compact widths keep
+                  that true at the appearance sheet's own width. */}
+              <div class="min-w-0 flex-1">
+                <h3 class="text-sm font-medium">{row.label}</h3>
+                <div class="mt-0.5 truncate text-xs text-muted-foreground">{row.description}</div>
+              </div>
+              <div class="flex shrink-0 items-center gap-2">
                 <FontFamilyMenu
                   label={row.label}
                   family={value().family}
@@ -307,7 +320,7 @@ export function AppearanceFontSettingsGroup(props: AppearanceFontSettingsGroupPr
                   disabled={props.disabled}
                   onSelect={(family) => updateAxis(row.axis, { family })}
                 />
-                <div class="flex shrink-0 items-center gap-1">
+                <div class="flex items-center gap-1">
                   <InputControl
                     type="number"
                     min={APPEARANCE_EDITOR_FONT_SIZE_MIN}
@@ -318,7 +331,7 @@ export function AppearanceFontSettingsGroup(props: AppearanceFontSettingsGroupPr
                     aria-label={`${row.label} font size in pixels`}
                     aria-describedby={sizeHintId}
                     aria-invalid={sizeIsInvalid()}
-                    class="w-16"
+                    class="w-12"
                     onInput={(event) =>
                       setSizeDrafts((current) => ({
                         ...current,
@@ -341,7 +354,7 @@ export function AppearanceFontSettingsGroup(props: AppearanceFontSettingsGroupPr
                   {APPEARANCE_EDITOR_FONT_SIZE_MAX} pixels.
                 </span>
               </div>
-            </SettingsRow>
+            </section>
           )
         }}
       </For>

package/src/components/layout/split-layout/split-layout.tsx

@@ -11,7 +11,7 @@ import {
   type JSX,
 } from 'solid-js'
 import { X, GripVertical } from 'lucide-solid'
-import { Button } from '../../ui/button'
+import { ActionButton } from '../../composites/action-button'
 import { cn } from '#lib/utils'
 import { computeLayoutFrames, type LayoutRect } from './geometry'
 import { paneDropIntent, type PaneDropIntent } from './drop'
@@ -420,14 +420,15 @@ export function SplitLayout<L extends SplitLayoutLeaf>(props: SplitLayoutProps<L
                 </span>
                 {actions}
                 {props.onClose ? (
-                  <Button
+                  <ActionButton
                     variant="ghost"
                     size="icon-xs"
                     aria-label={`Close ${props.labelForLeaf(leaf())}`}
+                    tooltip={`Close ${props.labelForLeaf(leaf())}.`}
                     onClick={() => close(id)}
                   >
                     <X />
-                  </Button>
+                  </ActionButton>
                 ) : null}
               </header>
               <div class="min-h-0 min-w-0 flex-1 overflow-auto">{content}</div>

package/src/components/theme/appearance-panel.tsx

@@ -118,7 +118,6 @@ export function AppearancePanel(props: AppearancePanelProps) {
         >
           <AccentSwatchGroups
             accentOptions={accentPresets}
-            themeAccentOptions={themeAccents()}
             resolvedAppearance={resolvedAppearance()}
             themeDefaultColor="var(--primary)"
           />

package/src/components/ui/alert-dialog/alert-dialog.tsx

@@ -6,10 +6,10 @@ import {
 import type { ComponentProps } from 'solid-js'
 import { createEffect, createSignal, splitProps } from 'solid-js'
 import {
+  dialogSurface,
   overlayMotion,
   overlayPositioner,
   overlayScrim,
-  overlaySurface,
   overlayTitle,
 } from '#lib/overlay'
 import { cn } from '#lib/utils'
@@ -89,7 +89,7 @@ export function AlertDialogContent(props: ComponentProps<typeof KobalteAlertDial
       <div class={overlayPositioner}>
         <KobalteAlertDialogContent
           {...blockDismissal}
-          class={cn(overlaySurface, overlayMotion, 'grid w-full max-w-md gap-4 p-5', local.class)}
+          class={cn(dialogSurface, overlayMotion, 'grid w-full max-w-md gap-4 p-5', local.class)}
           {...rest}
         />
       </div>

package/src/components/ui/combobox/combobox.tsx

@@ -133,7 +133,9 @@ export function ComboboxItem(props: ComponentProps<typeof KobalteCombobox.Item>)
   return (
     <KobalteCombobox.Item class={cn(menuItem, 'pe-8', local.class)} {...rest}>
       <KobalteCombobox.ItemLabel>{local.children}</KobalteCombobox.ItemLabel>
-      <KobalteCombobox.ItemIndicator class="absolute end-2 flex size-4 items-center justify-center">
+      {/* The indicator reads in the accent, like every other selected state in
+      the system. */}
+      <KobalteCombobox.ItemIndicator class="absolute end-2 flex size-4 items-center justify-center text-primary">
         <Check class="size-4" />
       </KobalteCombobox.ItemIndicator>
     </KobalteCombobox.Item>

package/src/components/ui/context-menu/context-menu.tsx

@@ -109,7 +109,9 @@ export function ContextMenuCheckboxItem(
   return (
     <KobalteContextMenu.CheckboxItem class={cn(menuItem, 'pe-8', local.class)} {...rest}>
       {local.children}
-      <KobalteContextMenu.ItemIndicator class="absolute end-2 flex size-4 items-center justify-center">
+      {/* The indicator reads in the accent, like every other selected state in
+      the system. */}
+      <KobalteContextMenu.ItemIndicator class="absolute end-2 flex size-4 items-center justify-center text-primary">
         <Check class="size-4" />
       </KobalteContextMenu.ItemIndicator>
     </KobalteContextMenu.CheckboxItem>
@@ -126,7 +128,9 @@ export function ContextMenuRadioItem(props: ComponentProps<typeof KobalteContext
   return (
     <KobalteContextMenu.RadioItem class={cn(menuItem, 'pe-8', local.class)} {...rest}>
       {local.children}
-      <KobalteContextMenu.ItemIndicator class="absolute end-2 flex size-4 items-center justify-center">
+      {/* The indicator reads in the accent, like every other selected state in
+      the system. */}
+      <KobalteContextMenu.ItemIndicator class="absolute end-2 flex size-4 items-center justify-center text-primary">
         <Circle class="size-2 fill-current" />
       </KobalteContextMenu.ItemIndicator>
     </KobalteContextMenu.RadioItem>

package/src/components/ui/dialog/dialog.tsx

@@ -8,13 +8,14 @@ import { X } from 'lucide-solid'
 import type { Accessor, ComponentProps, JSX } from 'solid-js'
 import { createRenderEffect, onCleanup, Show, splitProps } from 'solid-js'
 import {
+  dialogSurface,
   overlayMotion,
   overlayPositioner,
   overlayScrim,
-  overlaySurface,
   overlayTitle,
 } from '#lib/overlay'
 import { cn } from '#lib/utils'
+import { Tooltip, TooltipContent, TooltipTrigger } from '../tooltip'
 
 type FocusCycle = {
   content: HTMLElement
@@ -281,7 +282,7 @@ export function DialogContent(props: DialogContentProps) {
       <div class={cn(overlayPositioner, local.positioner === 'inset' && 'inset-4 grid-rows-1 p-0')}>
         <KobalteDialogContent
           class={cn(
-            overlaySurface,
+            dialogSurface,
             overlayMotion,
             'relative grid w-full max-w-lg gap-4 p-5',
             local.class
@@ -290,16 +291,22 @@ export function DialogContent(props: DialogContentProps) {
         >
           {local.children}
           <Show when={local.closeButton !== false}>
-            <KobalteDialog.CloseButton
-              aria-label="Close"
-              class={cn(
-                'absolute top-3.5 end-3.5 rounded-md p-1 text-muted-foreground',
-                'transition-colors ease-out hover:bg-surface-hover hover:text-foreground',
-                'focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-primary-subtle outline-none'
-              )}
-            >
-              {local.closeButton ?? <X class="size-4" />}
-            </KobalteDialog.CloseButton>
+            {/* The corner close is icon-only, so it carries the shared tooltip
+               treatment while its accessible name stays "Close". */}
+            <Tooltip>
+              <TooltipTrigger
+                as={KobalteDialog.CloseButton}
+                aria-label="Close"
+                class={cn(
+                  'absolute top-3.5 end-3.5 rounded-md p-1 text-muted-foreground',
+                  'transition-colors ease-out hover:bg-surface-hover hover:text-foreground',
+                  'focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-primary-subtle outline-none'
+                )}
+              >
+                {local.closeButton ?? <X class="size-4" />}
+              </TooltipTrigger>
+              <TooltipContent>Close dialog.</TooltipContent>
+            </Tooltip>
           </Show>
         </KobalteDialogContent>
       </div>

package/src/components/ui/drawer/drawer.tsx

@@ -69,7 +69,7 @@ export function DrawerContent(props: DrawerContentProps) {
       <DrawerOverlay />
       <DrawerPrimitive.Content
         class={cn(
-          'group/drawer bg-popover text-popover-foreground fixed z-(--z-drawer) flex flex-col border-border shadow-lg',
+          'group/drawer bg-background text-foreground fixed z-(--z-drawer) flex flex-col border-border shadow-lg',
           'data-[side=bottom]:inset-x-0 data-[side=bottom]:bottom-0 data-[side=bottom]:max-h-[85vh] data-[side=bottom]:rounded-t-xl data-[side=bottom]:border-t',
           'data-[side=top]:inset-x-0 data-[side=top]:top-0 data-[side=top]:max-h-[85vh] data-[side=top]:rounded-b-xl data-[side=top]:border-b',
           'data-[side=left]:inset-y-0 data-[side=left]:left-0 data-[side=left]:w-80 data-[side=left]:rounded-e-xl data-[side=left]:border-e',

package/src/components/ui/dropdown-menu/dropdown-menu.tsx

@@ -1,12 +1,14 @@
 import { DropdownMenu as KobalteDropdownMenu } from '@kobalte/core/dropdown-menu'
 import { Check, ChevronRight, Circle } from 'lucide-solid'
 import type { Accessor, ComponentProps } from 'solid-js'
-import { createContext, splitProps, useContext } from 'solid-js'
+import { createContext, Show, splitProps, useContext } from 'solid-js'
 import {
   menuContentPadding,
   destructiveMenuItem,
   menuItem,
   menuLabel,
+  menuSwatchTone,
+  type MenuSwatchTone,
   menuSeparator,
   overlayMotion,
   overlaySurface,
@@ -192,6 +194,13 @@ export function DropdownMenuPortal(props: ComponentProps<typeof KobalteDropdownM
 }
 
 export type DropdownMenuContentProps = ComponentProps<typeof KobalteDropdownMenu.Content> & {
+  /**
+   * Kept for callers that hid the arrow explicitly; the arrow is now hidden by
+   * default. Pass `false` to draw one. The default flipped because Kobalte
+   * reserves half of the arrow's 30px box as popper gutter — a menu anchored to
+   * its trigger floated 15px off it, which read as a gap rather than as a
+   * pointer, and every anchored caller already passed `hideArrow`.
+   */
   hideArrow?: boolean
   /** Mount under an owner element such as a modal, keeping the menu in its accessible subtree. */
   portalMount?: HTMLElement
@@ -213,7 +222,12 @@ export function DropdownMenuContent(props: DropdownMenuContentProps) {
         )}
         {...rest}
       >
-        {!local.hideArrow && <KobalteDropdownMenu.Arrow aria-hidden="true" class={popoverArrow} />}
+        {local.hideArrow === false && (
+          /* Rendered only when a caller asks for it back: the popper folds half
+             the arrow's box into the content's gutter, so an arrow and a flush
+             menu have never been true at once. */
+          <KobalteDropdownMenu.Arrow aria-hidden="true" class={popoverArrow} />
+        )}
         {local.children}
       </KobalteDropdownMenu.Content>
     </KobalteDropdownMenu.Portal>
@@ -233,6 +247,10 @@ export function DropdownMenuItem(
      * whenever `shortcut` is drawn.
      */
     keyshortcuts?: string
+    /** Draw a leading colour dot from the shared tone ladder — the accent or
+     * status role the option's card badge carries. `aria-hidden`; the label
+     * carries the meaning. */
+    swatch?: MenuSwatchTone
   }
 ) {
   const [local, rest] = splitProps(props, [
@@ -240,6 +258,7 @@ export function DropdownMenuItem(
     'variant',
     'shortcut',
     'keyshortcuts',
+    'swatch',
     'children',
   ])
 
@@ -255,6 +274,9 @@ export function DropdownMenuItem(
       aria-keyshortcuts={local.keyshortcuts}
       {...rest}
     >
+      <Show when={local.swatch}>
+        <span aria-hidden="true" class={menuSwatchTone({ tone: local.swatch })} />
+      </Show>
       {local.children}
       {local.shortcut ? (
         <span
@@ -292,12 +314,19 @@ export function DropdownMenuShortcut(props: ComponentProps<'span'>) {
 }
 
 export function DropdownMenuCheckboxItem(
-  props: ComponentProps<typeof KobalteDropdownMenu.CheckboxItem>
+  props: ComponentProps<typeof KobalteDropdownMenu.CheckboxItem> & {
+    /** Draw a leading colour dot from the shared tone ladder. `aria-hidden`;
+     * the label carries the meaning. */
+    swatch?: MenuSwatchTone
+  }
 ) {
-  const [local, rest] = splitProps(props, ['class', 'children'])
+  const [local, rest] = splitProps(props, ['class', 'swatch', 'children'])
 
   return (
     <KobalteDropdownMenu.CheckboxItem class={cn(menuItem, 'pe-8', local.class)} {...rest}>
+      <Show when={local.swatch}>
+        <span aria-hidden="true" class={menuSwatchTone({ tone: local.swatch })} />
+      </Show>
       {local.children}
       <KobalteDropdownMenu.ItemIndicator
         data-slot="dropdown-menu-indicator"
@@ -315,11 +344,20 @@ export function DropdownMenuRadioGroup(
   return <KobalteDropdownMenu.RadioGroup {...props} />
 }
 
-export function DropdownMenuRadioItem(props: ComponentProps<typeof KobalteDropdownMenu.RadioItem>) {
-  const [local, rest] = splitProps(props, ['class', 'children'])
+export function DropdownMenuRadioItem(
+  props: ComponentProps<typeof KobalteDropdownMenu.RadioItem> & {
+    /** Draw a leading colour dot from the shared tone ladder. `aria-hidden`;
+     * the label carries the meaning. */
+    swatch?: MenuSwatchTone
+  }
+) {
+  const [local, rest] = splitProps(props, ['class', 'swatch', 'children'])
 
   return (
     <KobalteDropdownMenu.RadioItem class={cn(menuItem, 'pe-8', local.class)} {...rest}>
+      <Show when={local.swatch}>
+        <span aria-hidden="true" class={menuSwatchTone({ tone: local.swatch })} />
+      </Show>
       {local.children}
       {/* The indicator reads in the accent, like every other selected state in
           the system — a canvas-colored dot on a checked row reads as decoration. */}

package/src/components/ui/dropdown-menu/index.ts

@@ -16,3 +16,4 @@ export {
   DropdownMenuTrigger,
   type DropdownMenuContentProps,
 } from './dropdown-menu'
+export type { MenuSwatchTone } from '#lib/overlay'

package/src/components/ui/menubar/menubar.tsx

@@ -139,7 +139,9 @@ export function MenubarCheckboxItem(props: ComponentProps<typeof KobalteMenubar.
   return (
     <KobalteMenubar.CheckboxItem class={cn(menuItem, 'pe-8', local.class)} {...rest}>
       {local.children}
-      <KobalteMenubar.ItemIndicator class="absolute end-2 flex size-4 items-center justify-center">
+      {/* The indicator reads in the accent, like every other selected state in
+      the system. */}
+      <KobalteMenubar.ItemIndicator class="absolute end-2 flex size-4 items-center justify-center text-primary">
         <Check class="size-4" />
       </KobalteMenubar.ItemIndicator>
     </KobalteMenubar.CheckboxItem>
@@ -155,7 +157,9 @@ export function MenubarRadioItem(props: ComponentProps<typeof KobalteMenubar.Rad
   return (
     <KobalteMenubar.RadioItem class={cn(menuItem, 'pe-8', local.class)} {...rest}>
       {local.children}
-      <KobalteMenubar.ItemIndicator class="absolute end-2 flex size-4 items-center justify-center">
+      {/* The indicator reads in the accent, like every other selected state in
+      the system. */}
+      <KobalteMenubar.ItemIndicator class="absolute end-2 flex size-4 items-center justify-center text-primary">
         <Circle class="size-2 fill-current" />
       </KobalteMenubar.ItemIndicator>
     </KobalteMenubar.RadioItem>

package/src/components/ui/select/index.ts

@@ -9,3 +9,4 @@ export {
   SelectValue,
   type SelectTriggerProps,
 } from './select'
+export type { MenuSwatchTone } from '#lib/overlay'

package/src/components/ui/select/select.tsx

@@ -2,7 +2,13 @@ import { Select as KobalteSelect } from '@kobalte/core/select'
 import { Check, ChevronDown, ChevronsUpDown } from 'lucide-solid'
 import type { ComponentProps } from 'solid-js'
 import { Show, splitProps } from 'solid-js'
-import { menuContentPadding, menuItem, popoverArrow, topLayerProps } from '#lib/overlay'
+import {
+  menuContentPadding,
+  menuItem,
+  menuSwatchTone,
+  type MenuSwatchTone,
+  topLayerProps,
+} from '#lib/overlay'
 import { cn } from '#lib/utils'
 
 /**
@@ -21,7 +27,12 @@ import { cn } from '#lib/utils'
 export function Select<Option, OptGroup = never>(
   props: ComponentProps<typeof KobalteSelect<Option, OptGroup>>
 ) {
-  return <KobalteSelect {...props} />
+  // Kobalte's own default gutter is 8px; without the arrow (removed below) the
+  // popper no longer folds half an arrow box into that offset, and 8px read as
+  // a detached list. Four pixels is shadcn's `sideOffset` — attached, with
+  // room for the trigger's own border.
+  const [local, rest] = splitProps(props, ['gutter'])
+  return <KobalteSelect gutter={local.gutter ?? 4} {...rest} />
 }
 
 export type SelectTriggerProps = ComponentProps<typeof KobalteSelect.Trigger> & {
@@ -153,20 +164,34 @@ export function SelectContent(props: SelectContentProps) {
         {...rest}
       >
         {local.children}
+        {/* No arrow: the list is the trigger's own value opened up, and Kobalte
+            reserves half the arrow's 30px box as popper gutter, which is where
+            the reported gap between a form trigger and its options came from. */}
         <KobalteSelect.Listbox class="flex flex-col" />
-        <KobalteSelect.Arrow aria-hidden="true" class={popoverArrow} />
       </KobalteSelect.Content>
     </KobalteSelect.Portal>
   )
 }
 
-export function SelectItem(props: ComponentProps<typeof KobalteSelect.Item>) {
-  const [local, rest] = splitProps(props, ['class', 'children'])
+export function SelectItem(
+  props: ComponentProps<typeof KobalteSelect.Item> & {
+    /** Draw a leading colour dot from the shared tone ladder — the accent or
+     * status role the option's card badge carries. `aria-hidden`; the label
+     * carries the meaning. */
+    swatch?: MenuSwatchTone
+  }
+) {
+  const [local, rest] = splitProps(props, ['class', 'children', 'swatch'])
 
   return (
     <KobalteSelect.Item class={cn(menuItem, 'pe-8', local.class)} {...rest}>
+      <Show when={local.swatch}>
+        <span aria-hidden="true" class={menuSwatchTone({ tone: local.swatch })} />
+      </Show>
       <KobalteSelect.ItemLabel>{local.children}</KobalteSelect.ItemLabel>
-      <KobalteSelect.ItemIndicator class="absolute end-2 flex size-4 items-center justify-center">
+      {/* The indicator reads in the accent, like every other selected state in
+          the system — the row's own foreground reads as decoration. */}
+      <KobalteSelect.ItemIndicator class="absolute end-2 flex size-4 items-center justify-center text-primary">
         <Check class="size-4" />
       </KobalteSelect.ItemIndicator>
     </KobalteSelect.Item>

package/src/components/ui/sheet/sheet.tsx

@@ -46,7 +46,7 @@ import { createDialogFocusRestoration, DialogOverlay } from '../dialog/dialog'
 // scrolled programmatically (focus, scrollIntoView, scrollTop), which slid the
 // pinned footer out of view. Only SheetBody scrolls.
 const sheetVariants = cva(
-  'bg-popover text-popover-foreground fixed z-(--z-dialog) flex flex-col overflow-clip border-border shadow-lg',
+  'bg-background text-foreground fixed z-(--z-dialog) flex flex-col overflow-clip border-border shadow-lg',
   {
     variants: {
       side: {