@crisp-ui-kit/crisp 0.26.0 → 0.26.1

package/dist/cjs/product/command/command.js

@@ -159,6 +159,31 @@ function Command({ open, onOpenChange, items = exports.defaultCommandItems, plac
         if (queryProp === undefined)
             setInternalQuery(next);
     }, [onQueryChange, queryProp]);
+    /**
+     * Where the user was when the palette opened.
+     *
+     * The dialog machine restores focus on close, and for Dialog and Drawer that
+     * lands on the trigger: focus-trap remembers whatever was focused when the
+     * trap activated. The palette is different — the combobox focuses the search
+     * input as part of the same commit, so the element the trap remembers is the
+     * input, which is then removed with the palette, and focus falls to
+     * `document.body`. The palette is the one surface opened from anywhere with
+     * a shortcut, so losing the caller's place is worst exactly here (#241).
+     *
+     * Recorded by watching focus WHILE CLOSED rather than reading
+     * `document.activeElement` when `open` flips: by the time an effect of ours
+     * runs, the input may already hold focus.
+     */
+    const openerRef = React.useRef(null);
+    React.useEffect(() => {
+        if (open)
+            return;
+        const onFocusIn = (e) => {
+            openerRef.current = e.target;
+        };
+        document.addEventListener("focusin", onFocusIn);
+        return () => document.removeEventListener("focusin", onFocusIn);
+    }, [open]);
     const dialogService = (0, react_1.useMachine)(dialog.machine, {
         id: dialogId,
         open,
@@ -166,6 +191,7 @@ function Command({ open, onOpenChange, items = exports.defaultCommandItems, plac
             onOpenChange(details.open);
         },
         initialFocusEl: () => inputRef.current,
+        finalFocusEl: () => openerRef.current,
         "aria-label": ariaLabel,
     });
     const dlg = dialog.connect(dialogService, react_1.normalizeProps);

package/dist/esm/product/command/command.js

@@ -122,6 +122,31 @@ export function Command({ open, onOpenChange, items = defaultCommandItems, place
         if (queryProp === undefined)
             setInternalQuery(next);
     }, [onQueryChange, queryProp]);
+    /**
+     * Where the user was when the palette opened.
+     *
+     * The dialog machine restores focus on close, and for Dialog and Drawer that
+     * lands on the trigger: focus-trap remembers whatever was focused when the
+     * trap activated. The palette is different — the combobox focuses the search
+     * input as part of the same commit, so the element the trap remembers is the
+     * input, which is then removed with the palette, and focus falls to
+     * `document.body`. The palette is the one surface opened from anywhere with
+     * a shortcut, so losing the caller's place is worst exactly here (#241).
+     *
+     * Recorded by watching focus WHILE CLOSED rather than reading
+     * `document.activeElement` when `open` flips: by the time an effect of ours
+     * runs, the input may already hold focus.
+     */
+    const openerRef = React.useRef(null);
+    React.useEffect(() => {
+        if (open)
+            return;
+        const onFocusIn = (e) => {
+            openerRef.current = e.target;
+        };
+        document.addEventListener("focusin", onFocusIn);
+        return () => document.removeEventListener("focusin", onFocusIn);
+    }, [open]);
     const dialogService = useMachine(dialog.machine, {
         id: dialogId,
         open,
@@ -129,6 +154,7 @@ export function Command({ open, onOpenChange, items = defaultCommandItems, place
             onOpenChange(details.open);
         },
         initialFocusEl: () => inputRef.current,
+        finalFocusEl: () => openerRef.current,
         "aria-label": ariaLabel,
     });
     const dlg = dialog.connect(dialogService, normalizeProps);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crisp-ui-kit/crisp",
-  "version": "0.26.0",
+  "version": "0.26.1",
   "description": "A lean React design system, measured pixel-for-pixel from Attio.",
   "license": "MIT",
   "type": "module",