reka-ui 2.8.2 → 2.9.1

package/dist/Listbox/ListboxRoot.js

@@ -7,9 +7,9 @@ import { useTypeahead } from "../shared/useTypeahead.js";
 import { Primitive } from "../Primitive/Primitive.js";
 import { usePrimitiveElement } from "../Primitive/usePrimitiveElement.js";
 import { useCollection } from "../Collection/Collection.js";
-import { getFocusIntent } from "../RovingFocus/utils.js";
 import { VisuallyHiddenInput_default } from "../VisuallyHidden/VisuallyHiddenInput.js";
 import { compare } from "./utils.js";
+import { getFocusIntent } from "../RovingFocus/utils.js";
 import { createBlock, createCommentVNode, defineComponent, nextTick, openBlock, ref, renderSlot, toRefs, unref, watch, withCtx } from "vue";
 import { createEventHook, useVModel } from "@vueuse/core";
 

package/dist/Listbox/ListboxVirtualizer.cjs

@@ -3,8 +3,8 @@ const require_shared_arrays = require('../shared/arrays.cjs');
 const require_shared_getActiveElement = require('../shared/getActiveElement.cjs');
 const require_shared_useTypeahead = require('../shared/useTypeahead.cjs');
 const require_Collection_Collection = require('../Collection/Collection.cjs');
-const require_RovingFocus_utils = require('../RovingFocus/utils.cjs');
 const require_Listbox_utils = require('./utils.cjs');
+const require_RovingFocus_utils = require('../RovingFocus/utils.cjs');
 const require_Listbox_ListboxRoot = require('./ListboxRoot.cjs');
 const vue = require_rolldown_runtime.__toESM(require("vue"));
 const __vueuse_core = require_rolldown_runtime.__toESM(require("@vueuse/core"));

package/dist/Listbox/ListboxVirtualizer.js

@@ -2,8 +2,8 @@ import { findValuesBetween } from "../shared/arrays.js";
 import { getActiveElement } from "../shared/getActiveElement.js";
 import { getNextMatch } from "../shared/useTypeahead.js";
 import { useCollection } from "../Collection/Collection.js";
-import { MAP_KEY_TO_FOCUS_INTENT } from "../RovingFocus/utils.js";
 import { compare, queryCheckedElement } from "./utils.js";
+import { MAP_KEY_TO_FOCUS_INTENT } from "../RovingFocus/utils.js";
 import { injectListboxRootContext } from "./ListboxRoot.js";
 import { Fragment, cloneVNode, computed, createBlock, createElementBlock, defineComponent, normalizeStyle, openBlock, renderList, resolveDynamicComponent, unref, useSlots } from "vue";
 import { useParentElement } from "@vueuse/core";

package/dist/Menu/MenuContentImpl.cjs

@@ -9,8 +9,8 @@ const require_shared_useTypeahead = require('../shared/useTypeahead.cjs');
 const require_DismissableLayer_DismissableLayer = require('../DismissableLayer/DismissableLayer.cjs');
 const require_FocusScope_FocusScope = require('../FocusScope/FocusScope.cjs');
 const require_Menu_utils = require('./utils.cjs');
-const require_RovingFocus_RovingFocusGroup = require('../RovingFocus/RovingFocusGroup.cjs');
 const require_Popper_PopperContent = require('../Popper/PopperContent.cjs');
+const require_RovingFocus_RovingFocusGroup = require('../RovingFocus/RovingFocusGroup.cjs');
 const require_Menu_MenuRoot = require('./MenuRoot.cjs');
 const vue = require_rolldown_runtime.__toESM(require("vue"));
 
@@ -144,6 +144,31 @@ var MenuContentImpl_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ *
 		const rovingFocusGroupRef = (0, vue.ref)();
 		const { forwardRef, currentElement: contentElement } = require_shared_useForwardExpose.useForwardExpose();
 		const { handleTypeaheadSearch } = require_shared_useTypeahead.useTypeahead();
+		const highlightedElement = (0, vue.ref)();
+		function onKeydownNavigation(event) {
+			const el = require_shared_useArrowNavigation.useArrowNavigation(event, highlightedElement.value || require_shared_getActiveElement.getActiveElement(), contentElement.value, {
+				loop: loop.value,
+				arrowKeyOptions: "vertical",
+				dir: rootContext?.dir.value,
+				focus: false,
+				attributeName: "[data-reka-collection-item]:not([data-disabled])"
+			});
+			if (el) {
+				highlightedElement.value = el;
+				el.scrollIntoView({ block: "nearest" });
+			}
+		}
+		function onKeydownEnter() {
+			if (highlightedElement.value) highlightedElement.value.click();
+		}
+		const filterElement = (0, vue.ref)();
+		const activeSubmenuContext = (0, vue.ref)();
+		(0, vue.watch)(highlightedElement, (el) => {
+			if (activeSubmenuContext.value && (el === void 0 || el !== activeSubmenuContext.value.trigger.value)) {
+				activeSubmenuContext.value.onOpenChange(false);
+				activeSubmenuContext.value = void 0;
+			}
+		});
 		(0, vue.watch)(contentElement, (el) => {
 			menuContext.onContentChange(el);
 		});
@@ -164,6 +189,7 @@ var MenuContentImpl_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ *
 			if (event.defaultPrevented) return;
 			const target = event.target;
 			const isKeyDownInside = target.closest("[data-reka-menu-content]") === event.currentTarget;
+			const isKeyDownInTextField = ["input", "textarea"].includes(target.tagName.toLowerCase());
 			const isModifierKey = event.ctrlKey || event.altKey || event.metaKey;
 			const isCharacterKey = event.key.length === 1;
 			const el = require_shared_useArrowNavigation.useArrowNavigation(event, require_shared_getActiveElement.getActiveElement(), contentElement.value, {
@@ -178,7 +204,7 @@ var MenuContentImpl_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ *
 			const collectionItems = rovingFocusGroupRef.value?.getItems() ?? [];
 			if (isKeyDownInside) {
 				if (event.key === "Tab") event.preventDefault();
-				if (!isModifierKey && isCharacterKey) handleTypeaheadSearch(event.key, collectionItems);
+				if (!isModifierKey && isCharacterKey && !isKeyDownInTextField) handleTypeaheadSearch(event.key, collectionItems);
 			}
 			if (event.target !== contentElement.value) return;
 			if (!require_Menu_utils.FIRST_LAST_KEYS.includes(event.key)) return;
@@ -203,6 +229,10 @@ var MenuContentImpl_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ *
 				lastPointerXRef.value = event.clientX;
 			}
 		}
