@astryxdesign/core 0.3.0 → 0.4.0-canary.058f476

package/dist/Selector/Selector.js

@@ -4,7 +4,8 @@
 
 /**
  * @file Selector.tsx
- * @input Uses React, StyleX, usePopover, useTooltip, Icon, InputGroupContext
+ * @input Uses React, StyleX, usePopover, useTooltip, Icon, InputGroupContext,
+ *   and Selector positioning hooks
  * @output Exports Selector component
  * @position Core implementation; consumed by index.ts
  *
@@ -20,25 +21,29 @@ import * as stylex from '@stylexjs/stylex';
 import { usePopover } from "../Popover/usePopover.js";
 import { useTooltip } from "../Tooltip/index.js";
 import { Icon, renderIconSlot } from "../Icon/index.js";
-import { Field, inputStatusBorderStyles, inputStatusHoverShadowStyles, inputWrapperStyles } from "../Field/index.js";
+import { useIndicator } from "../Indicator/index.js";
+import { Field, InputClearButton, inputStatusBorderStyles, inputStatusHoverShadowStyles, inputWrapperStyles } from "../Field/index.js";
 import { Divider } from "../Divider/index.js";
 import { layerAnimations } from "../Layer/layerAnimations.stylex.js";
 import { Spinner } from "../Spinner/index.js";
-import { TextInput } from "../TextInput/index.js";
+import { PanelSearchInput } from "../Field/PanelSearchInput.js";
 import { useAnnounce } from "../hooks/useAnnounce.js";
 import "../theme/tokens.stylex.js";
 import { colorVars, sizeVars, spacingVars, radiusVars, durationVars, easeVars, typographyVars, fontWeightVars, typeScaleVars, borderVars } from "../theme/tokens.stylex.js";
 import { isOptionData, isDivider, isSection, normalizeOption, getSelectableOptions } from "./utils.js";
 import { useCombobox, useSelectedItemOffset } from "./hooks.js";
+import { useTypeahead } from "../hooks/useTypeahead.js";
 import { SelectorOption } from "./SelectorOption.js";
 import { getInputARIA, mergeProps } from "../utils/index.js";
 import { useSize } from "../SizeContext/SizeContext.js";
 import { themeProps } from "../utils/themeProps.js";
+import { focusOutlineStyles } from "../utils/focusOutline.stylex.js";
+import { stableClassName } from "../naming.js";
 import { groupStyles } from "../InputGroup/groupStyles.js";
 import { useInputGroup } from "../InputGroup/InputGroupContext.js";
 import { VisuallyHidden } from "../VisuallyHidden/index.js";
 import { useTranslator } from "../i18n/index.js";
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 const styles = {
   triggerContainer: {
     kVAEAm: "x1n2onr6",
@@ -60,6 +65,21 @@ const styles = {
     kMwMTN: "xv1l7n4",
     $$css: true
   },
+  triggerIcon: {
+    kmuXW: "x2lah0s",
+    $$css: true
+  },
+  triggerIconRotation: {
+    k1ekBW: "x11xpdln",
+    kIyJzY: "xuedmi6",
+    kAMwcw: "xlr8y92",
+    k3nNDw: "x1g0ag68",
+    $$css: true
+  },
+  triggerIconOpen: {
+    k3aq6I: "x19jd1h0",
+    $$css: true
+  },
   triggerGhost: {
     kzqmXN: "x14atkfc",
     kMzoRj: "xc342km",
@@ -67,8 +87,6 @@ const styles = {
     kKwaWg: "x1ilzqfv xq8i9tn",
     kGVxlE: "x1gnnqk1 x1irk71m x15ysqaf",
     k63SB2: "x1e4wzip",
-    kI3sdo: "x1a2a7pz x1irc7jg",
-    kInvED: "x1wfwxd8 xscfbxq",
     k1ekBW: "xrafxwg",
     k3aq6I: "x3oybdh xk4oym4",
     $$css: true
@@ -78,12 +96,26 @@ const styles = {
     k3aq6I: "x1c071of x1pdlv7q",
     $$css: true
   },
-  popover: {
-    k7Eaqz: "xrzjruh",
+  statusButton: {
+    k1xSpc: "x78zum5",
+    kGNEyG: "x6s0dn4",
+    kjj79g: "xl56j7k",
+    kmVPX3: "x1717udv",
+    kogj98: "x1ghz6dp",
+    kMzoRj: "xc342km",
+    ksu8eU: "xng3xce",
+    kWkggS: "xjbqb8w",
+    kMwMTN: "x1heor9g",
+    kkrTdU: "x1ypdohk",
+    kaIpWk: "xh6dtrn",
     $$css: true
   },
-  sectionDivider: {
-    kqGvvJ: "xsq74q5",
+  searchRowInput: {
+    kg3NbH: "x2hg6jq",
+    $$css: true
+  },
+  popover: {
+    k7Eaqz: "xrzjruh",
     $$css: true
   },
   divider: {
@@ -249,6 +281,7 @@ export function Selector(props) {
     startIcon,
     htmlName,
     renderOption,
+    indicatorPosition = 'end',
     hasSearch = false,
     searchPlaceholder: searchPlaceholderFromProps,
     placement,
@@ -275,16 +308,20 @@ export function Selector(props) {
   const statusMessageId = useId();
   const inputLabelId = useId();
   const searchId = useId();
+  // Measure from the same outer control that usePopover anchors to; using the
+  // shorter inner button makes every size's selected row land too low.
+  const anchorRef = useRef(null);
   const triggerRef = useRef(null);
   const searchRef = useRef(null);
   const inputGroup = useInputGroup();
   const [searchQuery, setSearchQuery] = useState('');
-  // A typed query shows TextInput's built-in clear (✕) button, which becomes
+  // A typed query shows the search row's clear (✕) button, which becomes
   // the next tab stop after the search input.
   const hasQuery = searchQuery.length > 0;
   const [, startTransition] = useTransition();
   const [optimisticValue, setOptimisticValue] = useOptimistic(normalizedValue);
   const isBusy = isLoading || optimisticValue !== normalizedValue;
+  const announce = useAnnounce();
 
   // Disabled-reason tooltip. Disabled controls swallow pointer events, so the
   // tooltip listeners attach to the trigger container (which already exists)
@@ -325,15 +362,15 @@ export function Selector(props) {
   // Ref for listbox to measure selected item position
   const listboxRef = useRef(null);
 
-  // Announce match counts / "No results found" politely as the user types, so
-  // screen-reader users hear how many options remain. Filtering was previously
-  // silent (comboboxes-7). Mirrors BaseTypeahead, which announces from its
-  // query-change callback (not a reactive effect) via the same useAnnounce hook.
-  const announce = useAnnounce();
+  // Typeahead is defined below (it needs the popover), but closing and clearing
+  // must drop its pending buffer — otherwise a stale prefix survives the reset
+  // window and poisons the next keystroke ("Dog" then "c" would search "dc").
+  const resetTypeaheadRef = useRef(() => {});
 
   // Layer for dropdown positioning
   const handleLayerHide = useCallback(() => {
     setSearchQuery('');
+    resetTypeaheadRef.current();
     // Clear any lingering result count when the popover closes so stale status
     // text does not linger in the a11y tree.
     announce('');
@@ -346,7 +383,10 @@ export function Selector(props) {
     hasAutoFocus: false,
     // The popup's own role="listbox" is the exposed semantics; the trigger
     // keeps DOM focus, so wrapping it in a modal dialog would misrepresent it.
-    role: 'none'
+    role: 'none',
+    // The theme target belongs on the SURFACE that paints the popup, which
+    // `usePopover` owns — not on the scrolling list inside it.
+    surfaceTarget: 'selector-popup'
   });
 
   // Open dropdown on mount when isDefaultOpen is true
@@ -384,7 +424,7 @@ export function Selector(props) {
     selectedItemIndex,
     listboxId,
     listboxRef,
-    triggerRef
+    anchorRef
   });
   const selectedItemOffset = shouldOverlaySelectedItem ? rawOffset : 0;
   const isPositioned = shouldOverlaySelectedItem ? rawIsPositioned : true;
@@ -396,6 +436,7 @@ export function Selector(props) {
   // Clear the current value. Shared by the clear button and the keyboard
   // Delete/Backspace path so clearing is reachable without a mouse.
   const clearValue = useCallback(() => {
+    resetTypeaheadRef.current();
     onChange?.(null);
     if (changeAction) {
       startTransition(async () => {
@@ -405,10 +446,25 @@ export function Selector(props) {
     }
   }, [onChange, changeAction, startTransition, setOptimisticValue]);
 
-  // Selector behavior (keyboard nav, typeahead, selection)
+  // Type-to-find appends to the query rather than replacing it: characters
+  // typed before focus reaches the search input must not be dropped.
+  const appendSearchQuery = useCallback(char => {
+    setSearchQuery(query => query + char);
+  }, []);
+  const commitValue = useCallback(newValue => {
+    onChange?.(newValue);
+    if (changeAction) {
+      startTransition(async () => {
+        setOptimisticValue(newValue);
+        await changeAction(newValue);
+      });
+    }
+  }, [onChange, changeAction, startTransition, setOptimisticValue]);
+
+  // Selector behavior (keyboard nav, selection)
   const {
     highlightedIndex,
-    setHighlightedIndex: _setHighlightedIndex,
+    setHighlightedIndex,
     getItemId,
     onTriggerClick,
     onKeyDown,
@@ -416,7 +472,11 @@ export function Selector(props) {
     onItemMouseEnter
   } = useCombobox({
     selectableItems: filteredItems,
-    value: normalizedValue,
+    // The optimistic value, not the raw prop: with a pending changeAction the
+    // prop still holds the old selection, so the popup would open with the
+    // highlight on it and Delete/Backspace could clear a value the action has
+    // already replaced.
+    value: optimisticValue,
     isDisabled,
     isOpen: popover.isOpen,
     hasSearch,
@@ -424,24 +484,56 @@ export function Selector(props) {
       popover.show();
       if (hasSearch) {
         requestAnimationFrame(() => {
-          searchRef.current?.focus();
+          const input = searchRef.current;
+          if (input) {
+            input.focus();
+            // When typing seeded the query, place the caret after it so the
+            // user keeps typing where they left off.
+            input.setSelectionRange(input.value.length, input.value.length);
+          }
         });
       }
     }, [popover, hasSearch]),
     onClose: popover.hide,
-    onSelect: useCallback(newValue => {
-      onChange?.(newValue);
-      if (changeAction) {
-        startTransition(async () => {
-          setOptimisticValue(newValue);
-          await changeAction(newValue);
-        });
-      }
-    }, [onChange, changeAction, startTransition, setOptimisticValue]),
+    onSelect: commitValue,
     onClear: hasClear ? clearValue : undefined,
+    onSearchSeed: appendSearchQuery,
     listboxId
   });
 
+  // Type-to-select, shared with the other collections (menus, listboxes).
+  // Open, it walks the highlight — aria-activedescendant announces each match.
+  // Closed, it commits the match like a native select, which changes the value
+  // without opening the popup or moving focus, so nothing else would prompt
+  // assistive tech to re-read the trigger: announce it explicitly.
+  const typeahead = useTypeahead({
+    getItemLabels: () => selectableItems.map(item => item.label ?? item.value),
+    isDisabled: index => selectableItems[index]?.disabled === true,
+    // Cycle onward from the highlight when open, from the committed selection
+    // when closed — the optimistic one, so a pending changeAction cannot strand
+    // cycling on the first match. -1 means nothing is selected or highlighted,
+    // which the hook reads as "search from the top".
+    getCurrentIndex: () => popover.isOpen ? highlightedIndex : selectedItemIndex,
+    onMatch: index => {
+      const item = selectableItems[index];
+      if (popover.isOpen) {
+        setHighlightedIndex(index);
+      } else if (item.value !== optimisticValue) {
+        commitValue(item.value);
+        announce(item.label ?? item.value);
+      }
+    }
+  });
+  resetTypeaheadRef.current = typeahead.reset;
+  const handleTriggerKeyDown = useCallback(e => {
+    // With hasSearch the query input owns typing, so type-to-select is off.
+    if (!isDisabled && !hasSearch && typeahead.onKeyDown(e)) {
+      e.preventDefault();
+      return;
+    }
+    onKeyDown(e);
+  }, [isDisabled, hasSearch, typeahead, onKeyDown]);
+
   // Keep the highlighted option visible during keyboard navigation. The
   // listbox is a fixed-height scroll container, so without this the virtual
   // cursor walks off-screen once navigation passes the visible window. Mirrors
@@ -466,13 +558,39 @@ export function Selector(props) {
     if (!hasSearch) {
       return null;
     }
-    return /*#__PURE__*/_jsx("div", {
-      ...{
-        className: "x78zum5 x6s0dn4 xf314gf xu0wf1k"
-      },
-      onKeyDown: e => {
-        // The clear (✕) button lives inside the TextInput, after the input in
-        // DOM order. When it is focused and the user tabs forward there is
+    return /*#__PURE__*/_jsx(PanelSearchInput, {
+      ref: searchRef,
+      id: searchId
+      // The search row is the panel's header: a magnifier, a borderless
+      // input, and the shared clear (✕) button. It deliberately does NOT
+      // render a bordered TextInput — the popup is already a bordered
+      // surface, and a field inside it drew a second box within that box.
+      ,
+      label: t('@astryx.selector.searchOptions')
+      // Same accessible name the TextInput's built-in clear produced
+      // ("Clear Search options"), so the affordance keeps its name while its
+      // chrome changes.
+      ,
+      clearLabel: t('@astryx.textInput.clearLabel', {
+        label: t('@astryx.selector.searchOptions')
+      }),
+      ...themeProps('selector-search'),
+      xstyle: variant !== 'ghost' && styles.searchRowInput
+      // When hasSearch is set, focus moves into this input on open, so it —
+      // not the trigger — must be the combobox that reports the highlighted
+      // option via aria-activedescendant (comboboxes-4). A bare searchbox
+      // left the highlight silent to screen readers.
+      ,
+      role: "combobox",
+      "aria-expanded": popover.isOpen,
+      "aria-controls": listboxId,
+      "aria-autocomplete": "list",
+      "aria-activedescendant": popover.isOpen && highlightedIndex >= 0 ? getItemId(highlightedIndex) : undefined,
+      value: searchQuery,
+      onValueChange: handleSearchChange,
+      onContainerKeyDown: e => {
+        // The clear (✕) button lives inside the row, after the input in DOM
+        // order. When it is focused and the user tabs forward there is
         // nothing else in the popup, so dismiss it (Shift+Tab returns to the
         // input natively). Key events originating on the input are handled on
         // the input below; ignore them here so we don't double-dismiss.
@@ -483,63 +601,70 @@ export function Selector(props) {
           onKeyDown(e);
         }
       },
-      children: /*#__PURE__*/_jsx(TextInput, {
-        ref: searchRef,
-        id: searchId
-        // The search field IS a TextInput: the leading magnifier is its
-        // `startIcon` and the trailing clear (✕) is its built-in `hasClear`
-        // (which resets the value and refocuses the input). We add no bespoke
-        // affordance chrome — the field just looks and behaves like every
-        // other Astryx input.
-        ,
-        label: t('@astryx.selector.searchOptions'),
-        isLabelHidden: true,
-        startIcon: "search",
-        hasClear: true,
-        size: "sm"
-        // Fill the dropdown's width (minus the wrapper's inline padding) so
-        // the field is flush end-to-end rather than sized to its content.
-        ,
-        width: "100%"
-        // When hasSearch is set, focus moves into this input on open, so it —
-        // not the trigger — must be the combobox that reports the highlighted
-        // option via aria-activedescendant (comboboxes-4). A bare searchbox
-        // left the highlight silent to screen readers. role + aria-* pass
-        // through to the underlying <input> via BaseProps.
-        ,
-        role: "combobox",
-        "aria-expanded": popover.isOpen,
-        "aria-controls": listboxId,
-        "aria-autocomplete": "list",
-        "aria-activedescendant": popover.isOpen && highlightedIndex >= 0 ? getItemId(highlightedIndex) : undefined,
-        value: searchQuery,
-        onChange: handleSearchChange,
-        onKeyDown: e => {
-          // Arrow keys navigate options; Enter selects; Escape closes.
-          // Home/End are left to the input for caret movement (APG editable
-          // combobox); PageUp/PageDown are the sanctioned substitute for
-          // jumping to the first/last option.
-          if (e.key === 'ArrowDown' || e.key === 'ArrowUp' || e.key === 'PageUp' || e.key === 'PageDown' || e.key === 'Enter' || e.key === 'Escape') {
-            onKeyDown(e);
-            return;
-          }
-          // Tab: when a query is showing the clear (✕) button, forward-tab
-          // moves focus to it (keeping the popup open) so the affordance is
-          // keyboard-reachable. Every other Tab dismisses the popup as usual.
-          if (e.key === 'Tab' && (e.shiftKey || !hasQuery)) {
-            onKeyDown(e);
-          }
-        },
-        placeholder: searchPlaceholder
-      })
+      onKeyDown: e => {
+        // Arrow keys navigate options; Enter selects; Escape closes.
+        // Home/End are left to the input for caret movement (APG editable
+        // combobox); PageUp/PageDown are the sanctioned substitute for
+        // jumping to the first/last option.
+        if (e.key === 'ArrowDown' || e.key === 'ArrowUp' || e.key === 'PageUp' || e.key === 'PageDown' || e.key === 'Enter' || e.key === 'Escape') {
+          onKeyDown(e);
+          return;
+        }
+        // Tab: when a query is showing the clear (✕) button, forward-tab
+        // moves focus to it (keeping the popup open) so the affordance is
+        // keyboard-reachable. Every other Tab dismisses the popup as usual.
+        if (e.key === 'Tab' && (e.shiftKey || !hasQuery)) {
+          onKeyDown(e);
+        }
+      },
+      placeholder: searchPlaceholder
     });
-  }, [hasSearch, searchId, listboxId, searchQuery, hasQuery, searchPlaceholder, handleSearchChange, onKeyDown, popover.isOpen, highlightedIndex, getItemId, t]);
+  }, [hasSearch, searchId, listboxId, searchQuery, hasQuery, searchPlaceholder, handleSearchChange, onKeyDown, popover.isOpen, highlightedIndex, getItemId, variant, t]);
+
+  // The single-selection mark, resolved from the theme once per render. A
+  // theme that maps `check` to another indicator (a radio, say) changes every
+  // selected-option mark in the app through this one lookup.
+  const SelectionMark = useIndicator('check');
 
   // Render an individual item
   const renderItem = useCallback((item, flatIndex) => {
     const isHighlighted = flatIndex === highlightedIndex;
     const isSelected = item.value === normalizedValue;
-    return /*#__PURE__*/_jsxs("div", {
+
+    /*
+     * Rendered UNCONDITIONALLY, with the state passed down: the default
+     * check draws nothing when unchecked, but a theme that replaces the
+     * `check` indicator with a radio needs the unselected state to draw
+     * its empty circle. `{isSelected && …}` would make that impossible.
+     *
+     * `selector-check` stays the stable target for the mark's position
+     * in the row; the indicator owns what the mark looks like.
+     */
+    const mark = /*#__PURE__*/_jsx("span", {
+      ...{
+        className: "x3nfvp2 x6s0dn4 xl56j7k x2lah0s xgomdpo"
+      },
+      children: /*#__PURE__*/_jsx(SelectionMark, {
+        state: isSelected ? 'checked' : 'unchecked',
+        size: "sm",
+        isDisabled: item.disabled ?? false,
+        ...themeProps('selector-check')
+      })
+    });
+    const optionContent = /*#__PURE__*/_jsx("span", {
+      ...{
+        className: "x78zum5 x6s0dn4 x1txdalj x98rzlu xeuugli"
+      },
+      children: renderOption ? renderOption(item) : /*#__PURE__*/_jsx(DefaultOption, {
+        option: item
+      })
+    });
+    const content = indicatorPosition === 'start' ? /*#__PURE__*/_jsxs(_Fragment, {
+      children: [mark, optionContent]
+    }) : /*#__PURE__*/_jsxs(_Fragment, {
+      children: [optionContent, mark]
+    });
+    return /*#__PURE__*/_jsx("div", {
       id: getItemId(flatIndex),
       role: "option",
       "aria-selected": isSelected,
@@ -547,20 +672,9 @@ export function Selector(props) {
       onClick: () => onItemSelect(item),
       onMouseEnter: () => onItemMouseEnter(item, flatIndex),
       ...stylex.props(styles.item, itemSizeStyles[size], isHighlighted && styles.itemHighlighted, isSelected && styles.itemSelected, item.disabled && styles.itemDisabled),
-      children: [/*#__PURE__*/_jsx("span", {
-        ...{
-          className: "x78zum5 x6s0dn4 x1txdalj x98rzlu xeuugli"
-        },
-        children: renderOption ? renderOption(item) : /*#__PURE__*/_jsx(DefaultOption, {
-          option: item
-        })
-      }), isSelected && /*#__PURE__*/_jsx(Icon, {
-        icon: "check",
-        size: "sm",
-        color: "accent"
-      })]
+      children: content
     }, item.value);
-  }, [renderOption, highlightedIndex, size, normalizedValue, getItemId, onItemSelect, onItemMouseEnter]);
+  }, [renderOption, indicatorPosition, highlightedIndex, size, normalizedValue, getItemId, onItemSelect, onItemMouseEnter, SelectionMark]);
 
   // Render all options (handling sections/dividers)
   const renderOptions = useCallback(() => {
@@ -574,9 +688,9 @@ export function Selector(props) {
       // result-count live region instead.
       return [/*#__PURE__*/_jsx("div", {
         role: "presentation",
-        ...{
+        ...mergeProps(themeProps('selector-empty-state'), {
           className: "x1b2ylru x2b8uid xv1l7n4 x9ynric xcr08ib"
-        },
+        }),
         children: "No results found"
       }, "empty")];
     }
@@ -608,16 +722,21 @@ export function Selector(props) {
         if (sectionItems.length === 0) {
           continue;
         }
-        if (option.title) {
-          elements.push(/*#__PURE__*/_jsx(Divider, {
-            label: option.title,
-            xstyle: styles.sectionDivider
-          }, `section-divider-${i}`));
-        }
-        elements.push(/*#__PURE__*/_jsx("div", {
+        // The heading lives INSIDE the group and is aria-hidden: the group
+        // already carries the title as its accessible name, so exposing the
+        // text again would announce it twice. This also keeps role="listbox"'s
+        // children to option/group only — the old labeled Divider sat in the
+        // listbox as a stray role="separator".
+        elements.push(/*#__PURE__*/_jsxs("div", {
           role: "group",
           "aria-label": option.title,
-          children: sectionItems
+          children: [option.title && /*#__PURE__*/_jsx("div", {
+            "aria-hidden": "true",
+            ...mergeProps(themeProps('selector-section-heading'), {
+              className: "xu0wf1k xf314gf x9ynric x141an7d x1ltkj2j xv1l7n4 x87ps6o"
+            }),
+            children: option.title
+          }), sectionItems]
         }, `section-${i}`));
       } else if (isOptionData(option)) {
         const normalized = normalizeOption(option);
@@ -638,6 +757,7 @@ export function Selector(props) {
   const selectorContent = /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsxs("div", {
       ref: el => {
+        anchorRef.current = el;
         popover.triggerRef(el);
         // Anchor + hover/focus listeners for the disabled-message tooltip.
         // Handlers are gated internally by isEnabled, and anchor names
@@ -649,8 +769,9 @@ export function Selector(props) {
       ...mergeProps(themeProps('selector', {
         variant,
         size,
-        status: status?.type ?? null
-      }), stylex.props(inputWrapperStyles.base, styles.triggerContainer, sizeStyles[size], variant === 'ghost' && styles.triggerGhost, isDisabled && inputWrapperStyles.disabled, variant === 'ghost' && isDisabled && styles.triggerGhostDisabled, !selectedItem && styles.triggerPlaceholder, variant !== 'ghost' && status && inputStatusBorderStyles[status.type], variant !== 'ghost' && status && !isDisabled && inputStatusHoverShadowStyles[status.type], variant !== 'ghost' && inputGroup && groupStyles.inGroup, xstyle), className, style),
+        status: status?.type ?? null,
+        disabled: isDisabled ? 'disabled' : null
+      }), stylex.props(inputWrapperStyles.base, styles.triggerContainer, sizeStyles[size], variant === 'ghost' && styles.triggerGhost, variant === 'ghost' && focusOutlineStyles.focusWithin, isDisabled && inputWrapperStyles.disabled, variant === 'ghost' && isDisabled && styles.triggerGhostDisabled, !selectedItem && styles.triggerPlaceholder, variant !== 'ghost' && status && inputStatusBorderStyles[status.type], variant !== 'ghost' && status && !isDisabled && inputStatusHoverShadowStyles[status.type], variant !== 'ghost' && inputGroup && groupStyles.inGroup, xstyle), className, style),
       children: [startIcon && renderIconSlot(startIcon, {
         size: 'sm',
         color: 'secondary'
@@ -682,7 +803,7 @@ export function Selector(props) {
         ,
         disabled: isDisabled && !showsDisabledMessage,
         "aria-disabled": showsDisabledMessage ? 'true' : undefined,
-        onKeyDown: onKeyDown,
+        onKeyDown: handleTriggerKeyDown,
         tabIndex: isDisabled && !showsDisabledMessage ? -1 : 0,
         ...{
           className: "x78zum5 x6s0dn4 x1qughib x1txdalj x1iyjqo2 xs83m0k x1r8uery xeuugli x1717udv x1ghz6dp xc342km xng3xce xjbqb8w xjb2p0i x1qlqyl8 x15bjb6t x1heor9g x1ypdohk x1a2a7pz"
@@ -703,84 +824,63 @@ export function Selector(props) {
         disabled: isDisabled
       }), isBusy && /*#__PURE__*/_jsx(Spinner, {
         size: "sm"
-      }), hasClear && value != null && !isDisabled && /*#__PURE__*/_jsx("button", {
-        type: "button",
-        onClick: handleClear,
-        "aria-label": t('@astryx.selector.clearLabel', {
+      }), hasClear && value != null && !isDisabled && /*#__PURE__*/_jsx(InputClearButton, {
+        label: t('@astryx.selector.clearLabel', {
           label
         }),
-        ...{
-          className: "x78zum5 x6s0dn4 xl56j7k x1717udv x1ghz6dp xc342km xng3xce xjbqb8w x1ypdohk xh6dtrn x1a2a7pz x1p25gnr x1y3gkto"
-        },
+        onClick: handleClear,
+        iconClassName: stableClassName('selector-clear-icon')
+      }), showStatusIcon ? showStatusTooltip ? /*#__PURE__*/_jsx("button", {
+        ref: statusTooltip.ref,
+        type: "button",
+        "aria-label": t(STATUS_BUTTON_LABEL_KEY[status.type]),
+        "aria-describedby": statusTooltip.describedBy,
+        onClick: e => e.stopPropagation(),
+        ...stylex.props(focusOutlineStyles.focusVisible, styles.statusButton),
         children: /*#__PURE__*/_jsx(Icon, {
-          icon: "close",
-          size: "sm",
-          color: "secondary"
-          // Stable theme target on the clear glyph itself, so a theme can
-          // restyle just this icon (color, size, hover) via `defineTheme`.
-          // Same-element rules in @layer astryx-theme win over the icon's
-          // own base color/size, which a button-level target could not
-          // reach.
-          ,
-          ...themeProps('selector-clear-icon')
-        })
-      }), /*#__PURE__*/_jsx("span", {
-        ...{
-          0: {
-            className: "x2lah0s x78zum5 x6s0dn4 xl56j7k x1kky2od xlup9mm x11xpdln xuedmi6 xlr8y92 x1g0ag68 xv9yike"
-          },
-          2: {
-            className: "x2lah0s x78zum5 x6s0dn4 xl56j7k x1kky2od xlup9mm x11xpdln xuedmi6 xlr8y92 x1g0ag68 xv9yike x19jd1h0"
-          },
-          1: {
-            className: "x2lah0s x78zum5 x6s0dn4 xl56j7k x1kky2od xlup9mm x11xpdln xuedmi6 xlr8y92 x1g0ag68 xv9yike xq2gx43"
-          },
-          3: {
-            className: "x2lah0s x78zum5 x6s0dn4 xl56j7k x1kky2od xlup9mm x11xpdln xuedmi6 xlr8y92 x1g0ag68 xv9yike x19jd1h0 xq2gx43"
-          }
-        }[!!(!showStatusIcon && popover.isOpen) << 1 | !!showStatusIcon << 0],
-        children: showStatusIcon ? showStatusTooltip ? /*#__PURE__*/_jsx("button", {
-          ref: statusTooltip.ref,
-          type: "button",
-          "aria-label": t(STATUS_BUTTON_LABEL_KEY[status.type]),
-          "aria-describedby": statusTooltip.describedBy,
-          onClick: e => e.stopPropagation(),
-          ...{
-            className: "x78zum5 x6s0dn4 xl56j7k x1717udv x1ghz6dp xc342km xng3xce xjbqb8w x1heor9g x1ypdohk xh6dtrn x1a2a7pz x1p25gnr x1y3gkto"
-          },
-          children: /*#__PURE__*/_jsx(Icon, {
-            icon: STATUS_ICON_MAP[status.type],
-            size: "sm",
-            color: STATUS_ICON_COLOR_MAP[status.type]
-          })
-        }) : /*#__PURE__*/_jsx(Icon, {
           icon: STATUS_ICON_MAP[status.type],
           size: "sm",
-          color: STATUS_ICON_COLOR_MAP[status.type]
-        }) : /*#__PURE__*/_jsx(Icon, {
-          icon: "chevronDown",
-          size: "sm",
-          color: "inherit"
-          // Stable theme target on the chevron glyph itself, so a theme can
-          // restyle just this icon (color, size, hover) — and its
-          // open/closed state — via `defineTheme`. Same-element rules in
-          // @layer astryx-theme win over the icon's own base color/size,
-          // which a button-level target could not reach.
-          ,
-          ...themeProps('selector-indicator-icon', {
-            state: popover.isOpen ? 'expanded' : 'collapsed'
-          })
+          color: STATUS_ICON_COLOR_MAP[status.type],
+          xstyle: styles.triggerIcon
+        })
+      }) : /*#__PURE__*/_jsx(Icon, {
+        icon: STATUS_ICON_MAP[status.type],
+        size: "sm",
+        color: STATUS_ICON_COLOR_MAP[status.type],
+        xstyle: styles.triggerIcon
+      }) : /*#__PURE__*/_jsx(Icon, {
+        icon: "chevronDown",
+        size: "sm",
+        color: "secondary"
+        // The rotation rides on the glyph, alongside the box and color
+        // the wrapper used to provide, so one element carries the mark,
+        // its open/closed transform, and the theme target.
+        ,
+        xstyle: [styles.triggerIcon, styles.triggerIconRotation, popover.isOpen && styles.triggerIconOpen]
+        // Stable theme target on the chevron glyph itself, so a theme can
+        // restyle just this icon (color, size, hover) — and its
+        // open/closed state — via `defineTheme`. Same-element rules in
+        // @layer astryx-theme win over the icon's own base color/size,
+        // which a button-level target could not reach.
+        ,
+        ...themeProps('selector-indicator-icon', {
+          state: popover.isOpen ? 'expanded' : 'collapsed'
         })
       })]
     }), popover.render(hasSearch ? /*#__PURE__*/_jsxs("div", {
-      children: [renderSearch(), /*#__PURE__*/_jsx("div", {
+      children: [renderSearch(), /*#__PURE__*/_jsx(Divider, {}), /*#__PURE__*/_jsx("div", {
         ref: listboxRef,
         id: listboxId,
         role: "listbox",
         "aria-labelledby": triggerId,
         ...{
-          className: "x9f619 xuyqlj2 x1odjw0f x9epnlk x1hc1fzr x1ey1afo"
-        },
+          0: {
+            className: "x9f619 xuyqlj2 x1odjw0f xu0wf1k x7a5moj x1hc1fzr x1ey1afo"
+          },
+          1: {
+            className: "x9f619 xuyqlj2 x1odjw0f xu0wf1k x1hc1fzr x1ey1afo x2hg6jq"
+          }
+        }[!!(variant !== 'ghost') << 0],
         children: renderOptions()
       })]
     }) : /*#__PURE__*/_jsx("div", {
@@ -790,16 +890,26 @@ export function Selector(props) {
       "aria-labelledby": triggerId,
       ...{
         0: {
-          className: "x9f619 xuyqlj2 x1odjw0f x9epnlk x1hc1fzr x1ey1afo"
+          className: "x9f619 xuyqlj2 x1odjw0f xu0wf1k x7a5moj x1hc1fzr x1ey1afo"
+        },
+        2: {
+          className: "x9f619 xuyqlj2 x1odjw0f xu0wf1k x1hc1fzr x1ey1afo x2hg6jq"
         },
         1: {
-          className: "x9f619 xuyqlj2 x1odjw0f x9epnlk xg01cxk xq2gx43"
+          className: "x9f619 xuyqlj2 x1odjw0f xu0wf1k x7a5moj xg01cxk xq2gx43"
+        },
+        3: {
+          className: "x9f619 xuyqlj2 x1odjw0f xu0wf1k x2hg6jq xg01cxk xq2gx43"
         }
-      }[!!!isPositioned << 0],
+      }[!!(variant !== 'ghost') << 1 | !!!isPositioned << 0],
       children: renderOptions()
     }), {
       placement: popoverPlacement,
       alignment: 'start',
+      // The system's standard menu clearance, except in overlay mode:
+      // there the measured negative margin owns the block geometry and
+      // the menu is meant to sit on the trigger, not clear it.
+      offset: shouldOverlaySelectedItem ? undefined : spacingVars['--spacing-1'],
       xstyle: [styles.popover, layerAnimations[popoverPlacement]],
       style: popoverOffsetStyle
     }), showStatusTooltip && statusTooltip.renderTooltip(status?.message ?? ''), showsDisabledMessage && disabledMessageTooltip.renderTooltip(disabledMessage)]