@optiaxiom/react 1.5.0 → 1.5.1

package/dist/esm/packages/react/src/dropdown-menu/DropdownMenuSubContent.js

@@ -12,25 +12,16 @@ const DropdownMenuSubContent = forwardRef(({ asChild, children, ...props }, ref)
   const { open, setPresence } = useDropdownMenuSubContext(
     "@optiaxiom/react/DropdownMenuSubContent"
   );
-  return /* @__PURE__ */ jsx(TransitionGroup, { onPresenceChange: setPresence, open, children: /* @__PURE__ */ jsx(Portal, { asChild: true, children: /* @__PURE__ */ jsx(
-    ModalListbox,
+  return /* @__PURE__ */ jsx(TransitionGroup, { onPresenceChange: setPresence, open, children: /* @__PURE__ */ jsx(Portal, { asChild: true, children: /* @__PURE__ */ jsx(ModalListbox, { asChild: true, ...props, children: /* @__PURE__ */ jsx(
+    RadixMenu.SubContent,
     {
-      asChild: true,
-      minW: "trigger",
-      provider: "dropdown-menu",
-      ...props,
-      children: /* @__PURE__ */ jsx(
-        RadixMenu.SubContent,
-        {
-          alignOffset: -4,
-          asChild,
-          ref,
-          sideOffset: 0,
-          children
-        }
-      )
+      alignOffset: -4,
+      asChild,
+      ref,
+      sideOffset: 0,
+      children
     }
-  ) }) });
+  ) }) }) });
 });
 DropdownMenuSubContent.displayName = "@optiaxiom/react/DropdownMenuSubContent";
 

package/dist/esm/packages/react/src/focus-bookmark/FocusBookmarkRestore.js

@@ -0,0 +1,19 @@
+"use client";
+import { forwardRef, useImperativeHandle } from 'react';
+import { useFocusBookmarkRestore } from './useFocusBookmarkRestore.js';
+
+const FocusBookmarkRestore = forwardRef((_props, ref) => {
+  const restore = useFocusBookmarkRestore();
+  useImperativeHandle(
+    ref,
+    () => ({
+      contains: () => false,
+      focus: restore
+    }),
+    [restore]
+  );
+  return null;
+});
+FocusBookmarkRestore.displayName = "@optiaxiom/react/FocusBookmarkRestore";
+
+export { FocusBookmarkRestore };

package/dist/esm/packages/react/src/focus-bookmark/bookmarks.js

@@ -0,0 +1,6 @@
+"use client";
+const bookmarks = {
+  current: []
+};
+
+export { bookmarks };

package/dist/esm/packages/react/src/focus-bookmark/useFocusBookmark.js

@@ -0,0 +1,15 @@
+import { useEffect } from 'react';
+import { bookmarks } from './bookmarks.js';
+
+const useFocusBookmark = (ref) => {
+  useEffect(() => {
+    bookmarks.current.push(ref);
+    return () => {
+      bookmarks.current = bookmarks.current.filter(
+        (bookmark) => bookmark !== ref
+      );
+    };
+  }, [ref]);
+};
+
+export { useFocusBookmark };

package/dist/esm/packages/react/src/focus-bookmark/useFocusBookmarkRestore.js

@@ -0,0 +1,18 @@
+import { useEffectEvent } from '../hooks/useEffectEvent.js';
+import 'react';
+import '../field/FieldContext.js';
+import '../utils/conditions.js';
+import 'react/jsx-runtime';
+import '../utils/isHoverSupported.js';
+import { bookmarks } from './bookmarks.js';
+
+const useFocusBookmarkRestore = () => {
+  return useEffectEvent(() => {
+    if (!bookmarks.current.length) {
+      return;
+    }
+    bookmarks.current[bookmarks.current.length - 1].current?.focus();
+  });
+};
+
+export { useFocusBookmarkRestore };

package/dist/esm/packages/react/src/highlight/Highlight-css.js

@@ -1,7 +1,7 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
-import './../../../../assets/src/highlight/Highlight.css.ts.vanilla-DOwxn4GA.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
+import './../../../../assets/src/highlight/Highlight.css.ts.vanilla-jjeqD_rW.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
-var mark = recipeRuntime({base:'_1c685zg'});
+var mark = recipeRuntime({base:'ubpntc'});
 
 export { mark };