+		function handlePointerEnter(event) {
+			if (!require_Menu_utils.isMouseEvent(event)) return;
+			if (filterElement.value) filterElement.value.focus();
+		}
 		provideMenuContentContext({
 			onItemEnter: (event) => {
 				if (isPointerMovingToSubmenu(event)) return true;
@@ -210,7 +240,8 @@ var MenuContentImpl_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ *
 			},
 			onItemLeave: (event) => {
 				if (isPointerMovingToSubmenu(event)) return;
-				contentElement.value?.focus();
+				const isInputFocused = ["INPUT", "TEXTAREA"].includes(require_shared_getActiveElement.getActiveElement()?.tagName || "");
+				if (!isInputFocused) contentElement.value?.focus();
 				currentItemId.value = null;
 			},
 			onTriggerLeave: (event) => {
@@ -218,6 +249,14 @@ var MenuContentImpl_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ *
 				else return false;
 			},
 			searchRef,
+			highlightedElement,
+			onKeydownNavigation,
+			onKeydownEnter,
+			filterElement,
+			onFilterElementChange: (el) => {
+				filterElement.value = el;
+			},
+			activeSubmenuContext,
 			pointerGraceTimerRef,
 			onPointerGraceIntentChange: (intent) => {
 				pointerGraceIntentRef.value = intent;
@@ -278,7 +317,8 @@ var MenuContentImpl_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ *
 							reference: _ctx.reference,
 							onKeydown: handleKeyDown,
 							onBlur: handleBlur,
-							onPointermove: handlePointerMove
+							onPointermove: handlePointerMove,
+							onPointerenter: handlePointerEnter
 						}, {
 							default: (0, vue.withCtx)(() => [(0, vue.renderSlot)(_ctx.$slots, "default")]),
 							_: 3

package/dist/Menu/MenuContentImpl.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"MenuContentImpl.cjs","names":["as","asChild","side","sideOffset","align","alignOffset","avoidCollisions","collisionBoundary","collisionPadding","arrowPadding","prioritizePosition","positionStrategy","updatePositionStrategy","sticky","hideWhenDetached","reference"],"sources":["../../src/Menu/MenuContentImpl.vue","../../src/Menu/MenuContentImpl.vue"],"sourcesContent":[],"mappings":";;;;;;;;;;;;;;;;;AAiCA,MAAa,CAAC,0BAA0B,0BAAyB,GAC7D,2CAAkC,cAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4EnD,MAAM,QAAQ;EAGd,MAAM,QAAQ;EACd,MAAM,cAAc,yCAAkB;EACtC,MAAM,cAAc,6CAAsB;EAE1C,MAAM,EAAE,WAAW,6BAA6B,MAAM,GAAG,gBAAO,MAAK;AAErE,gDAAe;AACf,qDAAkB,4BAA4B,MAAK;EAEnD,MAAM,YAAY,aAAI,GAAE;EACxB,MAAM,WAAW,aAAI,EAAC;EACtB,MAAM,uBAAuB,aAAI,EAAC;EAClC,MAAM,wBAAwB,aAAwB,KAAI;EAC1D,MAAM,gBAAgB,aAAU,QAAO;EACvC,MAAM,kBAAkB,aAAI,EAAC;EAC7B,MAAM,gBAAgB,aAAmB,KAAI;EAE7C,MAAM,sBAAsB,cAA2C;EACvE,MAAM,EAAE,YAAY,gBAAgB,gBAAgB,GAAG,kDAAiB;EACxE,MAAM,EAAE,uBAAuB,GAAG,0CAAa;AAE/C,iBAAM,gBAAgB,CAAC,OAAO;AAC5B,eAAa,gBAAgB,GAAE;EAChC,EAAA;AAED,uBAAY,MAAM;AAChB,UAAO,aAAa,SAAS,MAAK;EACnC,EAAA;EAED,SAAS,yBAAyB,OAAqB;GACrD,MAAM,kBACF,cAAc,UAAU,sBAAsB,OAAO;AAEzD,UACE,mBACG,wCAAqB,OAAO,sBAAsB,OAAO,KAAI;EAEpE;EAEA,eAAe,qBAAqB,OAAc;AAChD,SAAM,iBAAiB,MAAK;AAC5B,OAAI,MAAM,iBACR;AAGF,SAAM,gBAAe;AACrB,kBAAe,OAAO,MAAM,EAC1B,eAAe,KAChB,EAAA;EACH;EAEA,SAAS,cAAc,OAAsB;AAC3C,OAAI,MAAM,iBACR;GAEF,MAAM,SAAS,MAAM;GACrB,MAAM,kBACF,OAAO,QAAQ,2BAA2B,KAAK,MAAM;GACzD,MAAM,gBAAgB,MAAM,WAAW,MAAM,UAAU,MAAM;GAC7D,MAAM,iBAAiB,MAAM,IAAI,WAAW;GAE5C,MAAM,KAAK,qDACT,OACA,kDAAkB,EAClB,eAAe,OACf;IACE,MAAM,KAAK;IACX,iBAAiB;IACjB,KAAK,aAAa,IAAI;IACtB,OAAO;IACP,eAAe;GAChB,EACH;AACA,OAAI,GACF,QAAO,IAAI,OAAM;AAGnB,OAAI,MAAM,SAAS,QACjB;GAEF,MAAM,kBAAkB,oBAAoB,OAAO,UAAU,IAAI,CAAC;AAElE,OAAI,iBAAiB;AAEnB,QAAI,MAAM,QAAQ,MAChB,OAAM,gBAAe;AACvB,SAAK,iBAAiB,eACpB,uBAAsB,MAAM,KAAK,gBAAe;GACpD;AAGA,OAAI,MAAM,WAAW,eAAe,MAClC;AACF,QAAK,mCAAgB,SAAS,MAAM,IAAI,CACtC;AACF,SAAM,gBAAe;GACrB,MAAM,iBAAiB,CAAC,GAAG,gBAAgB,IAAI,UAAQ,KAAK,IAAI;AAChE,OAAI,6BAAU,SAAS,MAAM,IAAI,CAC/B,gBAAe,SAAQ;AACzB,iCAAW,eAAc;EAC3B;EAEA,SAAS,WAAW,OAAmB;AAGrC,QAAK,OAAO,eAAe,WAAW,MAAM,OAAO,EAAE;AACnD,WAAO,aAAa,SAAS,MAAK;AAClC,cAAU,QAAQ;GACpB;EACF;EAEA,SAAS,kBAAkB,OAAqB;AAC9C,QAAK,gCAAa,MAAM,CACtB;GACF,MAAM,SAAS,MAAM;GACrB,MAAM,qBAAqB,gBAAgB,UAAU,MAAM;AAI3D,OACE,CAAC,OAAO,gBAA+B,SAAS,OAAM,IACnD,oBACH;IACA,MAAM,SAAS,MAAM,UAAU,gBAAgB,QAAQ,UAAU;AACjE,kBAAc,QAAQ;AACtB,oBAAgB,QAAQ,MAAM;GAChC;EACF;AAEA,4BAA0B;GACxB,aAAa,CAAC,UAAU;AAEtB,QAAI,yBAAyB,MAAM,CACjC,QAAO;QAEP,QAAO;GACV;GACD,aAAa,CAAC,UAAU;AACtB,QAAI,yBAAyB,MAAM,CACjC;AACF,mBAAe,OAAO,OAAM;AAC5B,kBAAc,QAAQ;GACvB;GACD,gBAAgB,CAAC,UAAU;AAEzB,QAAI,yBAAyB,MAAM,CACjC,QAAO;QAEP,QAAO;GACV;GACD;GACA;GACA,4BAA4B,CAAC,WAAW;AACtC,0BAAsB,QAAQ;GAC/B;EACF,EAAA;;gCAIC,qBA2Da,eAAA,iDAAA,EAAA;IA1DX,YAAA;IACC,SAAS,eAAA,UAAS;IAClB,kBAAkB;IAClB,oBAAkB,OAAA,OAAA,OAAA,KAAA,CAAA,WAAE,MAAK,kBAAmB,OAAM;;8BAEnD,MAoDmB,CApDnB,qBAoDmB,eAAA,mEAAA,EAAA;KAnDjB,YAAA;KACC,kCAAgC,eAAA,4BAA2B;KAC3D,iBAAe,OAAA,OAAA,OAAA,KAAA,CAAA,WAAE,MAAK,iBAAkB,OAAM;KAC9C,sBAAoB,OAAA,OAAA,OAAA,KAAA,CAAA,WAAE,MAAK,sBAAuB,OAAM;KACxD,gBAAa,OAAA,OAAA,OAAA,KAAA,CAAA,WAAE,MAAK,gBAAiB,OAAM;KAC3C,mBAAgB,OAAA,OAAA,OAAA,KAAA,CAAA,WAAE,MAAK,mBAAoB,OAAM;KACjD,WAAO,OAAA,OAAA,OAAA,KAAA,CAAA,WAAE,MAAK,UAAA;;+BAEf,MA0CmB,CA1CnB,qBA0CmB,eAAA,8DAAA,EAAA;eAzCb;MAAJ,KAAI;MACI,uBAAqB,cAAA;yEAAA,cAAa,QAAA;MAC1C,YAAA;MACA,aAAY;MACX,KAAK,eAAA,YAAW,CAAC,IAAI;MACrB,MAAM,eAAA,KAAI;MACV,cAAW,OAAA,OAAA,OAAA,KAAA,CAAG,UAAK;AAAiB,aAAK,cAAe,MAAK;YAAwE,eAAA,YAAW,CAAC,mBAAmB,MAAO,OAAM,gBAAc;;;gCAMhM,MA4BgB,CA5BhB,qBA4BgB,eAAA,mDAAA,EAAA;OA3Bb,KAAK,eAAA,WAAU;OAChB,MAAK;OACJ,IAAIA,KAAAA;OACJ,YAAUC,KAAAA;OACX,oBAAiB;OACjB,0BAAA;OACC,cAAY,eAAA,gCAAY,CAAC,eAAA,YAAW,CAAC,KAAK,MAAK;OAC/C,KAAK,eAAA,YAAW,CAAC,IAAI;OACrB,MAAMC,KAAAA;OACN,eAAaC,KAAAA;OACb,OAAOC,KAAAA;OACP,gBAAcC,KAAAA;OACd,oBAAkBC,KAAAA;OAClB,sBAAoBC,KAAAA;OACpB,qBAAmBC,KAAAA;OACnB,iBAAeC,KAAAA;OACf,uBAAqBC,KAAAA;OACrB,qBAAmBC,KAAAA;OACnB,4BAA0BC,KAAAA;OAC1B,QAAQC,KAAAA;OACR,sBAAoBC,KAAAA;OACpB,WAAWC,KAAAA;OACX,WAAS;OACT,QAAM;OACN,eAAa;;iCAEd,MAAQ,CAAR,oBAAQ,KAAA,QAAA,UAAA"}
+{"version":3,"file":"MenuContentImpl.cjs","names":["as","asChild","side","sideOffset","align","alignOffset","avoidCollisions","collisionBoundary","collisionPadding","arrowPadding","prioritizePosition","positionStrategy","updatePositionStrategy","sticky","hideWhenDetached","reference"],"sources":["../../src/Menu/MenuContentImpl.vue","../../src/Menu/MenuContentImpl.vue"],"sourcesContent":[],"mappings":"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"}

package/dist/Menu/MenuContentImpl.js

@@ -8,8 +8,8 @@ import { useTypeahead } from "../shared/useTypeahead.js";
 import { DismissableLayer_default } from "../DismissableLayer/DismissableLayer.js";
 import { FocusScope_default } from "../FocusScope/FocusScope.js";
 import { FIRST_LAST_KEYS, LAST_KEYS, focusFirst, getOpenState, isMouseEvent, isPointerInGraceArea } from "./utils.js";
-import { RovingFocusGroup_default } from "../RovingFocus/RovingFocusGroup.js";
 import { PopperContentPropsDefaultValue, PopperContent_default } from "../Popper/PopperContent.js";
+import { RovingFocusGroup_default } from "../RovingFocus/RovingFocusGroup.js";
 import { injectMenuContext, injectMenuRootContext } from "./MenuRoot.js";
 import { createBlock, createVNode, defineComponent, mergeDefaults, onUnmounted, openBlock, ref, renderSlot, toRefs, unref, watch, withCtx } from "vue";
 
@@ -143,6 +143,31 @@ var MenuContentImpl_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ *
 		const rovingFocusGroupRef = ref();
 		const { forwardRef, currentElement: contentElement } = useForwardExpose();
 		const { handleTypeaheadSearch } = useTypeahead();
+		const highlightedElement = ref();
+		function onKeydownNavigation(event) {
+			const el = useArrowNavigation(event, highlightedElement.value || getActiveElement(), contentElement.value, {
+				loop: loop.value,
+				arrowKeyOptions: "vertical",
+				dir: rootContext?.dir.value,
+				focus: false,
+				attributeName: "[data-reka-collection-item]:not([data-disabled])"
+			});
+			if (el) {
+				highlightedElement.value = el;
+				el.scrollIntoView({ block: "nearest" });
+			}
+		}
+		function onKeydownEnter() {
+			if (highlightedElement.value) highlightedElement.value.click();
+		}
+		const filterElement = ref();
+		const activeSubmenuContext = ref();
+		watch(highlightedElement, (el) => {
+			if (activeSubmenuContext.value && (el === void 0 || el !== activeSubmenuContext.value.trigger.value)) {
+				activeSubmenuContext.value.onOpenChange(false);
+				activeSubmenuContext.value = void 0;
+			}
+		});
 		watch(contentElement, (el) => {
 			menuContext.onContentChange(el);
 		});
@@ -163,6 +188,7 @@ var MenuContentImpl_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ *
 			if (event.defaultPrevented) return;
 			const target = event.target;
 			const isKeyDownInside = target.closest("[data-reka-menu-content]") === event.currentTarget;
+			const isKeyDownInTextField = ["input", "textarea"].includes(target.tagName.toLowerCase());
 			const isModifierKey = event.ctrlKey || event.altKey || event.metaKey;
 			const isCharacterKey = event.key.length === 1;
 			const el = useArrowNavigation(event, getActiveElement(), contentElement.value, {
@@ -177,7 +203,7 @@ var MenuContentImpl_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ *
 			const collectionItems = rovingFocusGroupRef.value?.getItems() ?? [];
 			if (isKeyDownInside) {
 				if (event.key === "Tab") event.preventDefault();
-				if (!isModifierKey && isCharacterKey) handleTypeaheadSearch(event.key, collectionItems);
+				if (!isModifierKey && isCharacterKey && !isKeyDownInTextField) handleTypeaheadSearch(event.key, collectionItems);
 			}
 			if (event.target !== contentElement.value) return;
 			if (!FIRST_LAST_KEYS.includes(event.key)) return;
@@ -202,6 +228,10 @@ var MenuContentImpl_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ *
 				lastPointerXRef.value = event.clientX;
 			}
 		}
+		function handlePointerEnter(event) {
+			if (!isMouseEvent(event)) return;
+			if (filterElement.value) filterElement.value.focus();
+		}
 		provideMenuContentContext({
 			onItemEnter: (event) => {
 				if (isPointerMovingToSubmenu(event)) return true;
@@ -209,7 +239,8 @@ var MenuContentImpl_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ *
 			},
 			onItemLeave: (event) => {
 				if (isPointerMovingToSubmenu(event)) return;
-				contentElement.value?.focus();
+				const isInputFocused = ["INPUT", "TEXTAREA"].includes(getActiveElement()?.tagName || "");
+				if (!isInputFocused) contentElement.value?.focus();
 				currentItemId.value = null;
 			},
 			onTriggerLeave: (event) => {
@@ -217,6 +248,14 @@ var MenuContentImpl_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ *
 				else return false;
 			},
 			searchRef,
+			highlightedElement,
+			onKeydownNavigation,
+			onKeydownEnter,
+			filterElement,
+			onFilterElementChange: (el) => {
+				filterElement.value = el;
+			},
+			activeSubmenuContext,
 			pointerGraceTimerRef,
 			onPointerGraceIntentChange: (intent) => {
 				pointerGraceIntentRef.value = intent;
@@ -277,7 +316,8 @@ var MenuContentImpl_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ *
 							reference: _ctx.reference,
 							onKeydown: handleKeyDown,
 							onBlur: handleBlur,
-							onPointermove: handlePointerMove
+							onPointermove: handlePointerMove,
+							onPointerenter: handlePointerEnter
 						}, {
 							default: withCtx(() => [renderSlot(_ctx.$slots, "default")]),
 							_: 3

package/dist/Menu/MenuContentImpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"MenuContentImpl.js","names":["as","asChild","side","sideOffset","align","alignOffset","avoidCollisions","collisionBoundary","collisionPadding","arrowPadding","prioritizePosition","positionStrategy","updatePositionStrategy","sticky","hideWhenDetached","reference"],"sources":["../../src/Menu/MenuContentImpl.vue","../../src/Menu/MenuContentImpl.vue"],"sourcesContent":[],"mappings":"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"}
+{"version":3,"file":"MenuContentImpl.js","names":["as","asChild","side","sideOffset","align","alignOffset","avoidCollisions","collisionBoundary","collisionPadding","arrowPadding","prioritizePosition","positionStrategy","updatePositionStrategy","sticky","hideWhenDetached","reference"],"sources":["../../src/Menu/MenuContentImpl.vue","../../src/Menu/MenuContentImpl.vue"],"sourcesContent":[],"mappings":"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"}

package/dist/Menu/MenuGroup.cjs

@@ -1,8 +1,11 @@
 const require_rolldown_runtime = require('../rolldown-runtime.cjs');
+const require_shared_createContext = require('../shared/createContext.cjs');
+const require_shared_useId = require('../shared/useId.cjs');
 const require_Primitive_Primitive = require('../Primitive/Primitive.cjs');
 const vue = require_rolldown_runtime.__toESM(require("vue"));
 
 //#region src/Menu/MenuGroup.vue?vue&type=script&setup=true&lang.ts
+const [injectMenuGroupContext, provideMenuGroupContext] = require_shared_createContext.createContext("MenuGroup");
 var MenuGroup_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ (0, vue.defineComponent)({
 	__name: "MenuGroup",
 	props: {
@@ -17,11 +20,13 @@ var MenuGroup_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ (0,
 	},
 	setup(__props) {
 		const props = __props;
+		const id = require_shared_useId.useId(void 0, "reka-menu-group");
+		provideMenuGroupContext({ id });
 		return (_ctx, _cache) => {
-			return (0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(require_Primitive_Primitive.Primitive), (0, vue.mergeProps)({ role: "group" }, props), {
+			return (0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(require_Primitive_Primitive.Primitive), (0, vue.mergeProps)({ role: "group" }, props, { "aria-labelledby": (0, vue.unref)(id) }), {
 				default: (0, vue.withCtx)(() => [(0, vue.renderSlot)(_ctx.$slots, "default")]),
 				_: 3
-			}, 16);
+			}, 16, ["aria-labelledby"]);
 		};
 	}
 });
@@ -37,4 +42,10 @@ Object.defineProperty(exports, 'MenuGroup_default', {
     return MenuGroup_default;
   }
 });
+Object.defineProperty(exports, 'injectMenuGroupContext', {
+  enumerable: true,
+  get: function () {
+    return injectMenuGroupContext;
+  }
+});
 //# sourceMappingURL=MenuGroup.cjs.map

package/dist/Menu/MenuGroup.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"MenuGroup.cjs","names":[],"sources":["../../src/Menu/MenuGroup.vue","../../src/Menu/MenuGroup.vue"],"sourcesContent":[],"mappings":";;;;;;;;;;;;;;;;;;EASA,MAAM,QAAQ;;gCAIZ,qBAKY,eAAA,sCAAA,EALZ,oBAKY,EAJV,MAAK,QAAO,GACJ,MAAK,EAAA;8BAEb,MAAQ,CAAR,oBAAQ,KAAA,QAAA,UAAA"}
+{"version":3,"file":"MenuGroup.cjs","names":[],"sources":["../../src/Menu/MenuGroup.vue","../../src/Menu/MenuGroup.vue"],"sourcesContent":[],"mappings":";;;;;;;AAUA,MAAa,CAAC,wBAAwB,wBAAuB,GACzD,2CAAgC,YAAW;;;;;;;;;;;;;;EAM/C,MAAM,QAAQ;EAEd,MAAM,KAAK,mCAAiB,kBAAiB;AAC7C,0BAAwB,EAAE,GAAI,EAAA;;gCAI5B,qBAMY,eAAA,sCAAA,EANZ,oBAMY,EALV,MAAK,QAAO,GACJ,OAAK,EACZ,mBAAiB,eAAA,GAAE,CAAA,EAAA,EAAA;8BAEpB,MAAQ,CAAR,oBAAQ,KAAA,QAAA,UAAA"}

package/dist/Menu/MenuGroup.js

@@ -1,7 +1,10 @@
+import { createContext } from "../shared/createContext.js";
+import { useId } from "../shared/useId.js";
 import { Primitive } from "../Primitive/Primitive.js";
 import { createBlock, defineComponent, mergeProps, openBlock, renderSlot, unref, withCtx } from "vue";
 
 //#region src/Menu/MenuGroup.vue?vue&type=script&setup=true&lang.ts
+const [injectMenuGroupContext, provideMenuGroupContext] = createContext("MenuGroup");
 var MenuGroup_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
 	__name: "MenuGroup",
 	props: {
@@ -16,11 +19,13 @@ var MenuGroup_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defi
 	},
 	setup(__props) {
 		const props = __props;
+		const id = useId(void 0, "reka-menu-group");
+		provideMenuGroupContext({ id });
 		return (_ctx, _cache) => {
-			return openBlock(), createBlock(unref(Primitive), mergeProps({ role: "group" }, props), {
+			return openBlock(), createBlock(unref(Primitive), mergeProps({ role: "group" }, props, { "aria-labelledby": unref(id) }), {
 				default: withCtx(() => [renderSlot(_ctx.$slots, "default")]),
 				_: 3
-			}, 16);
+			}, 16, ["aria-labelledby"]);
 		};
 	}
 });
@@ -30,5 +35,5 @@ var MenuGroup_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defi
 var MenuGroup_default = MenuGroup_vue_vue_type_script_setup_true_lang_default;
 
 //#endregion
-export { MenuGroup_default };
+export { MenuGroup_default, injectMenuGroupContext };
 //# sourceMappingURL=MenuGroup.js.map

package/dist/Menu/MenuGroup.js.map

@@ -1 +1 @@
-{"version":3,"file":"MenuGroup.js","names":[],"sources":["../../src/Menu/MenuGroup.vue","../../src/Menu/MenuGroup.vue"],"sourcesContent":[],"mappings":";;;;;;;;;;;;;;;;;EASA,MAAM,QAAQ;;uBAIZ,YAKY,MAAA,UAAA,EALZ,WAKY,EAJV,MAAK,QAAO,GACJ,MAAK,EAAA;qBAEb,MAAQ,CAAR,WAAQ,KAAA,QAAA,UAAA"}
+{"version":3,"file":"MenuGroup.js","names":[],"sources":["../../src/Menu/MenuGroup.vue","../../src/Menu/MenuGroup.vue"],"sourcesContent":[],"mappings":";;;;;;AAUA,MAAa,CAAC,wBAAwB,wBAAuB,GACzD,cAAgC,YAAW;;;;;;;;;;;;;;EAM/C,MAAM,QAAQ;EAEd,MAAM,KAAK,cAAiB,kBAAiB;AAC7C,0BAAwB,EAAE,GAAI,EAAA;;uBAI5B,YAMY,MAAA,UAAA,EANZ,WAMY,EALV,MAAK,QAAO,GACJ,OAAK,EACZ,mBAAiB,MAAA,GAAE,CAAA,EAAA,EAAA;qBAEpB,MAAQ,CAAR,WAAQ,KAAA,QAAA,UAAA"}

package/dist/Menu/MenuItemImpl.cjs

@@ -1,8 +1,10 @@
 const require_rolldown_runtime = require('../rolldown-runtime.cjs');
+const require_shared_getActiveElement = require('../shared/getActiveElement.cjs');
 const require_shared_useForwardExpose = require('../shared/useForwardExpose.cjs');
 const require_Primitive_Primitive = require('../Primitive/Primitive.cjs');
 const require_Menu_utils = require('./utils.cjs');
 const require_Collection_Collection = require('../Collection/Collection.cjs');
+const require_Menu_MenuRoot = require('./MenuRoot.cjs');
 const require_Menu_MenuContentImpl = require('./MenuContentImpl.cjs');
 const vue = require_rolldown_runtime.__toESM(require("vue"));
 
@@ -30,19 +32,22 @@ var MenuItemImpl_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ (
 	},
 	setup(__props) {
 		const props = __props;
+		const menuContext = require_Menu_MenuRoot.injectMenuContext();
 		const contentContext = require_Menu_MenuContentImpl.injectMenuContentContext();
-		const { forwardRef } = require_shared_useForwardExpose.useForwardExpose();
+		const { forwardRef, currentElement } = require_shared_useForwardExpose.useForwardExpose();
 		const { CollectionItem } = require_Collection_Collection.useCollection();
 		const isFocused = (0, vue.ref)(false);
+		const isHighlighted = (0, vue.computed)(() => isFocused.value || contentContext.highlightedElement.value === currentElement.value);
 		async function handlePointerMove(event) {
-			if (event.defaultPrevented) return;
-			if (!require_Menu_utils.isMouseEvent(event)) return;
+			if (event.defaultPrevented || !require_Menu_utils.isMouseEvent(event) || !menuContext.open.value) return;
 			if (props.disabled) contentContext.onItemLeave(event);
 			else {
 				const defaultPrevented = contentContext.onItemEnter(event);
 				if (!defaultPrevented) {
 					const item = event.currentTarget;
-					item?.focus({ preventScroll: true });
+					contentContext.highlightedElement.value = item;
+					const isInputFocused = ["INPUT", "TEXTAREA"].includes(require_shared_getActiveElement.getActiveElement()?.tagName || "");
+					if (!isInputFocused) item.focus({ preventScroll: true });
 				}
 			}
 		}
@@ -63,13 +68,14 @@ var MenuItemImpl_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ (
 					"as-child": _ctx.asChild,
 					"aria-disabled": _ctx.disabled || void 0,
 					"data-disabled": _ctx.disabled ? "" : void 0,
-					"data-highlighted": isFocused.value ? "" : void 0,
+					"data-highlighted": isHighlighted.value ? "" : void 0,
 					onPointermove: handlePointerMove,
 					onPointerleave: handlePointerLeave,
 					onFocus: _cache[0] || (_cache[0] = async (event) => {
 						await (0, vue.nextTick)();
 						if (event.defaultPrevented || _ctx.disabled) return;
 						isFocused.value = true;
+						(0, vue.unref)(contentContext).highlightedElement.value = event.currentTarget;
 					}),
 					onBlur: _cache[1] || (_cache[1] = async (event) => {
 						await (0, vue.nextTick)();

package/dist/Menu/MenuItemImpl.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"MenuItemImpl.cjs","names":["textValue","$attrs","as","asChild","disabled"],"sources":["../../src/Menu/MenuItemImpl.vue","../../src/Menu/MenuItemImpl.vue"],"sourcesContent":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4BA,MAAM,QAAQ;EAEd,MAAM,iBAAiB,uDAAyB;EAChD,MAAM,EAAE,YAAY,GAAG,kDAAiB;EACxC,MAAM,EAAE,gBAAgB,GAAG,6CAAc;EAEzC,MAAM,YAAY,aAAI,MAAK;EAE3B,eAAe,kBAAkB,OAAqB;AACpD,OAAI,MAAM,iBACR;AACF,QAAK,gCAAa,MAAM,CACtB;AAEF,OAAI,MAAM,SACR,gBAAe,YAAY,MAAK;QAE7B;IACH,MAAM,mBAAmB,eAAe,YAAY,MAAK;AACzD,SAAK,kBAAkB;KACrB,MAAM,OAAO,MAAM;AACnB,KAAC,MAAsB,MAAM,EAAE,eAAe,KAAM,EAAA;IACtD;GACF;EACF;EAEA,eAAe,mBAAmB,OAAqB;AACrD,SAAM,mBAAS;AACf,OAAI,MAAM,iBACR;AACF,QAAK,gCAAa,MAAM,CACtB;AAEF,kBAAe,YAAY,MAAK;EAClC;;gCAIE,qBA8BiB,eAAA,eAAA,EAAA,EA9BA,OAAK,EAAA,WAAIA,KAAAA,UAAS;8BACjC,MA4BY,CA5BZ,qBA4BY,eAAA,sCAAA,EA5BZ,oBA4BY;KA3BT,KAAK,eAAA,WAAU;KAChB,MAAK;KACL,UAAS;OACDC,KAAAA,QAAM;KACb,IAAIC,KAAAA;KACJ,YAAUC,KAAAA;KACV,iBAAeC,KAAAA;KACf,iBAAeA,KAAAA,WAAQ;KACvB,oBAAkB,UAAA,QAAS;KAC3B,eAAa;KACb,gBAAc;KACd,SAAK,OAAA,OAAA,OAAA,YAAkB,UAAK;YAAuB,mBAAQ;UAAkB,MAAM,oBAAoBA,KAAAA,SAAQ;AAAoB,gBAAA,QAAS;;KAO5I,QAAI,OAAA,OAAA,OAAA,YAAkB,UAAK;YAAuB,mBAAQ;UAAkB,MAAM,iBAAgB;AAAoB,gBAAA,QAAS;;;+BAQhI,MAAQ,CAAR,oBAAQ,KAAA,QAAA,UAAA"}
+{"version":3,"file":"MenuItemImpl.cjs","names":["textValue","$attrs","as","asChild","disabled"],"sources":["../../src/Menu/MenuItemImpl.vue","../../src/Menu/MenuItemImpl.vue"],"sourcesContent":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6BA,MAAM,QAAQ;EAEd,MAAM,cAAc,yCAAkB;EACtC,MAAM,iBAAiB,uDAAyB;EAChD,MAAM,EAAE,YAAY,gBAAgB,GAAG,kDAAiB;EACxD,MAAM,EAAE,gBAAgB,GAAG,6CAAc;EAEzC,MAAM,YAAY,aAAI,MAAK;EAC3B,MAAM,gBAAgB,kBAAS,MAAM,UAAU,SAAU,eAAe,mBAAmB,UAAU,eAAe,MAAM;EAE1H,eAAe,kBAAkB,OAAqB;AACpD,OAAI,MAAM,qBAAqB,gCAAa,MAAM,KAAK,YAAY,KAAK,MACtE;AAEF,OAAI,MAAM,SACR,gBAAe,YAAY,MAAK;QAE7B;IACH,MAAM,mBAAmB,eAAe,YAAY,MAAK;AACzD,SAAK,kBAAkB;KACrB,MAAM,OAAO,MAAM;AACnB,oBAAe,mBAAmB,QAAQ;KAC1C,MAAM,iBAAiB,CAAC,SAAS,UAAW,EAAC,SAAS,kDAAkB,EAAE,WAAW,GAAE;AACvF,UAAK,eACH,MAAK,MAAM,EAAE,eAAe,KAAM,EAAA;IACtC;GACF;EACF;EAEA,eAAe,mBAAmB,OAAqB;AACrD,SAAM,mBAAS;AACf,OAAI,MAAM,iBACR;AACF,QAAK,gCAAa,MAAM,CACtB;AAEF,kBAAe,YAAY,MAAK;EAClC;;gCAIE,qBA+BiB,eAAA,eAAA,EAAA,EA/BA,OAAK,EAAA,WAAIA,KAAAA,UAAS;8BACjC,MA6BY,CA7BZ,qBA6BY,eAAA,sCAAA,EA7BZ,oBA6BY;KA5BT,KAAK,eAAA,WAAU;KAChB,MAAK;KACL,UAAS;OACDC,KAAAA,QAAM;KACb,IAAIC,KAAAA;KACJ,YAAUC,KAAAA;KACV,iBAAeC,KAAAA;KACf,iBAAeA,KAAAA,WAAQ;KACvB,oBAAkB,cAAA,QAAa;KAC/B,eAAa;KACb,gBAAc;KACd,SAAK,OAAA,OAAA,OAAA,YAAkB,UAAK;YAAuB,mBAAQ;UAAkB,MAAM,oBAAoBA,KAAAA,SAAQ;AAAoB,gBAAA,QAAS;AAAmB,qBAAA,eAAc,CAAC,mBAAmB,QAAQ,MAAM;;KAQ/M,QAAI,OAAA,OAAA,OAAA,YAAkB,UAAK;YAAuB,mBAAQ;UAAkB,MAAM,iBAAgB;AAAoB,gBAAA,QAAS;;;+BAQhI,MAAQ,CAAR,oBAAQ,KAAA,QAAA,UAAA"}

package/dist/Menu/MenuItemImpl.js

@@ -1,9 +1,11 @@
+import { getActiveElement } from "../shared/getActiveElement.js";
 import { useForwardExpose } from "../shared/useForwardExpose.js";
 import { Primitive } from "../Primitive/Primitive.js";
 import { isMouseEvent } from "./utils.js";
 import { useCollection } from "../Collection/Collection.js";
+import { injectMenuContext } from "./MenuRoot.js";
 import { injectMenuContentContext } from "./MenuContentImpl.js";
-import { createBlock, createVNode, defineComponent, mergeProps, nextTick, openBlock, ref, renderSlot, unref, withCtx } from "vue";
+import { computed, createBlock, createVNode, defineComponent, mergeProps, nextTick, openBlock, ref, renderSlot, unref, withCtx } from "vue";
 
 //#region src/Menu/MenuItemImpl.vue?vue&type=script&setup=true&lang.ts
 var MenuItemImpl_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
@@ -29,19 +31,22 @@ var MenuItemImpl_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ d
 	},
 	setup(__props) {
 		const props = __props;
+		const menuContext = injectMenuContext();
 		const contentContext = injectMenuContentContext();
-		const { forwardRef } = useForwardExpose();
+		const { forwardRef, currentElement } = useForwardExpose();
 		const { CollectionItem } = useCollection();
 		const isFocused = ref(false);
+		const isHighlighted = computed(() => isFocused.value || contentContext.highlightedElement.value === currentElement.value);
 		async function handlePointerMove(event) {
-			if (event.defaultPrevented) return;
-			if (!isMouseEvent(event)) return;
+			if (event.defaultPrevented || !isMouseEvent(event) || !menuContext.open.value) return;
 			if (props.disabled) contentContext.onItemLeave(event);
 			else {
 				const defaultPrevented = contentContext.onItemEnter(event);
 				if (!defaultPrevented) {
 					const item = event.currentTarget;
-					item?.focus({ preventScroll: true });
+					contentContext.highlightedElement.value = item;
+					const isInputFocused = ["INPUT", "TEXTAREA"].includes(getActiveElement()?.tagName || "");
+					if (!isInputFocused) item.focus({ preventScroll: true });
 				}
 			}
 		}
@@ -62,13 +67,14 @@ var MenuItemImpl_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ d
 					"as-child": _ctx.asChild,
 					"aria-disabled": _ctx.disabled || void 0,
 					"data-disabled": _ctx.disabled ? "" : void 0,
-					"data-highlighted": isFocused.value ? "" : void 0,
+					"data-highlighted": isHighlighted.value ? "" : void 0,
 					onPointermove: handlePointerMove,
 					onPointerleave: handlePointerLeave,
 					onFocus: _cache[0] || (_cache[0] = async (event) => {
 						await nextTick();
 						if (event.defaultPrevented || _ctx.disabled) return;
 						isFocused.value = true;
+						unref(contentContext).highlightedElement.value = event.currentTarget;
 					}),
 					onBlur: _cache[1] || (_cache[1] = async (event) => {
 						await nextTick();

package/dist/Menu/MenuItemImpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"MenuItemImpl.js","names":["textValue","$attrs","as","asChild","disabled"],"sources":["../../src/Menu/MenuItemImpl.vue","../../src/Menu/MenuItemImpl.vue"],"sourcesContent":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4BA,MAAM,QAAQ;EAEd,MAAM,iBAAiB,0BAAyB;EAChD,MAAM,EAAE,YAAY,GAAG,kBAAiB;EACxC,MAAM,EAAE,gBAAgB,GAAG,eAAc;EAEzC,MAAM,YAAY,IAAI,MAAK;EAE3B,eAAe,kBAAkB,OAAqB;AACpD,OAAI,MAAM,iBACR;AACF,QAAK,aAAa,MAAM,CACtB;AAEF,OAAI,MAAM,SACR,gBAAe,YAAY,MAAK;QAE7B;IACH,MAAM,mBAAmB,eAAe,YAAY,MAAK;AACzD,SAAK,kBAAkB;KACrB,MAAM,OAAO,MAAM;AACnB,KAAC,MAAsB,MAAM,EAAE,eAAe,KAAM,EAAA;IACtD;GACF;EACF;EAEA,eAAe,mBAAmB,OAAqB;AACrD,SAAM,UAAS;AACf,OAAI,MAAM,iBACR;AACF,QAAK,aAAa,MAAM,CACtB;AAEF,kBAAe,YAAY,MAAK;EAClC;;uBAIE,YA8BiB,MAAA,eAAA,EAAA,EA9BA,OAAK,EAAA,WAAIA,KAAAA,UAAS;qBACjC,MA4BY,CA5BZ,YA4BY,MAAA,UAAA,EA5BZ,WA4BY;KA3BT,KAAK,MAAA,WAAU;KAChB,MAAK;KACL,UAAS;OACDC,KAAAA,QAAM;KACb,IAAIC,KAAAA;KACJ,YAAUC,KAAAA;KACV,iBAAeC,KAAAA;KACf,iBAAeA,KAAAA,WAAQ;KACvB,oBAAkB,UAAA,QAAS;KAC3B,eAAa;KACb,gBAAc;KACd,SAAK,OAAA,OAAA,OAAA,YAAkB,UAAK;YAAuB,UAAQ;UAAkB,MAAM,oBAAoBA,KAAAA,SAAQ;AAAoB,gBAAA,QAAS;;KAO5I,QAAI,OAAA,OAAA,OAAA,YAAkB,UAAK;YAAuB,UAAQ;UAAkB,MAAM,iBAAgB;AAAoB,gBAAA,QAAS;;;sBAQhI,MAAQ,CAAR,WAAQ,KAAA,QAAA,UAAA"}
+{"version":3,"file":"MenuItemImpl.js","names":["textValue","$attrs","as","asChild","disabled"],"sources":["../../src/Menu/MenuItemImpl.vue","../../src/Menu/MenuItemImpl.vue"],"sourcesContent":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6BA,MAAM,QAAQ;EAEd,MAAM,cAAc,mBAAkB;EACtC,MAAM,iBAAiB,0BAAyB;EAChD,MAAM,EAAE,YAAY,gBAAgB,GAAG,kBAAiB;EACxD,MAAM,EAAE,gBAAgB,GAAG,eAAc;EAEzC,MAAM,YAAY,IAAI,MAAK;EAC3B,MAAM,gBAAgB,SAAS,MAAM,UAAU,SAAU,eAAe,mBAAmB,UAAU,eAAe,MAAM;EAE1H,eAAe,kBAAkB,OAAqB;AACpD,OAAI,MAAM,qBAAqB,aAAa,MAAM,KAAK,YAAY,KAAK,MACtE;AAEF,OAAI,MAAM,SACR,gBAAe,YAAY,MAAK;QAE7B;IACH,MAAM,mBAAmB,eAAe,YAAY,MAAK;AACzD,SAAK,kBAAkB;KACrB,MAAM,OAAO,MAAM;AACnB,oBAAe,mBAAmB,QAAQ;KAC1C,MAAM,iBAAiB,CAAC,SAAS,UAAW,EAAC,SAAS,kBAAkB,EAAE,WAAW,GAAE;AACvF,UAAK,eACH,MAAK,MAAM,EAAE,eAAe,KAAM,EAAA;IACtC;GACF;EACF;EAEA,eAAe,mBAAmB,OAAqB;AACrD,SAAM,UAAS;AACf,OAAI,MAAM,iBACR;AACF,QAAK,aAAa,MAAM,CACtB;AAEF,kBAAe,YAAY,MAAK;EAClC;;uBAIE,YA+BiB,MAAA,eAAA,EAAA,EA/BA,OAAK,EAAA,WAAIA,KAAAA,UAAS;qBACjC,MA6BY,CA7BZ,YA6BY,MAAA,UAAA,EA7BZ,WA6BY;KA5BT,KAAK,MAAA,WAAU;KAChB,MAAK;KACL,UAAS;OACDC,KAAAA,QAAM;KACb,IAAIC,KAAAA;KACJ,YAAUC,KAAAA;KACV,iBAAeC,KAAAA;KACf,iBAAeA,KAAAA,WAAQ;KACvB,oBAAkB,cAAA,QAAa;KAC/B,eAAa;KACb,gBAAc;KACd,SAAK,OAAA,OAAA,OAAA,YAAkB,UAAK;YAAuB,UAAQ;UAAkB,MAAM,oBAAoBA,KAAAA,SAAQ;AAAoB,gBAAA,QAAS;AAAmB,YAAA,eAAc,CAAC,mBAAmB,QAAQ,MAAM;;KAQ/M,QAAI,OAAA,OAAA,OAAA,YAAkB,UAAK;YAAuB,UAAQ;UAAkB,MAAM,iBAAgB;AAAoB,gBAAA,QAAS;;;sBAQhI,MAAQ,CAAR,WAAQ,KAAA,QAAA,UAAA"}

package/dist/Menu/MenuLabel.cjs

@@ -1,5 +1,6 @@
 const require_rolldown_runtime = require('../rolldown-runtime.cjs');
 const require_Primitive_Primitive = require('../Primitive/Primitive.cjs');
+const require_Menu_MenuGroup = require('./MenuGroup.cjs');
 const vue = require_rolldown_runtime.__toESM(require("vue"));
 
 //#region src/Menu/MenuLabel.vue?vue&type=script&setup=true&lang.ts
@@ -18,11 +19,12 @@ var MenuLabel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ (0,
 	},
 	setup(__props) {
 		const props = __props;
+		const groupContext = require_Menu_MenuGroup.injectMenuGroupContext({ id: "" });
 		return (_ctx, _cache) => {
-			return (0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(require_Primitive_Primitive.Primitive), (0, vue.normalizeProps)((0, vue.guardReactiveProps)(props)), {
+			return (0, vue.openBlock)(), (0, vue.createBlock)((0, vue.unref)(require_Primitive_Primitive.Primitive), (0, vue.mergeProps)(props, { id: (0, vue.unref)(groupContext).id || void 0 }), {
 				default: (0, vue.withCtx)(() => [(0, vue.renderSlot)(_ctx.$slots, "default")]),
 				_: 3
-			}, 16);
+			}, 16, ["id"]);
 		};
 	}
 });

package/dist/Menu/MenuLabel.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"MenuLabel.cjs","names":[],"sources":["../../src/Menu/MenuLabel.vue","../../src/Menu/MenuLabel.vue"],"sourcesContent":[],"mappings":";;;;;;;;;;;;;;;;;;;EASA,MAAM,QAAQ;;gCAMZ,qBAEY,eAAA,sCAAA,EAAA,wBAAA,4BAFO,MAAK,CAAA,EAAA;8BACtB,MAAQ,CAAR,oBAAQ,KAAA,QAAA,UAAA"}
+{"version":3,"file":"MenuLabel.cjs","names":[],"sources":["../../src/Menu/MenuLabel.vue","../../src/Menu/MenuLabel.vue"],"sourcesContent":[],"mappings":";;;;;;;;;;;;;;;;;;;;EAUA,MAAM,QAAQ;EAId,MAAM,eAAe,8CAAuB,EAAE,IAAI,GAAI,EAAA;;gCAIpD,qBAKY,eAAA,sCAAA,EALZ,oBACU,OAAK,EACZ,IAAI,eAAA,aAAY,CAAC;8BAElB,MAAQ,CAAR,oBAAQ,KAAA,QAAA,UAAA"}

package/dist/Menu/MenuLabel.js

@@ -1,5 +1,6 @@
 import { Primitive } from "../Primitive/Primitive.js";
-import { createBlock, defineComponent, guardReactiveProps, normalizeProps, openBlock, renderSlot, unref, withCtx } from "vue";
+import { injectMenuGroupContext } from "./MenuGroup.js";
+import { createBlock, defineComponent, mergeProps, openBlock, renderSlot, unref, withCtx } from "vue";
 
 //#region src/Menu/MenuLabel.vue?vue&type=script&setup=true&lang.ts
 var MenuLabel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
@@ -17,11 +18,12 @@ var MenuLabel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defi
 	},
 	setup(__props) {
 		const props = __props;
+		const groupContext = injectMenuGroupContext({ id: "" });
 		return (_ctx, _cache) => {
-			return openBlock(), createBlock(unref(Primitive), normalizeProps(guardReactiveProps(props)), {
+			return openBlock(), createBlock(unref(Primitive), mergeProps(props, { id: unref(groupContext).id || void 0 }), {
 				default: withCtx(() => [renderSlot(_ctx.$slots, "default")]),
 				_: 3
-			}, 16);
+			}, 16, ["id"]);
 		};
 	}
 });

package/dist/Menu/MenuLabel.js.map

@@ -1 +1 @@
-{"version":3,"file":"MenuLabel.js","names":[],"sources":["../../src/Menu/MenuLabel.vue","../../src/Menu/MenuLabel.vue"],"sourcesContent":[],"mappings":";;;;;;;;;;;;;;;;;;EASA,MAAM,QAAQ;;uBAMZ,YAEY,MAAA,UAAA,EAAA,eAAA,mBAFO,MAAK,CAAA,EAAA;qBACtB,MAAQ,CAAR,WAAQ,KAAA,QAAA,UAAA"}
+{"version":3,"file":"MenuLabel.js","names":[],"sources":["../../src/Menu/MenuLabel.vue","../../src/Menu/MenuLabel.vue"],"sourcesContent":[],"mappings":";;;;;;;;;;;;;;;;;;;EAUA,MAAM,QAAQ;EAId,MAAM,eAAe,uBAAuB,EAAE,IAAI,GAAI,EAAA;;uBAIpD,YAKY,MAAA,UAAA,EALZ,WACU,OAAK,EACZ,IAAI,MAAA,aAAY,CAAC;qBAElB,MAAQ,CAAR,WAAQ,KAAA,QAAA,UAAA"}

package/dist/Menu/MenuSubContent.cjs

@@ -111,6 +111,7 @@ var MenuSubContent_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 		const menuContext = require_Menu_MenuRoot.injectMenuContext();
 		const rootContext = require_Menu_MenuRoot.injectMenuRootContext();
 		const menuSubContext = require_Menu_MenuSub.injectMenuSubContext();
+		const parentContentContext = require_Menu_MenuContentImpl.injectMenuContentContext();
 		const { forwardRef, currentElement: subContentElement } = require_shared_useForwardExpose.useForwardExpose();
 		menuSubContext.contentId ||= require_shared_useId.useId(void 0, "reka-menu-sub-content");
 		return (_ctx, _cache) => {
@@ -130,7 +131,8 @@ var MenuSubContent_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 					onCloseAutoFocus: _cache[1] || (_cache[1] = (0, vue.withModifiers)(() => {}, ["prevent"])),
 					onFocusOutside: _cache[2] || (_cache[2] = (event) => {
 						if (event.defaultPrevented) return;
-						if (event.target !== (0, vue.unref)(menuSubContext).trigger.value) (0, vue.unref)(menuContext).onOpenChange(false);
+						const isMovingToParentContent = (0, vue.unref)(parentContentContext).filterElement.value?.contains(event.target);
+						if (event.target !== (0, vue.unref)(menuSubContext).trigger.value && !isMovingToParentContent) (0, vue.unref)(menuContext).onOpenChange(false);
 					}),
 					onEscapeKeyDown: _cache[3] || (_cache[3] = (event) => {
 						(0, vue.unref)(rootContext).onClose();
@@ -141,7 +143,11 @@ var MenuSubContent_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 						const isCloseKey = (0, vue.unref)(require_Menu_utils.SUB_CLOSE_KEYS)[(0, vue.unref)(rootContext).dir.value].includes(event.key);
 						if (isKeyDownInside && isCloseKey) {
 							(0, vue.unref)(menuContext).onOpenChange(false);
-							(0, vue.unref)(menuSubContext).trigger.value?.focus();
+							if ((0, vue.unref)(parentContentContext).filterElement.value) {
+								(0, vue.unref)(parentContentContext).filterElement.value.focus();
+								(0, vue.unref)(parentContentContext).highlightedElement.value = (0, vue.unref)(menuSubContext).trigger.value;
+								(0, vue.unref)(menuSubContext).trigger.value?.scrollIntoView({ block: "nearest" });
+							} else (0, vue.unref)(menuSubContext).trigger.value?.focus();
 							event.preventDefault();
 						}
 					})

package/dist/Menu/MenuSubContent.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"MenuSubContent.cjs","names":["forceMount"],"sources":["../../src/Menu/MenuSubContent.vue","../../src/Menu/MenuSubContent.vue"],"sourcesContent":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0BA,MAAM,QAAQ;EAGd,MAAM,QAAQ;EAEd,MAAM,YAAY,yDAAqB,OAAO,MAAK;EAEnD,MAAM,cAAc,yCAAkB;EACtC,MAAM,cAAc,6CAAsB;EAC1C,MAAM,iBAAiB,2CAAqB;EAE5C,MAAM,EAAE,YAAY,gBAAgB,mBAAmB,GAAG,kDAAiB;AAE3E,iBAAe,cAAc,mCAAiB,wBAAuB;;gCAInE,qBA+CW,eAAA,2CAAA,EAAA,EA/CA,SAASA,KAAAA,cAAc,eAAA,YAAW,CAAC,KAAK;8BACjD,MA6CkB,CA7ClB,qBA6CkB,sDA7ClB,oBACU,eA4CQ,UA5CC,EAAA;KAChB,IAAI,eAAA,eAAc,CAAC;KACnB,KAAK,eAAA,WAAU;KACf,mBAAiB,eAAA,eAAc,CAAC;KACjC,OAAM;KACL,MAAM,eAAA,YAAW,CAAC,IAAI,UAAK,QAAA,SAAA;KAC3B,kCAAgC;KAChC,0BAAwB;KACxB,cAAY;KACZ,iBAAe,OAAA,OAAA,OAAA,KAAA,uBAAA,CAAW,UAAK;UAA4F,eAAA,YAAW,CAAC,mBAAmB,MAAO,gBAAA,kBAAiB,EAAE,OAAK;;KAIzL,kBAAgB,OAAA,OAAA,OAAA,KAAA,uBAAjB,MAAA,CAAyB,GAAA,CAAA,SAAA,EAAA;KACxB,gBAAa,OAAA,OAAA,OAAA,MAAY,UAAK;UAAqB,MAAM,iBAAgB;UAAiK,MAAM,WAAW,eAAA,eAAc,CAAC,QAAQ,MAAmB,gBAAA,YAAW,CAAC,aAAY,MAAA;;KAS7T,iBAAe,OAAA,OAAA,OAAA,MAAY,UAAK;AAAiB,qBAAA,YAAW,CAAC,SAAO;AAA6F,YAAM,gBAAc;;KAOrL,WAAO,OAAA,OAAA,OAAA,KAAA,CAAG,UAAoB;YAAiH,kBAAe,AAAI,MAAM,eAA+B,SAAS,MAAM,OAAM;YAAgC,aAAa,eAAA,kCAAc,CAAC,eAAA,YAAW,CAAC,IAAI,OAAO,SAAS,MAAM,IAAG;UAAe,mBAAmB,YAAU;AAAc,sBAAA,YAAW,CAAC,aAAY,MAAA;AAAgG,sBAAA,eAAc,CAAC,QAAQ,OAAO,OAAK;AAAyD,aAAM,gBAAc;;;;+BAapmB,MAAQ,CAAR,oBAAQ,KAAA,QAAA,UAAA"}
+{"version":3,"file":"MenuSubContent.cjs","names":["forceMount"],"sources":["../../src/Menu/MenuSubContent.vue","../../src/Menu/MenuSubContent.vue"],"sourcesContent":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0BA,MAAM,QAAQ;EAGd,MAAM,QAAQ;EAEd,MAAM,YAAY,yDAAqB,OAAO,MAAK;EAEnD,MAAM,cAAc,yCAAkB;EACtC,MAAM,cAAc,6CAAsB;EAC1C,MAAM,iBAAiB,2CAAqB;EAC5C,MAAM,uBAAuB,uDAAyB;EAEtD,MAAM,EAAE,YAAY,gBAAgB,mBAAmB,GAAG,kDAAiB;AAE3E,iBAAe,cAAc,mCAAiB,wBAAuB;;gCAInE,qBAyDW,eAAA,2CAAA,EAAA,EAzDA,SAASA,KAAAA,cAAc,eAAA,YAAW,CAAC,KAAK;8BACjD,MAuDkB,CAvDlB,qBAuDkB,sDAvDlB,oBACU,eAsDQ,UAtDC,EAAA;KAChB,IAAI,eAAA,eAAc,CAAC;KACnB,KAAK,eAAA,WAAU;KACf,mBAAiB,eAAA,eAAc,CAAC;KACjC,OAAM;KACL,MAAM,eAAA,YAAW,CAAC,IAAI,UAAK,QAAA,SAAA;KAC3B,kCAAgC;KAChC,0BAAwB;KACxB,cAAY;KACZ,iBAAe,OAAA,OAAA,OAAA,KAAA,uBAAA,CAAW,UAAK;UAA4F,eAAA,YAAW,CAAC,mBAAmB,MAAO,gBAAA,kBAAiB,EAAE,OAAK;;KAIzL,kBAAgB,OAAA,OAAA,OAAA,KAAA,uBAAjB,MAAA,CAAyB,GAAA,CAAA,SAAA,EAAA;KACxB,gBAAa,OAAA,OAAA,OAAA,MAAY,UAAK;UAAqB,MAAM,iBAAgB;YAAyT,0BAA0B,eAAA,qBAAoB,CAAC,cAAc,OAAO,SAAS,MAAM,OAAM;UAAyB,MAAM,WAAW,eAAA,eAAc,CAAC,QAAQ,UAAU,wBAAqC,gBAAA,YAAW,CAAC,aAAY,MAAA;;KAYnmB,iBAAe,OAAA,OAAA,OAAA,MAAY,UAAK;AAAiB,qBAAA,YAAW,CAAC,SAAO;AAA6F,YAAM,gBAAc;;KAOrL,WAAO,OAAA,OAAA,OAAA,KAAA,CAAG,UAAoB;YAAiH,kBAAe,AAAI,MAAM,eAA+B,SAAS,MAAM,OAAM;YAAgC,aAAa,eAAA,kCAAc,CAAC,eAAA,YAAW,CAAC,IAAI,OAAO,SAAS,MAAM,IAAG;UAAe,mBAAmB,YAAU;AAAc,sBAAA,YAAW,CAAC,aAAY,MAAA;WAAoG,eAAA,qBAAoB,CAAC,cAAc,OAAK;AAAgB,uBAAA,qBAAoB,CAAC,cAAc,MAAM,OAAK;AAAgB,uBAAA,qBAAoB,CAAC,mBAAmB,QAAQ,eAAA,eAAc,CAAC,QAAQ;AAAmB,uBAAA,eAAc,CAAC,QAAQ,OAAO,eAAc,EAAA,OAAA,UAAA,EAAA;aAAiE,gBAAA,eAAc,CAAC,QAAQ,OAAO,OAAK;AAAqE,aAAM,gBAAc;;;;+BAoBj7B,MAAQ,CAAR,oBAAQ,KAAA,QAAA,UAAA"}