@astryxdesign/core 0.7.1-canary.fe8cad0 → 0.7.1

package/dist/Chat/useTriggerMenu.js

@@ -10,7 +10,9 @@
  *
  * Detects trigger characters (@ / etc.) typed inside a contentEditable,
  * opens a popover at the cursor position with filtered items, handles
- * keyboard navigation, and inserts tokens or text on selection.
+ * keyboard navigation, and inserts tokens or text on selection. Triggers
+ * opt into multi-word queries with hasMultiWordQuery; results apply only
+ * while their query is current (component:ChatComposerInput FR10–FR16).
  *
  * Reuses SearchSource from Typeahead for async/sync search with
  * cancel() support and debounce.
@@ -25,7 +27,7 @@ import { usePopover } from "../Popover/usePopover.js";
 import { useHighlightedOptionScroll } from "../hooks/useHighlightedOptionScroll.js";
 import "../theme/tokens.stylex.js";
 import { colorVars, spacingVars, radiusVars, typeScaleVars, typographyVars } from "../theme/tokens.stylex.js";
-import { mergeProps, groupItems } from "../utils/index.js";
+import { mergeProps, groupItems, isImeKeyEvent } from "../utils/index.js";
 import { themeProps } from "../utils/themeProps.js";
 import { useTranslator } from "../i18n/index.js";
 