package/dist/esm/packages/react/src/indicator/Indicator-css.js

@@ -1,9 +1,9 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
-import './../../../../assets/src/indicator/Indicator.css.ts.vanilla-Cqc8wAby.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
+import './../../../../assets/src/indicator/Indicator.css.ts.vanilla-Bp0TILRb.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
-var badge = recipeRuntime({base:'sgq41h',variants:{offset:{false:{px:'0',py:'0'},true:[{px:'4',py:'0'},'_1enkwai']},ping:{false:{},true:[{animation:'ping',color:'transparent',pointerEvents:'none'},'g2muv0']}}});
-var floating = recipeRuntime({base:[{display:'inline-flex',pointerEvents:'none',z:'10'},'_1im4w3f'],variants:{offset:{false:'_1ufq5k1',true:{}},position:{'bottom-right':'_11fttsg','top-right':'rsdxgh'}}});
-var indicator = recipeRuntime({base:[{display:'inline-flex'},'_1hpm0bo']});
+var badge = recipeRuntime({base:'_1nop32h',variants:{offset:{false:{px:'0',py:'0'},true:[{px:'4',py:'0'},'wc2rsz']},ping:{false:{},true:[{animation:'ping',color:'transparent',pointerEvents:'none'},'v1ycc9']}}});
+var floating = recipeRuntime({base:[{display:'inline-flex',pointerEvents:'none',z:'10'},'dy9djd'],variants:{offset:{false:'_1cahyis',true:{}},position:{'bottom-right':'_1deypgm','top-right':'e6siu4'}}});
+var indicator = recipeRuntime({base:[{display:'inline-flex'},'la2cyc']});
 
 export { badge, floating, indicator };

package/dist/esm/packages/react/src/inline-input/InlineInput-css.js

@@ -1,8 +1,8 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
-import './../../../../assets/src/inline-input/InlineInput.css.ts.vanilla-BGlStM9W.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
+import './../../../../assets/src/inline-input/InlineInput.css.ts.vanilla-DJBWP3vP.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
-var editor = recipeRuntime({base:'_4fqrgs',variants:{empty:{false:{},true:'kqwghv'}}});
-var input = recipeRuntime({base:'_1nx10cc'});
+var editor = recipeRuntime({base:'ooyjp0',variants:{empty:{false:{},true:'_5l3sew'}}});
+var input = recipeRuntime({base:'_143w7pb'});
 
 export { editor, input };

package/dist/esm/packages/react/src/input/Input-css.js

@@ -1,4 +1,4 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
 var addon = recipeRuntime({base:{display:'flex',flex:'none'}});

package/dist/esm/packages/react/src/input/InputControl-css.js

@@ -1,7 +1,7 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
-import './../../../../assets/src/input/InputControl.css.ts.vanilla-nfmZzL1M.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
+import './../../../../assets/src/input/InputControl.css.ts.vanilla-u-VlisWS.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
-var control = recipeRuntime({base:['je4y4z',{bg:'transparent',flex:'auto',w:'full'},'att9mv','_1gmt08m'],variants:{size:{md:{},lg:{},xl:['e7te21']}}});
+var control = recipeRuntime({base:['_7ucdz4',{bg:'transparent',flex:'auto',w:'full'},'_1fdalq6','_9z58tp'],variants:{size:{md:{},lg:{},xl:['uneeby']}}});
 
 export { control };

package/dist/esm/packages/react/src/input/InputRoot-css.js

@@ -1,9 +1,9 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
-import './../../../../assets/src/avatar/AvatarGroup.css.ts.vanilla-BopGCQ-R.css';
-import './../../../../assets/src/input/InputControl.css.ts.vanilla-nfmZzL1M.css';
-import './../../../../assets/src/input/InputRoot.css.ts.vanilla-DV9HPDg-.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
+import './../../../../assets/src/avatar/AvatarGroup.css.ts.vanilla-1mT-GBsC.css';
+import './../../../../assets/src/input/InputControl.css.ts.vanilla-u-VlisWS.css';
+import './../../../../assets/src/input/InputRoot.css.ts.vanilla-Dt3RTsY7.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
-var root = recipeRuntime({base:[{flexDirection:'row',gap:'0'},'zy8x0w']});
+var root = recipeRuntime({base:[{flexDirection:'row',gap:'0'},'_1bus3je']});
 
 export { root };

package/dist/esm/packages/react/src/kbd/Kbd-css.js

@@ -1,8 +1,8 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
-import './../../../../assets/src/kbd/Kbd.css.ts.vanilla-BjujHWpO.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
+import './../../../../assets/src/kbd/Kbd.css.ts.vanilla-X86I4gvB.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
-var kbd = recipeRuntime({base:{alignItems:'center',color:'fg.secondary',display:'inline-flex',flexDirection:'row',fontFamily:'sans',gap:'2',whiteSpace:'nowrap'},variants:{variant:{outline:[{bg:'bg.secondary',border:'1',borderB:'2',borderColor:'border.secondary',px:'6',rounded:'sm'},'cap2cb'],subtle:{}}}});
-var keys = recipeRuntime({base:'azr6ej'});
+var kbd = recipeRuntime({base:{alignItems:'center',color:'fg.secondary',display:'inline-flex',flexDirection:'row',fontFamily:'sans',gap:'2',whiteSpace:'nowrap'},variants:{variant:{outline:[{bg:'bg.secondary',border:'1',borderB:'2',borderColor:'border.secondary',px:'6',rounded:'sm'},'izwo7d'],subtle:{}}}});
+var keys = recipeRuntime({base:'_1f624bu'});
 
 export { kbd, keys };

package/dist/esm/packages/react/src/label-menu-button/LabelMenuButton-css.js

@@ -1,10 +1,10 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
-import './../../../../assets/src/avatar/AvatarGroup.css.ts.vanilla-BopGCQ-R.css';
-import './../../../../assets/src/button/ButtonRoot.css.ts.vanilla-O9AqM-cn.css';
-import './../../../../assets/src/label-menu-button/LabelMenuButton.css.ts.vanilla-C14Cg9ip.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
+import './../../../../assets/src/avatar/AvatarGroup.css.ts.vanilla-1mT-GBsC.css';
+import './../../../../assets/src/button/ButtonRoot.css.ts.vanilla-c0Df-0jA.css';
+import './../../../../assets/src/label-menu-button/LabelMenuButton.css.ts.vanilla-RT8TQ3_G.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
-var button = recipeRuntime({base:[{justifyContent:'space-between'},'u7n3sq']});
+var button = recipeRuntime({base:[{justifyContent:'space-between'},'_1tovhm0']});
 var content = recipeRuntime({base:[{fontSize:'sm',transition:'all'}],variants:{filled:{false:{h:'0'},true:{h:'16'}}}});
 var label = recipeRuntime({base:[{color:'fg.secondary',cursor:'pointer',maxW:'full',transition:'all'}],variants:{filled:{false:{fontSize:'md'},true:{fontSize:'xs'}}}});
 

package/dist/esm/packages/react/src/layers/layers-css.js

@@ -1,9 +1,9 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
 
 var axiom = 'optiaxiom';
 var base = 'optiaxiom.base';
-var components = 'optiaxiom._1wo04pn';
-var reset = 'optiaxiom._15szljk';
+var components = 'optiaxiom._1hnxwzp';
+var reset = 'optiaxiom._1s6q7tx';
 var theme = 'optiaxiom.theme';
 
 export { axiom, base, components, reset, theme };

package/dist/esm/packages/react/src/layout/Layouts-css.js

@@ -1,7 +1,7 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
-import './../../../../assets/src/layout/Layouts.css.ts.vanilla-BlEAI9ha.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
+import './../../../../assets/src/layout/Layouts.css.ts.vanilla-D1-Ij5nY.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
-var layout = recipeRuntime({base:[{bg:'bg.page',display:'flex',flexDirection:'column',fontSize:'md'},'_13wtcwb']});
+var layout = recipeRuntime({base:[{bg:'bg.page',display:'flex',flexDirection:'column',fontSize:'md'},'mqx0ec']});
 
 export { layout };