@@ -48,6 +50,15 @@ const styles = {
 // Helpers
 // =============================================================================
 
+/** The text node holding a collapsed caret inside `editable`, if any. */
+function getCaretTextNode(editable) {
+  const selection = window.getSelection();
+  if (!selection || selection.rangeCount === 0) {
+    return null;
+  }
+  const node = selection.getRangeAt(0).startContainer;
+  return node.nodeType === Node.TEXT_NODE && editable.contains(node) ? node : null;
+}
 function getTextBeforeCursor(editable) {
   const selection = window.getSelection();
   if (!selection || selection.rangeCount === 0) {
@@ -66,27 +77,73 @@ function getTextBeforeCursor(editable) {
   }
   return null;
 }
+const MAX_MULTI_WORD_QUERY_LENGTH = 64;
+
+/**
+ * An unmatched multi-word query hides the menu instead of covering prose with
+ * an empty panel, unless the trigger supplies its own empty message.
+ */
+function isUnmatchedMultiWordQuery(trigger, items, isLoading) {
+  return trigger?.hasMultiWordQuery === true &&
+  // `null` means "not given", exactly as `undefined` does.
+  trigger.emptySearchText == null && items.length === 0 && !isLoading;
+}
+function isTriggerBoundary(char) {
+  return char === null || char === ' ' || char === '\t' || char === '\n';
+}
+
+/**
+ * Finds the trigger query the caret is in (component:ChatComposerInput FR10,
+ * FR11). A trigger character activates at the start of the text or after a
+ * space, tab, or line break. A single-token query ends at whitespace. A
+ * multi-word query ends at a line break, past the length bound, or where the
+ * same trigger's character starts a new query; another trigger's character
+ * inside it is ordinary text.
+ */
 function findActiveTrigger(textBeforeCursor, triggers) {
-  for (let i = textBeforeCursor.length - 1; i >= 0; i--) {
+  let active = null;
+  for (let i = 0; i < textBeforeCursor.length; i++) {
     const char = textBeforeCursor[i];
-    if (char === ' ' || char === '\n') {
-      return null;
+    if (char === '\n') {
+      active = null;
+      continue;
     }
-    for (const trigger of triggers) {
-      if (char === trigger.character) {
-        const prevChar = i > 0 ? textBeforeCursor[i - 1] : null;
-        if (prevChar === null || prevChar === ' ' || prevChar === '\n') {
-          const query = textBeforeCursor.slice(i + 1);
-          return {
-            trigger,
-            query,
-            triggerStart: i
-          };
-        }
+    if (active && !active.trigger.hasMultiWordQuery) {
+      if (char === ' ' || char === '\t') {
+        active = null;
       }
+      continue;
+    }
+    if (active && i - active.triggerStart > MAX_MULTI_WORD_QUERY_LENGTH) {
+      active = null;
+    }
+    if (!isTriggerBoundary(i > 0 ? textBeforeCursor[i - 1] : null)) {
+      continue;
+    }
+    const trigger = triggers.find(t => t.character === char);
+    if (!trigger) {
+      continue;
     }
+    if (active && trigger.character !== active.trigger.character) {
+      continue;
+    }
+    active = {
+      trigger,
+      triggerStart: i
+    };
   }
-  return null;
+  if (!active) {
+    return null;
+  }
+  const query = textBeforeCursor.slice(active.triggerStart + 1);
+  if (active.trigger.hasMultiWordQuery && query.length > MAX_MULTI_WORD_QUERY_LENGTH) {
+    return null;
+  }
+  return {
+    trigger: active.trigger,
+    query,
+    triggerStart: active.triggerStart
+  };
 }
 function deleteTriggerText(editable, triggerStart) {
   const selection = window.getSelection();
@@ -131,11 +188,17 @@ export function useTriggerMenu(options) {
     query: '',
     items: [],
     highlightedIndex: 0,
-    isLoading: false
+    isLoading: false,
+    isHidden: false
   });
   const triggerStartRef = useRef(-1);
   const searchTimeoutRef = useRef(null);
+  const searchRequestIdRef = useRef(0);
+  const dismissedRef = useRef(null);
   const anchorSpanRef = useRef(null);
+  // True while the popover is closed only because the query is unmatched; the
+  // trigger query itself is still active.
+  const isMenuSuppressedRef = useRef(false);
   const removeAnchorSpan = useCallback(() => {
     if (anchorSpanRef.current) {
       anchorSpanRef.current.remove();
@@ -144,6 +207,10 @@ export function useTriggerMenu(options) {
   }, []);
   const popover = usePopover({
     onHide: useCallback(() => {
+      if (isMenuSuppressedRef.current) {
+        return;
+      }
+      searchRequestIdRef.current++;
       removeAnchorSpan();
       setState(prev => ({
         ...prev,
@@ -152,7 +219,8 @@ export function useTriggerMenu(options) {
         query: '',
         items: [],
         highlightedIndex: 0,
-        isLoading: false
+        isLoading: false,
+        isHidden: false
       }));
     }, [removeAnchorSpan]),
     hasLightDismiss: true,
@@ -162,6 +230,10 @@ export function useTriggerMenu(options) {
     // the contenteditable composer, so a modal dialog wrapper is incorrect.
     role: 'none'
   });
+  const {
+    show: showPopover,
+    hide: hidePopover
+  } = popover;
 
   // Cleanup on unmount
   useEffect(() => {
@@ -177,14 +249,29 @@ export function useTriggerMenu(options) {
       clearTimeout(searchTimeoutRef.current);
       searchTimeoutRef.current = null;
     }
+    searchRequestIdRef.current++;
     // Cancel any in-flight search on the active trigger's searchSource
     const trigger = state.activeTrigger;
     if (trigger?.searchSource) {
       trigger.searchSource.cancel?.();
     }
     removeAnchorSpan();
+    isMenuSuppressedRef.current = false;
+    // Ending the query also forgets an Escape on it; a send or clear must not
+    // leave the next message's mention at the same offset suppressed.
+    dismissedRef.current = null;
     popover.hide();
     triggerStartRef.current = -1;
+    setState(prev => ({
+      ...prev,
+      isActive: false,
+      activeTrigger: null,
+      query: '',
+      items: [],
+      highlightedIndex: 0,
+      isLoading: false,
+      isHidden: false
+    }));
   }, [popover, state.activeTrigger, removeAnchorSpan]);
 
   // Anchor the popover to the cursor position (not the entire input).
@@ -232,9 +319,46 @@ export function useTriggerMenu(options) {
       clearTimeout(searchTimeoutRef.current);
       searchTimeoutRef.current = null;
     }
+    const requestId = ++searchRequestIdRef.current;
+    // A result applies only while its request is the latest one and the
+    // caret is still inside the same trigger query. Submitting or clearing
+    // the editor ends the query without an input event, so check the DOM.
+    const isCurrent = () => {
+      if (requestId !== searchRequestIdRef.current) {
+        return false;
+      }
+      const editable = editableRef.current;
+      const textBefore = editable ? getTextBeforeCursor(editable) : null;
+      const found = textBefore === null || !triggers ? null : findActiveTrigger(textBefore, triggers);
+      if (found?.trigger.character !== trigger.character || found.triggerStart !== triggerStartRef.current) {
+        reset();
+        return false;
+      }
+      return true;
+    };
+    const applyResults = items => {
+      const isHidden = isUnmatchedMultiWordQuery(trigger, items, false);
+      setState(prev => ({
+        ...prev,
+        items,
+        highlightedIndex: items.length > 0 ? 0 : -1,
+        isLoading: false,
+        isHidden
+      }));
+      // A hidden menu closes its popover, which also releases the popover's
+      // Escape and light-dismiss handling; matches reopen it at the caret.
+      if (isHidden && !isMenuSuppressedRef.current) {
+        isMenuSuppressedRef.current = true;
+        hidePopover();
+      } else if (!isHidden && isMenuSuppressedRef.current) {
+        isMenuSuppressedRef.current = false;
+        setAnchor();
+        showPopover();
+      }
+    };
     const doSearch = () => {
       if (trigger.searchSource) {
-        // Use SearchSource \u2014 cancel previous, then search
+        // Use SearchSource — cancel previous, then search
         trigger.searchSource.cancel?.();
         setState(prev => ({
           ...prev,
@@ -242,19 +366,15 @@ export function useTriggerMenu(options) {
         }));
         const result = trigger.searchSource.search(query);
         Promise.resolve(result).then(items => {
-          setState(prev => ({
-            ...prev,
-            items,
-            highlightedIndex: items.length > 0 ? 0 : -1,
-            isLoading: false
-          }));
+          if (!isCurrent()) {
+            return;
+          }
+          applyResults(items);
         }, () => {
-          setState(prev => ({
-            ...prev,
-            items: [],
-            highlightedIndex: -1,
-            isLoading: false
-          }));
+          if (!isCurrent()) {
+            return;
+          }
+          applyResults([]);
         });
       }
     };
@@ -274,7 +394,7 @@ export function useTriggerMenu(options) {
         doSearch();
       }
     }
-  }, [debounceMs]);
+  }, [debounceMs, editableRef, triggers, reset, setAnchor, hidePopover, showPopover]);
   const selectItem = useCallback(item => {
     const trigger = state.activeTrigger;
     if (!trigger) {
@@ -309,6 +429,7 @@ export function useTriggerMenu(options) {
     }
     const textBefore = getTextBeforeCursor(editable);
     if (textBefore === null) {
+      dismissedRef.current = null;
       if (state.isActive) {
         reset();
       }
@@ -316,6 +437,7 @@ export function useTriggerMenu(options) {
     }
     const found = findActiveTrigger(textBefore, triggers);
     if (!found) {
+      dismissedRef.current = null;
       if (state.isActive) {
         reset();
       }
@@ -326,14 +448,27 @@ export function useTriggerMenu(options) {
       query,
       triggerStart
     } = found;
-    if (!state.isActive || state.activeTrigger !== trigger) {
+
+    // After Escape, keep the menu hidden while that same query keeps growing
+    const dismissed = dismissedRef.current;
+    if (dismissed && dismissed.character === trigger.character && dismissed.triggerStart === triggerStart && dismissed.textNode !== null && dismissed.textNode.isConnected && dismissed.textNode === getCaretTextNode(editable)) {
+      if (query.startsWith(dismissed.dismissedQuery)) {
+        return;
+      }
+      dismissedRef.current = null;
+    } else {
+      dismissedRef.current = null;
+    }
+    if (!state.isActive || state.activeTrigger?.character !== trigger.character || triggerStartRef.current !== triggerStart) {
       triggerStartRef.current = triggerStart;
+      isMenuSuppressedRef.current = false;
       setState(prev => ({
         ...prev,
         isActive: true,
         activeTrigger: trigger,
         query,
-        highlightedIndex: 0
+        highlightedIndex: 0,
+        isHidden: false
       }));
       setAnchor();
       searchItems(trigger, query);
@@ -341,13 +476,50 @@ export function useTriggerMenu(options) {
     } else if (state.query !== query) {
       setState(prev => ({
         ...prev,
-        query
+        query,
+        activeTrigger: trigger
       }));
       searchItems(trigger, query);
     }
   }, [triggers, editableRef, state.isActive, state.activeTrigger, state.query, reset, setAnchor, searchItems, popover]);
+  const isMenuVisible = state.isActive && !state.isHidden;
   const handleKeyDown = useCallback(e => {
-    if (!state.isActive || !popover.isOpen) {
+    // Never intercept IME composition keystrokes (e.g. Enter committing candidates)
+    if (isImeKeyEvent(e.nativeEvent)) {
+      return false;
+    }
+
+    // A hidden menu consumes nothing: arrows move the caret, Enter submits,
+    // and Escape reaches the surrounding surface.
+    if (!isMenuVisible) {
+      return false;
+    }
+    if (e.key === 'Escape') {
+      e.preventDefault();
+      const editable = editableRef.current;
+      const dismissed = state.activeTrigger ? {
+        character: state.activeTrigger.character,
+        triggerStart: triggerStartRef.current,
+        dismissedQuery: state.query,
+        textNode: editable ? getCaretTextNode(editable) : null
+      } : null;
+      reset();
+      // Remembered after reset, which clears it: the menu stays hidden while
+      // this same query keeps growing.
+      dismissedRef.current = dismissed;
+      return true;
+    }
+
+    // A visible menu keeps the arrows even when it has nothing to pick (rows
+    // still loading, or the empty message), so they never recall history
+    // under an open panel. Enter and Tab pick only a settled row; otherwise
+    // they keep their editor meaning, so Enter sends the message as typed.
+    const hasPickableRows = !state.isLoading && state.items.length > 0;
+    if (!hasPickableRows && (e.key === 'ArrowDown' || e.key === 'ArrowUp')) {
+      e.preventDefault();
+      return true;
+    }
+    if (!hasPickableRows) {
       return false;
     }
     switch (e.key) {
@@ -379,16 +551,10 @@ export function useTriggerMenu(options) {
           }
           return false;
         }
-      case 'Escape':
-        {
-          e.preventDefault();
-          reset();
-          return true;
-        }
       default:
         return false;
     }
-  }, [state.isActive, state.highlightedIndex, state.items, popover.isOpen, selectItem, reset]);
+  }, [isMenuVisible, editableRef, state.activeTrigger, state.query, state.isLoading, state.highlightedIndex, state.items, selectItem, reset]);
   const getItemId = useCallback(index => `${listboxId}-option-${index}`, [listboxId]);
 
   // Keep the highlighted option visible during keyboard navigation; hover
@@ -416,7 +582,7 @@ export function useTriggerMenu(options) {
   const ariaProps = !hasTriggers ? {
     role: 'textbox',
     'aria-multiline': 'true'
-  } : state.isActive && popover.isOpen ? {
+  } : isMenuVisible ? {
     role: 'combobox',
     'aria-expanded': true,
     'aria-controls': listboxId,
@@ -428,9 +594,15 @@ export function useTriggerMenu(options) {
     'aria-haspopup': 'listbox'
   };
   const renderMenu = useCallback(() => {
-    const trigger = state.activeTrigger;
-    const emptyText = trigger?.emptySearchText ?? 'No results';
-    const loadingText = trigger?.loadingText ?? 'Searching\u2026';
+    const activeTrigger = state.activeTrigger;
+    if (!activeTrigger) {
+      return null;
+    }
+    if (state.isHidden) {
+      return null;
+    }
+    const emptyText = activeTrigger.emptySearchText ?? 'No results';
+    const loadingText = activeTrigger.loadingText ?? 'Searching\u2026';
     let listContent;
     if (state.isLoading) {
       listContent = /*#__PURE__*/_jsx("div", {
@@ -471,7 +643,7 @@ export function useTriggerMenu(options) {
                 className: "x9f619 x78zum5 x6s0dn4 xh8yej3 xlsj2fj xh6dtrn x1ypdohk x16khyan x1a2a7pz xc342km xng3xce x1yc453h x9ynric xjm74w1 xw6l6zx x1tgivj0 x1lmrjuc"
               }
             }[!!(idx === state.highlightedIndex) << 0],
-            children: trigger?.renderItem ? trigger.renderItem(item) : /*#__PURE__*/_jsx("span", {
+            children: activeTrigger.renderItem ? activeTrigger.renderItem(item) : /*#__PURE__*/_jsx("span", {
               ...{
                 className: "x98rzlu xeuugli xb3r6kr xlyipyv xuxw1ft"
               },
@@ -498,7 +670,7 @@ export function useTriggerMenu(options) {
     return popover.render(/*#__PURE__*/_jsx("div", {
       id: listboxId,
       role: "listbox",
-      "aria-label": trigger?.menuLabel ?? t('@astryx.chatTriggerMenu.suggestions'),
+      "aria-label": activeTrigger.menuLabel ?? t('@astryx.chatTriggerMenu.suggestions'),
       ...mergeProps(themeProps('trigger-menu'), {
         className: "x9f619 x1xiyphd x1odjw0f x9epnlk xfb3i0g"
       }),

package/dist/CommandPalette/CommandPalette.d.ts

@@ -1,6 +1,7 @@
 /**
  * @file CommandPalette.tsx
- * @input Uses React, Dialog, Layout, CommandPaletteContext, SearchSource, useCombobox, useAnnounce
+ * @input Uses React, Dialog, Layout, CommandPaletteContext, SearchSource,
+ *   useCombobox, useAnnounce, useAnnounceRenderedText
  * @output Exports CommandPalette root component and props
  * @position Core root component; dialog shell with searchSource-driven items
  *
@@ -84,9 +85,10 @@ export interface CommandPaletteProps<T extends SearchableItem = SearchableItem>
  * Uses `searchSource` for all search logic — same interface as Typeahead.
  * For static lists, use `createStaticSource` from `@astryxdesign/core/Typeahead`.
  *
- * Keyboard navigation is handled by `useCombobox` from Selector,
- * ensuring consistent arrow key, Home/End, Enter, and Escape behavior
- * across all combobox-pattern components.
+ * Keyboard navigation is handled by `useCombobox` from Selector for arrows,
+ * PageUp/PageDown, and Enter. Home/End remain native caret keys. Modal Escape
+ * dismissal delegates to Dialog's shared layer stack so nested surfaces handle
+ * the first press.
  *
  * Input and footer are rendered by default — only pass them to replace the defaults.
  *

package/dist/CommandPalette/CommandPalette.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CommandPalette.d.ts","sourceRoot":"","sources":["../../src/CommandPalette/CommandPalette.tsx"],"names":[],"mappings":"AAGA;;;;;;;;;GASG;AAEH,OAAO,EASL,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AAGf,OAAO,KAAK,EAAC,YAAY,EAAE,cAAc,EAAC,MAAM,cAAc,CAAC;AAU/D,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAI5C,MAAM,WAAW,mBAAmB,CAClC,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,EAAE,UAAU,CAAC;IACtD,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACnC,2CAA2C;IAC3C,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,0DAA0D;IAC1D,YAAY,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IAExC;;;;OAIG;IACH,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;IAE9B;;;OAGG;IACH,KAAK,CAAC,EAAE,SAAS,CAAC;IAElB;;;OAGG;IACH,MAAM,CAAC,EAAE,SAAS,CAAC;IAEnB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,UAAU,EAAE,OAAO,KAAK,SAAS,CAAC;IAEzD;;;OAGG;IACH,eAAe,CAAC,EAAE,SAAS,CAAC;IAE5B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,SAAS,CAAC;IAE/B,mDAAmD;IACnD,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,8CAA8C;IAC9C,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAExC;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAExB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC7B;AAiID;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,cAAc,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,EAAE,EACxE,GAAG,EACH,MAAM,EACN,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,KAAK,EACL,MAAM,EACN,UAAU,EACV,eAAe,EAAE,wBAAwB,EACzC,kBAAkB,EAAE,2BAA2B,EAC/C,KAAK,EAAE,eAAe,EACtB,aAAa,EACb,KAAK,EAAE,cAAc,EACrB,KAAW,EACX,SAAe,EACf,GAAG,IAAI,EACR,EAAE,mBAAmB,CAAC,CAAC,CAAC,+BAsXxB;yBAvYe,cAAc"}
+{"version":3,"file":"CommandPalette.d.ts","sourceRoot":"","sources":["../../src/CommandPalette/CommandPalette.tsx"],"names":[],"mappings":"AAGA;;;;;;;;;;GAUG;AAEH,OAAO,EASL,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AAGf,OAAO,KAAK,EAAC,YAAY,EAAE,cAAc,EAAC,MAAM,cAAc,CAAC;AAU/D,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAK5C,MAAM,WAAW,mBAAmB,CAClC,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,EAAE,UAAU,CAAC;IACtD,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACnC,2CAA2C;IAC3C,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,0DAA0D;IAC1D,YAAY,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IAExC;;;;OAIG;IACH,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;IAE9B;;;OAGG;IACH,KAAK,CAAC,EAAE,SAAS,CAAC;IAElB;;;OAGG;IACH,MAAM,CAAC,EAAE,SAAS,CAAC;IAEnB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,UAAU,EAAE,OAAO,KAAK,SAAS,CAAC;IAEzD;;;OAGG;IACH,eAAe,CAAC,EAAE,SAAS,CAAC;IAE5B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,SAAS,CAAC;IAE/B,mDAAmD;IACnD,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,8CAA8C;IAC9C,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAExC;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAExB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC7B;AAiID;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,cAAc,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,EAAE,EACxE,GAAG,EACH,MAAM,EACN,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,KAAK,EACL,MAAM,EACN,UAAU,EACV,eAAe,EAAE,wBAAwB,EACzC,kBAAkB,EAAE,2BAA2B,EAC/C,KAAK,EAAE,eAAe,EACtB,aAAa,EACb,KAAK,EAAE,cAAc,EACrB,KAAW,EACX,SAAe,EACf,GAAG,IAAI,EACR,EAAE,mBAAmB,CAAC,CAAC,CAAC,+BA2YxB;yBA5Ze,cAAc"}

package/dist/CommandPalette/CommandPalette.js

@@ -4,7 +4,8 @@
 
 /**
  * @file CommandPalette.tsx
- * @input Uses React, Dialog, Layout, CommandPaletteContext, SearchSource, useCombobox, useAnnounce
+ * @input Uses React, Dialog, Layout, CommandPaletteContext, SearchSource,
+ *   useCombobox, useAnnounce, useAnnounceRenderedText
  * @output Exports CommandPalette root component and props
  * @position Core root component; dialog shell with searchSource-driven items
  *
@@ -24,6 +25,7 @@ import { CommandPaletteInput } from "./CommandPaletteInput.js";
 import { CommandPaletteFooter } from "./CommandPaletteFooter.js";
 import { CommandPaletteEmpty } from "./CommandPaletteEmpty.js";
 import { useAnnounce } from "../hooks/useAnnounce.js";
+import { useAnnounceRenderedText } from "../hooks/useAnnounceRenderedText.js";
 import { useTranslator } from "../i18n/index.js";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 function getGroup(item) {
@@ -145,9 +147,10 @@ function ItemRenderer({
  * Uses `searchSource` for all search logic — same interface as Typeahead.
  * For static lists, use `createStaticSource` from `@astryxdesign/core/Typeahead`.
  *
- * Keyboard navigation is handled by `useCombobox` from Selector,
- * ensuring consistent arrow key, Home/End, Enter, and Escape behavior
- * across all combobox-pattern components.
+ * Keyboard navigation is handled by `useCombobox` from Selector for arrows,
+ * PageUp/PageDown, and Enter. Home/End remain native caret keys. Modal Escape
+ * dismissal delegates to Dialog's shared layer stack so nested surfaces handle
+ * the first press.
  *
  * Input and footer are rendered by default — only pass them to replace the defaults.
  *
@@ -200,6 +203,7 @@ export function CommandPalette({
   const [optimisticResults, setOptimisticResults] = useOptimistic(searchResults);
   const isBusy = isPending;
   const searchVersionRef = useRef(0);
+  const emptyStateRef = useRef(null);
 
   // Announce search status to screen readers through the shared polite live
   // region (comboboxes-7 announce path, mirroring Selector / BaseTypeahead).
@@ -267,6 +271,10 @@ export function CommandPalette({
   const runSearch = useCallback(query => {
     searchSource.cancel?.();
     const version = ++searchVersionRef.current;
+    // A highlight belongs to the query that created it. Clear it before any
+    // optimistic narrowing so aria-activedescendant never shifts to a
+    // different command at the same index while the next result set loads.
+    combobox.setHighlightedIndex(-1);
     startTransition(async () => {
       const isBootstrap = query === '';
 
@@ -293,18 +301,12 @@ export function CommandPalette({
 
         // Announce the outcome from the search commit (not a reactive
         // effect), matching Selector / BaseTypeahead: exactly one
-        // announcement per committed query, and the version check above
-        // already discards stale keystrokes. Bootstrap stays silent — the
-        // same role PowerSearch's mount guard plays — so opening the
-        // palette announces nothing; clearing the query only clears any
-        // lingering status text.
+        // announcement per committed non-empty query. Empty results are
+        // announced from their rendered content below so a caller-supplied
+        // ReactNode reaches assistive technology as written.
         if (isBootstrap) {
           announce('');
-        } else if (items.length === 0) {
-          announce(t('@astryx.commandPalette.noResultsFor', {
-            query
-          }));
-        } else {
+        } else if (items.length > 0) {
           announce(t('@astryx.commandPalette.resultCount', {
             count: items.length
           }));
@@ -346,13 +348,18 @@ export function CommandPalette({
     }
   }, [isOpen]);
 
-  // Wrap combobox's onKeyDown to intercept Escape (close palette) and
-  // Enter on highlight (select + close), since we're not using combobox's
-  // built-in open/close lifecycle.
+  // Wrap combobox's onKeyDown to preserve inline-preview Escape handling and
+  // select + close on Enter. Modal Escape stays unclaimed here so Dialog's
+  // shared dismissal stack can route it to the topmost surface.
   const handleKeyDown = useCallback(e => {
     if (e.key === 'Escape') {
-      e.preventDefault();
-      handleClose();
+      // Modal CommandPalette delegates Escape to Dialog's shared dismissal
+      // stack so a nested layer handles the first press. Inline previews do
+      // not join that stack, so preserve their local close behavior.
+      if (isInline) {
+        e.preventDefault();
+        handleClose();
+      }
       return;
     }
     if (e.key === 'Enter') {
@@ -366,12 +373,17 @@ export function CommandPalette({
       }
       return;
     }
+    // Home and End remain native caret-movement keys for this editable
+    // combobox. PageUp/PageDown provide first/last result navigation.
+    if (e.key === 'Home' || e.key === 'End') {
+      return;
+    }
     // Space should type in the input, not trigger selection
     if (e.key === ' ') {
       return;
     }
     combobox.onKeyDown(e);
-  }, [combobox, handleClose, selectableItems, selectItem]);
+  }, [combobox, handleClose, isInline, selectableItems, selectItem]);
 
   // Hover highlight is owned here by a single delegated handler on the list
   // container: it routes to useCombobox's hover-aware path, which moves the
@@ -427,13 +439,19 @@ export function CommandPalette({
   // the empty state is never unmounted and re-added mid-search (which flashed).
   const showEmptyBootstrap = search === '' && optimisticResults.length === 0;
   const showEmptySearch = search !== '' && optimisticResults.length === 0;
+  // Announce only once the search settles: while it is pending, optimistic
+  // narrowing can empty the list before the source answers, which would
+  // speak "No results" early or wrongly.
+  useAnnounceRenderedText(emptyStateRef, showEmptySearch && !isPending, search);
   let listContent;
   if (showEmptyBootstrap) {
     listContent = /*#__PURE__*/_jsx(CommandPaletteEmpty, {
+      ref: emptyStateRef,
       children: emptyBootstrapText
     });
   } else if (showEmptySearch) {
     listContent = /*#__PURE__*/_jsx(CommandPaletteEmpty, {
+      ref: emptyStateRef,
       children: emptySearchText
     });
   } else {

package/dist/CommandPalette/CommandPaletteEmpty.d.ts

@@ -12,13 +12,14 @@ export interface CommandPaletteEmptyProps extends BaseProps<HTMLDivElement> {
  * - `emptyBootstrapText`: no search term and bootstrap() returns nothing
  * - `emptySearchText`: a search query returned no results
  *
- * Can also be composed manually inside a custom render function.
+ * Can also be composed as a standalone empty result surface. Render actionable
+ * empty content outside listbox and option semantics.
  *
  * @example
  * ```
  * <CommandPalette
- *   emptyBootstrapText={<CommandPaletteEmpty>Start typing to search</CommandPaletteEmpty>}
- *   emptySearchText={<CommandPaletteEmpty>No results found</CommandPaletteEmpty>}
+ *   emptyBootstrapText="Start typing to search"
+ *   emptySearchText="No results found"
  *   searchSource={source}
  * />
  * ```

package/dist/CommandPalette/CommandPaletteEmpty.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CommandPaletteEmpty.d.ts","sourceRoot":"","sources":["../../src/CommandPalette/CommandPaletteEmpty.tsx"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,EAAC,KAAK,SAAS,EAAC,MAAM,OAAO,CAAC;AAS5C,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAkB5C,MAAM,WAAW,wBAAyB,SAAQ,SAAS,CAAC,cAAc,CAAC;IACzE,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAChC,yCAAyC;IACzC,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,GAAG,EACH,QAAQ,EACR,MAAM,EACN,SAAS,EACT,KAAK,EACL,GAAG,KAAK,EACT,EAAE,wBAAwB,qBAc1B;yBArBe,mBAAmB"}
+{"version":3,"file":"CommandPaletteEmpty.d.ts","sourceRoot":"","sources":["../../src/CommandPalette/CommandPaletteEmpty.tsx"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,EAAC,KAAK,SAAS,EAAC,MAAM,OAAO,CAAC;AAS5C,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAkB5C,MAAM,WAAW,wBAAyB,SAAQ,SAAS,CAAC,cAAc,CAAC;IACzE,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAChC,yCAAyC;IACzC,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,GAAG,EACH,QAAQ,EACR,MAAM,EACN,SAAS,EACT,KAAK,EACL,GAAG,KAAK,EACT,EAAE,wBAAwB,qBAc1B;yBArBe,mBAAmB"}

package/dist/CommandPalette/CommandPaletteEmpty.js

@@ -41,13 +41,14 @@ const styles = {
  * - `emptyBootstrapText`: no search term and bootstrap() returns nothing
  * - `emptySearchText`: a search query returned no results
  *
- * Can also be composed manually inside a custom render function.
+ * Can also be composed as a standalone empty result surface. Render actionable
+ * empty content outside listbox and option semantics.
  *
  * @example
  * ```
  * <CommandPalette
- *   emptyBootstrapText={<CommandPaletteEmpty>Start typing to search</CommandPaletteEmpty>}
- *   emptySearchText={<CommandPaletteEmpty>No results found</CommandPaletteEmpty>}
+ *   emptyBootstrapText="Start typing to search"
+ *   emptySearchText="No results found"
  *   searchSource={source}
  * />
  * ```

package/dist/CommandPalette/CommandPaletteInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CommandPaletteInput.d.ts","sourceRoot":"","sources":["../../src/CommandPalette/CommandPaletteInput.tsx"],"names":[],"mappings":"AAGA;;;;;;;;;;GAUG;AAEH,OAAO,EAAiC,KAAK,SAAS,EAAC,MAAM,OAAO,CAAC;AAarE,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAkE5C,MAAM,WAAW,wBAAyB,SAAQ,IAAI,CACpD,SAAS,CAAC,gBAAgB,CAAC,EAC3B,UAAU,CACX;IACC,iEAAiE;IACjE,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAElC;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;OAGG;IACH,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAExC;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;;OAIG;IACH,UAAU,CAAC,EAAE,SAAS,CAAC;IAEvB,qDAAqD;IACrD,QAAQ,CAAC,EAAE,KAAK,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;CACvD;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,KAAK,EAAE,eAAe,EACtB,aAAa,EACb,WAAW,EAAE,oBAAoB,EACjC,KAAK,EACL,YAAmB,EACnB,UAAU,EACV,QAAQ,EACR,SAAS,EACT,GAAG,EACH,MAAM,EACN,SAAS,EACT,KAAK,EACL,GAAG,KAAK,EACT,EAAE,wBAAwB,+BAiI1B;yBA/Ie,mBAAmB"}
+{"version":3,"file":"CommandPaletteInput.d.ts","sourceRoot":"","sources":["../../src/CommandPalette/CommandPaletteInput.tsx"],"names":[],"mappings":"AAGA;;;;;;;;;;GAUG;AAEH,OAAO,EAAiC,KAAK,SAAS,EAAC,MAAM,OAAO,CAAC;AAarE,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAkE5C,MAAM,WAAW,wBAAyB,SAAQ,IAAI,CACpD,SAAS,CAAC,gBAAgB,CAAC,EAC3B,UAAU,CACX;IACC,iEAAiE;IACjE,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAElC;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;OAGG;IACH,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAExC;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;;OAIG;IACH,UAAU,CAAC,EAAE,SAAS,CAAC;IAEvB,qDAAqD;IACrD,QAAQ,CAAC,EAAE,KAAK,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;CACvD;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,KAAK,EAAE,eAAe,EACtB,aAAa,EACb,WAAW,EAAE,oBAAoB,EACjC,KAAK,EACL,YAAmB,EACnB,UAAU,EACV,QAAQ,EACR,SAAS,EACT,GAAG,EACH,MAAM,EACN,SAAS,EACT,KAAK,EACL,GAAG,KAAK,EACT,EAAE,wBAAwB,+BA2I1B;yBAzJe,mBAAmB"}