package/dist/esm/packages/react/src/link/Link-css.js

@@ -1,8 +1,8 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
-import './../../../../assets/src/link/Link.css.ts.vanilla-BW1It0AR.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
+import './../../../../assets/src/link/Link.css.ts.vanilla-FPM0Un1u.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
-var icon = recipeRuntime({base:[{display:'inline-flex',ml:'4'},'_1feb0mn']});
-var link = recipeRuntime({base:['_5umstt'],variants:{appearance:{'default':'_1r6d5k5',inverse:'x0ynvh',subtle:'_1aynnke'}}});
+var icon = recipeRuntime({base:[{display:'inline-flex',ml:'4'},'_1gmstzu']});
+var link = recipeRuntime({base:['sr6hvo'],variants:{appearance:{'default':'e681zl',inverse:'_7dnb8t',subtle:'_145v0o'}}});
 
 export { icon, link };

package/dist/esm/packages/react/src/listbox/ListboxCheckboxItem-css.js

@@ -1,7 +1,7 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
-import './../../../../assets/src/listbox/ListboxCheckboxItem.css.ts.vanilla-CO9UYuYz.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
+import './../../../../assets/src/listbox/ListboxCheckboxItem.css.ts.vanilla-DeoFu4V5.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
-var checkbox = recipeRuntime({base:[{display:'inline-flex'},'jkt830']});
+var checkbox = recipeRuntime({base:[{display:'inline-flex'},'_7nu7ej']});
 
 export { checkbox };

package/dist/esm/packages/react/src/listbox/ListboxItem-css.js

@@ -1,9 +1,9 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
-import './../../../../assets/src/listbox/ListboxItem.css.ts.vanilla-C6F6cJM6.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
+import './../../../../assets/src/listbox/ListboxItem.css.ts.vanilla-t0w4VnI3.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
-var description = recipeRuntime({base:[{fontSize:'sm'},'s5jxi4']});
-var item = recipeRuntime({base:[{flexDirection:'row',fontSize:'md',gap:'8',p:'8',rounded:'sm',transition:'colors'},'yxy22s'],variants:{intent:{danger:'_15iadzr',neutral:'_1k5ucql'}}});
-var title = recipeRuntime({base:[{alignItems:'center',flexDirection:'row',gap:'8'},'_1tmli2q']});
+var description = recipeRuntime({base:[{fontSize:'sm'},'_10zhs37']});
+var item = recipeRuntime({base:[{flexDirection:'row',fontSize:'md',gap:'8',p:'8',rounded:'sm',transition:'colors'},'_1rls0z8'],variants:{intent:{danger:'vgnfhz',neutral:'t5ual'}}});
+var title = recipeRuntime({base:[{alignItems:'center',flexDirection:'row',gap:'8'},'s877xf']});
 
 export { description, item, title };

package/dist/esm/packages/react/src/listbox/ListboxItemIndicator-css.js

@@ -1,7 +1,7 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
-import './../../../../assets/src/listbox/ListboxItemIndicator.css.ts.vanilla-BYQQkUoP.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
+import './../../../../assets/src/listbox/ListboxItemIndicator.css.ts.vanilla-BvbsDONo.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
-var indicator = recipeRuntime({base:['_1mk0ber'],variants:{active:{false:{},true:'_167le8m'}}});
+var indicator = recipeRuntime({base:['_156togj'],variants:{active:{false:{},true:'_1f2f6e0'}}});
 
 export { indicator };

package/dist/esm/packages/react/src/menu/MenuContent.js

@@ -17,9 +17,7 @@ const MenuContent = forwardRef(
     const innerRef = useRef(null);
     const ref = useComposedRefs(innerRef, outerRef);
     const { labelId } = useFieldContext("@optiaxiom/react/MenuContent");
-    const { activeItemStack, inputVisible, placeholder, size } = useMenuContext(
-      "@optiaxiom/react/MenuContent"
-    );
+    const { activeItemStack, inputRef, inputVisible, placeholder, size } = useMenuContext("@optiaxiom/react/MenuContent");
     const { empty, loading } = useCommandContext(
       "@optiaxiom/react/MenuContent"
     );
@@ -43,6 +41,7 @@ const MenuContent = forwardRef(
             return;
           }
           event.preventDefault();
+          inputRef.current?.focus();
         },
         overflow: "hidden",
         p: size === "sm" ? "4" : "0",

package/dist/esm/packages/react/src/menu/MenuDialogContent-css.js

@@ -1,7 +1,7 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
-import './../../../../assets/src/menu/MenuDialogContent.css.ts.vanilla-D8P1_hWq.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
+import './../../../../assets/src/menu/MenuDialogContent.css.ts.vanilla-CO3bqvq6.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
-var content = recipeRuntime({base:'lp6tc4'});
+var content = recipeRuntime({base:'alashu'});
 
 export { content };

package/dist/esm/packages/react/src/menu/MenuInput-css.js

@@ -1,7 +1,7 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
-import './../../../../assets/src/menu/MenuInput.css.ts.vanilla-rG8GuTkp.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
+import './../../../../assets/src/menu/MenuInput.css.ts.vanilla-CkB0e7dC.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
-var input = recipeRuntime({variants:{size:{sm:{m:'4'},lg:[{border:'0',borderB:'1',borderColor:'border.secondary',rounded:'none'},'_17xoloo']}}});
+var input = recipeRuntime({variants:{size:{sm:{m:'4'},lg:[{border:'0',borderB:'1',borderColor:'border.secondary',rounded:'none'},'_1ytk0dp']}}});
 
 export { input };

package/dist/esm/packages/react/src/menu/MenuInput.js

@@ -10,6 +10,11 @@ import { CommandInput } from '../command/CommandInput.js';
 import '../command/CommandItem.js';
 import '../command/CommandListbox.js';
 import { useCommandContext } from '../command/CommandContext.js';
+import '../focus-bookmark/FocusBookmarkRestore.js';
+import { useFocusBookmark } from '../focus-bookmark/useFocusBookmark.js';
+import '../field/FieldContext.js';
+import '../utils/conditions.js';
+import '../utils/isHoverSupported.js';
 import { useMenuContext } from './MenuContext.js';
 import { input } from './MenuInput-css.js';
 
@@ -22,6 +27,7 @@ const MenuInput = forwardRef(
       "@optiaxiom/react/MenuInput"
     );
     const ref = useComposedRefs(inputRef, outerRef);
+    useFocusBookmark(inputRef);
     const [minWidth, setMinWidth] = useState(160);
     const containerRef = useRef(null);
     useEffect(() => {

package/dist/esm/packages/react/src/menu/MenuPopoverContent.js

@@ -30,15 +30,7 @@ const MenuPopoverContent = forwardRef(({ style, ...props }, outerRef) => {
     });
     return () => observer.disconnect();
   }, [open, props.side]);
-  return /* @__PURE__ */ jsx(
-    PopoverContent,
-    {
-      minW: "trigger",
-      ref,
-      style: { ...style, minHeight },
-      ...props
-    }
-  );
+  return /* @__PURE__ */ jsx(PopoverContent, { ref, style: { ...style, minHeight }, ...props });
 });
 MenuPopoverContent.displayName = "@optiaxiom/react/MenuPopoverContent";
 

package/dist/esm/packages/react/src/menu/MenuSubContent.js

@@ -1,7 +1,7 @@
 "use client";
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { useComposedRefs } from '@radix-ui/react-compose-refs';
-import { forwardRef, useRef, useState, useMemo, useEffect } from 'react';
+import { forwardRef, useState, useMemo, useRef, useEffect } from 'react';
 import { Command } from '../command/Command.js';
 import '../command/CommandInput.js';
 import '../command/CommandItem.js';
@@ -24,25 +24,19 @@ const MenuSubContent = forwardRef(
       "@optiaxiom/react/MenuSubContent"
     );
     const {
-      highlightedItem,
+      highlightedItem: item,
       inputValue: parentInputValue,
       setInputValue: setParentInputValue
     } = useCommandContext("@optiaxiom/react/MenuSubContent");
     const {
       contentRef: parentContentRef,
       inputRef: parentInputRef,
-      open: parentSubMenuOpen,
       triggerRef: parentTriggerRef
     } = useMenuSubContext("@optiaxiom/react/MenuSubContent");
     const { open, presence } = usePopoverContext(
       "@optiaxiom/react/MenuSubContent"
     );
     const ref = useComposedRefs(parentContentRef, outerRef);
-    const itemRef = useRef(highlightedItem);
-    if (parentSubMenuOpen && highlightedItem && (typeof highlightedItem.subOptions === "function" || !!highlightedItem.subOptions?.length)) {
-      itemRef.current = highlightedItem;
-    }
-    const item = itemRef.current;
     const [inputValue, setInputValue] = useState("");
     const options = useMemo(
       () => resolveItemProperty(item?.subOptions, { inputValue }) ?? [],
@@ -73,11 +67,7 @@ const MenuSubContent = forwardRef(
         {
           align,
           alignOffset: item.subOptionsInputVisible ? -46 : -4,
-          minW: "trigger",
           onCloseAutoFocus: (event) => {
-            if (parentSubMenuOpen) {
-              return;
-            }
             event.preventDefault();
             parentInputRef.current?.focus();
           },
@@ -90,6 +80,7 @@ const MenuSubContent = forwardRef(
               return;
             }
             event.preventDefault();
+            inputRef.current?.focus();
           },
           onPointerEnter: () => {
             if (item.subOptionsInputVisible) {

package/dist/esm/packages/react/src/menu/MenuSubInput.js

@@ -1,19 +1,28 @@
 "use client";
 import { jsx } from 'react/jsx-runtime';
-import { forwardRef } from 'react';
+import { useComposedRefs } from '@radix-ui/react-compose-refs';
+import { forwardRef, useRef } from 'react';
 import '../command/Command.js';
 import { CommandInput } from '../command/CommandInput.js';
 import '../command/CommandItem.js';
 import '../command/CommandListbox.js';
 import { useCommandContext } from '../command/CommandContext.js';
+import '../focus-bookmark/FocusBookmarkRestore.js';
+import { useFocusBookmark } from '../focus-bookmark/useFocusBookmark.js';
+import '../field/FieldContext.js';
+import '../utils/conditions.js';
+import '../utils/isHoverSupported.js';
 import { useMenuSubContext } from './MenuSubContext.js';
 
 const MenuSubInput = forwardRef(
-  ({ onKeyDown, ...props }, ref) => {
+  ({ onKeyDown, ...props }, outerRef) => {
     const { downshift, highlightedItem } = useCommandContext(
       "@optiaxiom/react/MenuSubInput"
     );
     const { setOpen } = useMenuSubContext("@optiaxiom/react/MenuSubInput");
+    const innerRef = useRef(null);
+    const ref = useComposedRefs(innerRef, outerRef);
+    useFocusBookmark(innerRef);
     return /* @__PURE__ */ jsx(
       CommandInput,
       {

package/dist/esm/packages/react/src/modal/ModalListbox-css.js

@@ -1,7 +1,7 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
-import './../../../../assets/src/modal/ModalListbox.css.ts.vanilla-Dwc1LppA.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
+import './../../../../assets/src/modal/ModalListbox.css.ts.vanilla-BzdnTk-p.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
-var listbox = recipeRuntime({base:[{maxW:'xs',p:'4'},'_4a5ui8'],variants:{maxH:{xs:'wkrj2i',sm:'_1iggozq',md:'_44eops',lg:'_45zj6j',full:{}},minW:{'0':{},trigger:'wpo0rv'},provider:{'dropdown-menu':'_1770a28',popover:'_356dka',popper:'tjo06o'}}});
+var listbox = recipeRuntime({base:[{maxW:'xs',p:'4'},'_137o7zz'],variants:{maxH:{xs:'_19e9f8x',sm:'_6qxdh0',md:'_3eoqqh',lg:'gqddap',full:{}},minW:{'0':{},trigger:'_6ejizl'}}});
 
 export { listbox };

package/dist/esm/packages/react/src/modal/ModalListbox.js

@@ -19,11 +19,11 @@ import '../transition/TransitionGroup.js';
 import { listbox } from './ModalListbox-css.js';
 
 const ModalListbox = forwardRef(
-  ({ children, className, maxH, minW, provider = "popover", ...props }, ref) => /* @__PURE__ */ jsx(Transition, { duration: "sm", type: "pop", children: /* @__PURE__ */ jsx(Paper, { asChild: true, children: /* @__PURE__ */ jsx(
+  ({ children, className, maxH, minW, ...props }, ref) => /* @__PURE__ */ jsx(Transition, { duration: "sm", type: "pop", children: /* @__PURE__ */ jsx(Paper, { asChild: true, children: /* @__PURE__ */ jsx(
     Listbox,
     {
       ref,
-      ...listbox({ maxH, minW, provider }, className),
+      ...listbox({ maxH, minW }, className),
       ...props,
       children
     }

package/dist/esm/packages/react/src/nav/Nav-css.js

@@ -1,7 +1,7 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
-import './../../../../assets/src/nav/Nav.css.ts.vanilla-CDY2trIw.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
+import './../../../../assets/src/nav/Nav.css.ts.vanilla-V7wQzusF.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
-var nav = recipeRuntime({base:[{bg:'bg.default',flex:'1',gap:'0',overflow:'hidden',pb:'8',pt:'16'},'_1d44vgh']});
+var nav = recipeRuntime({base:[{bg:'bg.default',flex:'1',gap:'0',overflow:'hidden',pb:'8',pt:'16'},'_1alniqk']});
 
 export { nav };

package/dist/esm/packages/react/src/nav/NavAccountItem-css.js

@@ -1,7 +1,7 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
-import './../../../../assets/src/nav/NavAccountItem.css.ts.vanilla-B_diGx7I.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
+import './../../../../assets/src/nav/NavAccountItem.css.ts.vanilla-DJh8tYjr.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
-var item = recipeRuntime({base:{flex:'1',flexDirection:'row',fontSize:'md',gap:'8',overflowX:'hidden',transition:'opacity'},variants:{expanded:{false:'_81szjv',true:'_1y8s27t'}}});
+var item = recipeRuntime({base:{flex:'1',flexDirection:'row',fontSize:'md',gap:'8',overflowX:'hidden',transition:'opacity'},variants:{expanded:{false:'_1gvu9sk',true:'y3qzu2'}}});
 
 export { item };

package/dist/esm/packages/react/src/nav/NavBody-css.js

@@ -1,4 +1,4 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
 var body = recipeRuntime({base:[{flex:'1',gap:'4',justifyContent:'flex-start',overflowX:'hidden',py:'8',w:'full'}],variants:{expanded:{false:{overflowY:'hidden'},true:{overflowY:'auto'}}}});

package/dist/esm/packages/react/src/nav/NavItem-css.js

@@ -1,10 +1,10 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
-import './../../../../assets/src/avatar/AvatarGroup.css.ts.vanilla-BopGCQ-R.css';
-import './../../../../assets/src/button/ButtonRoot.css.ts.vanilla-O9AqM-cn.css';
-import './../../../../assets/src/nav/NavItem.css.ts.vanilla-BrQFSPpt.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
+import './../../../../assets/src/avatar/AvatarGroup.css.ts.vanilla-1mT-GBsC.css';
+import './../../../../assets/src/button/ButtonRoot.css.ts.vanilla-c0Df-0jA.css';
+import './../../../../assets/src/nav/NavItem.css.ts.vanilla-eNc92HM5.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
-var item = recipeRuntime({base:[{alignItems:'center',display:'flex',fontSize:'md',fontWeight:'500',h:'lg',justifyContent:'flex-start',rounded:'md',textAlign:'start',transition:'colors'},'_1yux5iv']});
-var label = recipeRuntime({base:[{alignItems:'center',display:'flex',flex:'1',gap:'10',justifyContent:'space-between',mr:'10',overflow:'hidden'},'_16bitf5'],variants:{expanded:{false:'_1j4nk9t',true:'_1tr9bmv'}}});
+var item = recipeRuntime({base:[{alignItems:'center',display:'flex',fontSize:'md',fontWeight:'500',h:'lg',justifyContent:'flex-start',rounded:'md',textAlign:'start',transition:'colors'},'_1262qdk']});
+var label = recipeRuntime({base:[{alignItems:'center',display:'flex',flex:'1',gap:'10',justifyContent:'space-between',mr:'10',overflow:'hidden'},'_1qy9o6e'],variants:{expanded:{false:'_5j7v87',true:'_8lejm8'}}});
 
 export { item, label };

package/dist/esm/packages/react/src/pagination/Pagination-css.js

@@ -1,9 +1,9 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
-import './../../../../assets/src/pagination/Pagination.css.ts.vanilla-BymbFie0.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
+import './../../../../assets/src/pagination/Pagination.css.ts.vanilla-CwdmFgL-.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
-var button = recipeRuntime({base:[{justifyContent:'center'},'uumygv']});
-var cursor = recipeRuntime({base:[{justifyContent:'center',z:'10'},'igo22j'],variants:{animation:{false:{},true:{transition:'transform'}}}});
-var list = recipeRuntime({base:[{flexDirection:'row',gap:'2'},'e1wc8g']});
+var button = recipeRuntime({base:[{justifyContent:'center'},'_1oeuyqb']});
+var cursor = recipeRuntime({base:[{justifyContent:'center',z:'10'},'_1l3s26x'],variants:{animation:{false:{},true:{transition:'transform'}}}});
+var list = recipeRuntime({base:[{flexDirection:'row',gap:'2'},'_24xzyz']});
 
 export { button, cursor, list };

package/dist/esm/packages/react/src/paper/Paper-css.js

@@ -1,4 +1,4 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
 var paper = recipeRuntime({base:{bg:'bg.default',color:'fg.default',shadow:'md',z:'popover'},variants:{elevation:{dialog:{rounded:'lg'},menu:{border:'1',borderColor:'border.secondary',rounded:'lg'},screen:{}}}});

package/dist/esm/packages/react/src/pill/Pill-css.js

@@ -1,7 +1,7 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
-import './../../../../assets/src/pill/Pill.css.ts.vanilla-OjU6W6Y3.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
+import './../../../../assets/src/pill/Pill.css.ts.vanilla-LFamA4C1.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
-var pill = recipeRuntime({base:[{alignItems:'center',color:'fg.default',display:'flex',fontSize:'sm',gap:'4',px:'6',rounded:'md',whiteSpace:'nowrap'},'_1q0tpu1'],variants:{size:{xs:{h:'xs'},sm:{h:'sm'}}}});
+var pill = recipeRuntime({base:[{alignItems:'center',color:'fg.default',display:'flex',fontSize:'sm',gap:'4',px:'6',rounded:'md',whiteSpace:'nowrap'},'_1cbd4tv'],variants:{size:{xs:{h:'xs'},sm:{h:'sm'}}}});
 
 export { pill };

package/dist/esm/packages/react/src/popover/PopoverContent.js

@@ -33,7 +33,6 @@ const PopoverContent = forwardRef(
             asChild: true,
             onBlur: onReactSelectInputBlur,
             p: "16",
-            provider: "popover",
             ...props,
             children: /* @__PURE__ */ jsx(
               RadixPopover.Content,

package/dist/esm/packages/react/src/progress/Progress-css.js

@@ -1,8 +1,8 @@
-import './../../../../assets/src/layers/layers.css.ts.vanilla-Dclj4WBX.css';
-import './../../../../assets/src/progress/Progress.css.ts.vanilla-VHfLy_-i.css';
+import './../../../../assets/src/layers/layers.css.ts.vanilla-DMaqBdHD.css';
+import './../../../../assets/src/progress/Progress.css.ts.vanilla-CgJ1rTXQ.css';
 import { recipeRuntime } from '../vanilla-extract/recipeRuntime.js';
 
 var indicator = recipeRuntime({base:[{h:'full',transition:'all'}],variants:{intent:{danger:{bg:'bg.error'},primary:{bg:'bg.accent'},success:{bg:'bg.success'}}}});
-var progress = recipeRuntime({base:[{bg:'bg.tertiary',overflow:'hidden',rounded:'full'},'zvsdfc']});
+var progress = recipeRuntime({base:[{bg:'bg.tertiary',overflow:'hidden',rounded:'full'},'_1wpb0tk']});
 
 export { indicator, progress };