@maas/vue-equipment 1.0.0-beta.3 → 1.0.0-beta.31

package/dist/plugins/MagicMenu/src/components/MagicMenuTrigger.vue

@@ -1,7 +1,22 @@
-<script>
-import { defineComponent as _defineComponent } from "vue";
-import { unref as _unref, renderSlot as _renderSlot, withCtx as _withCtx, openBlock as _openBlock, createBlock as _createBlock } from "vue";
-import { computed, inject, ref, toValue, watch } from "vue";
+<template>
+  <primitive
+    ref="el"
+    :data-id="`${mappedViewId}-trigger`"
+    :data-active="view?.active"
+    :data-disabled="mappedDisabled"
+    :tabindex="mappedTabindex"
+    :as-child="asChild"
+    class="magic-menu-trigger"
+    @click="onClick"
+    @contextmenu="onClick"
+    @mouseenter="onMouseenter"
+  >
+    <slot :view-active="view?.active" :trigger-disabled="mappedDisabled" />
+  </primitive>
+</template>
+
+<script setup>
+import { computed, inject, useTemplateRef, toValue, watch } from "vue";
 import { Primitive } from "@maas/vue-primitive";
 import { useMenuState } from "../composables/private/useMenuState";
 import { useMenuView } from "../composables/private/useMenuView";
@@ -13,100 +28,82 @@ import {
   MagicMenuItemId
 } from "../symbols";
 import { onKeyStroke } from "@vueuse/core";
-export default /* @__PURE__ */ _defineComponent({
-  __name: "MagicMenuTrigger",
-  props: {
-    disabled: { type: Boolean, required: false },
-    trigger: { type: Array, required: false },
-    asChild: { type: Boolean, required: false }
-  },
-  setup(__props) {
-    const elRef = ref(void 0);
-    const instanceId = inject(MagicMenuInstanceId, void 0);
-    const viewId = inject(MagicMenuViewId, void 0);
-    const itemId = inject(MagicMenuItemId, void 0);
-    if (!instanceId) {
-      throw new Error("MagicMenuTrigger must be nested inside MagicMenuProvider");
-    }
-    if (!viewId) {
-      throw new Error("MagicMenuTrigger must be nested inside MagicMenuView");
-    }
-    const { getView, getRelativeViewIndex } = useMenuView(instanceId);
-    const view = getView(viewId);
-    const viewIndex = getRelativeViewIndex(viewId);
-    const { initializeState } = useMenuState(instanceId);
-    const state = initializeState();
-    const { getItem } = useMenuItem({ instanceId, viewId });
-    const item = getItem(itemId ?? "");
-    const mappedDisabled = computed(() => __props.disabled ?? item?.disabled ?? false);
-    const mappedTrigger = computed(() => {
-      if (__props.trigger?.length) {
-        return __props.trigger;
-      }
-      switch (state.options.mode) {
-        case "menubar":
-          return view?.parent.item ? ["mouseenter", "click"] : state.active ? ["mouseenter", "click"] : ["click"];
-        case "dropdown":
-          return view?.parent.item ? ["mouseenter", "click"] : ["click"];
-        case "context":
-          return view?.parent.item ? ["mouseenter", "click"] : ["right-click"];
-        case "navigation":
-          return ["mouseenter"];
-        default:
-          return [];
-      }
-    });
-    const mappedTabindex = computed(() => {
-      if (viewIndex === 0 && state.options.mode !== "context" && !itemId) {
-        return 0;
-      } else {
-        return void 0;
-      }
-    });
-    const { onMouseenter, onClick, onEnter } = useMenuTrigger({
-      instanceId,
-      viewId,
-      itemId,
-      mappedDisabled,
-      mappedTrigger,
-      elRef
-    });
-    watch(
-      () => view?.active,
-      async (value) => {
-        if (value) {
-          await new Promise((resolve) => requestAnimationFrame(resolve));
-          toValue(elRef)?.$el?.blur();
-        }
-      }
-    );
-    onKeyStroke("Enter", onEnter);
-    return (_ctx, _cache) => {
-      return _openBlock(), _createBlock(_unref(Primitive), {
-        ref_key: "elRef",
-        ref: elRef,
-        "data-id": `${_unref(viewId)}-trigger`,
-        "data-active": _unref(view)?.active,
-        "data-disabled": mappedDisabled.value,
-        tabindex: mappedTabindex.value,
-        "as-child": _ctx.asChild,
-        class: "magic-menu-trigger",
-        onClick: _unref(onClick),
-        onContextmenu: _unref(onClick),
-        onMouseenter: _unref(onMouseenter)
-      }, {
-        default: _withCtx(() => [
-          _renderSlot(_ctx.$slots, "default", {
-            viewActive: _unref(view)?.active,
-            triggerDisabled: mappedDisabled.value
-          })
-        ]),
-        _: 3
-        /* FORWARDED */
-      }, 8, ["data-id", "data-active", "data-disabled", "tabindex", "as-child", "onClick", "onContextmenu", "onMouseenter"]);
-    };
+const { instanceId, viewId, disabled, trigger } = defineProps({
+  instanceId: { type: String, required: false },
+  viewId: { type: String, required: false },
+  disabled: { type: Boolean, required: false },
+  trigger: { type: Array, required: false },
+  asChild: { type: Boolean, required: false }
+});
+const elRef = useTemplateRef("el");
+const injectedInstanceId = inject(MagicMenuInstanceId, void 0);
+const injectedViewId = inject(MagicMenuViewId, void 0);
+const itemId = inject(MagicMenuItemId, void 0);
+const mappedInstanceId = computed(() => instanceId ?? injectedInstanceId);
+const mappedViewId = computed(() => viewId ?? injectedViewId);
+if (!mappedInstanceId.value) {
+  throw new Error(
+    "MagicMenuRemote must be nested inside MagicMenuProvider or an instanceId must be provided"
+  );
+}
+if (!mappedViewId.value) {
+  throw new Error(
+    "MagicMenuTrigger must be nested inside MagicMenuView or a viewId must be provided"
+  );
+}
+const { getView, getRelativeViewIndex } = useMenuView(mappedInstanceId.value);
+const view = getView(mappedViewId.value);
+const viewIndex = getRelativeViewIndex(mappedViewId.value);
+const { initializeState } = useMenuState(mappedInstanceId.value);
+const state = initializeState();
+const { getItem } = useMenuItem({
+  instanceId: mappedInstanceId.value,
+  viewId: mappedViewId.value
+});
+const item = getItem(itemId ?? "");
+const mappedDisabled = computed(() => disabled ?? item?.disabled ?? false);
+const mappedTrigger = computed(() => {
+  if (trigger?.length) {
+    return trigger;
+  }
+  switch (state.options.mode) {
+    case "menubar":
+      return view?.parent.item ? ["mouseenter", "click"] : state.active ? ["mouseenter", "click"] : ["click"];
+    case "dropdown":
+      return view?.parent.item ? ["mouseenter", "click"] : ["click"];
+    case "context":
+      return view?.parent.item ? ["mouseenter", "click"] : ["right-click"];
+    case "navigation":
+      return ["mouseenter"];
+    default:
+      return [];
+  }
+});
+const mappedTabindex = computed(() => {
+  if (viewIndex === 0 && state.options.mode !== "context" && !itemId) {
+    return 0;
+  } else {
+    return void 0;
   }
 });
+const { onMouseenter, onClick, onKeypress } = useMenuTrigger({
+  instanceId: mappedInstanceId.value,
+  viewId: mappedViewId.value,
+  itemId,
+  mappedDisabled,
+  mappedTrigger,
+  elRef
+});
+watch(
+  () => view?.active,
+  async (value) => {
+    if (value) {
+      await new Promise((resolve) => requestAnimationFrame(resolve));
+      toValue(elRef)?.$el?.blur();
+    }
+  }
+);
+onKeyStroke("Enter", onKeypress);
 </script>
 
 <style>
@@ -114,7 +111,7 @@ export default /* @__PURE__ */ _defineComponent({
   cursor: var(--magic-menu-trigger-cursor, pointer);
 }
 
-.magic-menu-trigger.-disabled {
+.magic-menu-trigger[data-disabled='true'] {
   pointer-events: none;
 }
 </style>

package/dist/plugins/MagicMenu/src/components/MagicMenuTrigger.vue.d.ts

@@ -1,36 +1,22 @@
 import type { Interaction } from '../types/index.js';
 interface MagicMenuTriggerProps {
+    instanceId?: string;
+    viewId?: string;
     disabled?: boolean;
     trigger?: Interaction[];
     asChild?: boolean;
 }
-declare function __VLS_template(): {
-    attrs: Partial<{}>;
-    slots: {
-        default?(_: {
-            viewActive: any;
-            triggerDisabled: any;
-        }): any;
-    };
-    refs: {
-        elRef: any;
-    };
-    rootEl: any;
+declare var __VLS_13: {
+    viewActive: boolean | undefined;
+    triggerDisabled: boolean;
 };
-type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
-declare const __VLS_component: import("vue").DefineComponent<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<MagicMenuTriggerProps>>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<MagicMenuTriggerProps>>> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
-export default _default;
-type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
-type __VLS_TypePropsToOption<T> = {
-    [K in keyof T]-?: {} extends Pick<T, K> ? {
-        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
-    } : {
-        type: import('vue').PropType<T[K]>;
-        required: true;
-    };
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_13) => any;
 };
-type __VLS_WithTemplateSlots<T, S> = T & {
+declare const __VLS_component: import("vue").DefineComponent<MagicMenuTriggerProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicMenuTriggerProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
     new (): {
         $slots: S;
     };

package/dist/plugins/MagicMenu/src/components/MagicMenuView.vue

@@ -1,7 +1,10 @@
-<script>
-import { defineComponent as _defineComponent } from "vue";
-import { unref as _unref, renderSlot as _renderSlot, openBlock as _openBlock, createElementBlock as _createElementBlock } from "vue";
-const _hoisted_1 = ["id"];
+<template>
+  <div :data-id="mappedId" class="magic-menu-view">
+    <slot :view-active="view.active" />
+  </div>
+</template>
+
+<script setup>
 import { computed, inject, onBeforeUnmount, provide, useId } from "vue";
 import { useMenuView } from "../composables/private/useMenuView";
 import {
@@ -12,63 +15,48 @@ import {
   MagicMenuViewActive
 } from "../symbols";
 import { useMenuState } from "../composables/private/useMenuState";
-export default /* @__PURE__ */ _defineComponent({
-  __name: "MagicMenuView",
-  props: {
-    id: { type: String, required: false },
-    placement: { type: null, required: false }
-  },
-  setup(__props) {
-    const parentTree = inject(MagicMenuParentTree, []);
-    const instanceId = inject(MagicMenuInstanceId, void 0);
-    const itemId = inject(MagicMenuItemId, void 0);
-    if (!instanceId) {
-      throw new Error("MagicMenuView must be nested inside MagicMenuProvider");
-    }
-    const mappedId = computed(() => __props.id ?? `magic-menu-view-${useId()}`);
-    const mappedParentTree = computed(() => [...parentTree, mappedId.value]);
-    const mappedActive = computed(() => view.active);
-    const { initializeView, deleteView } = useMenuView(instanceId);
-    const { initializeState } = useMenuState(instanceId);
-    const state = initializeState();
-    const mappedPlacement = computed(() => {
-      if (__props.placement) {
-        return __props.placement;
-      }
-      switch (state.options.mode) {
-        case "navigation":
-          return "bottom";
-        case "menubar":
-          return !itemId ? "bottom-start" : "right-start";
-        case "dropdown":
-          return !itemId ? "bottom" : "right-start";
-        case "context":
-          return "right-start";
-        default:
-          return void 0;
-      }
-    });
-    const view = initializeView({
-      id: mappedId.value,
-      parent: { views: parentTree, item: itemId ?? "" },
-      placement: mappedPlacement.value ?? "bottom"
-    });
-    provide(MagicMenuParentTree, mappedParentTree.value);
-    provide(MagicMenuViewId, mappedId.value);
-    provide(MagicMenuViewActive, mappedActive);
-    onBeforeUnmount(() => {
-      deleteView(mappedId.value);
-    });
-    return (_ctx, _cache) => {
-      return _openBlock(), _createElementBlock("div", {
-        id: mappedId.value,
-        class: "magic-menu-view"
-      }, [
-        _renderSlot(_ctx.$slots, "default", {
-          viewActive: _unref(view).active
-        })
-      ], 8, _hoisted_1);
-    };
+const { id, placement } = defineProps({
+  id: { type: String, required: false },
+  placement: { type: null, required: false }
+});
+const parentTree = inject(MagicMenuParentTree, []);
+const instanceId = inject(MagicMenuInstanceId, void 0);
+const itemId = inject(MagicMenuItemId, void 0);
+if (!instanceId) {
+  throw new Error("MagicMenuView must be nested inside MagicMenuProvider");
+}
+const mappedId = computed(() => id ?? `magic-menu-view-${useId()}`);
+const mappedParentTree = computed(() => [...parentTree, mappedId.value]);
+const mappedActive = computed(() => view.active);
+const { initializeView, deleteView } = useMenuView(instanceId);
+const { initializeState } = useMenuState(instanceId);
+const state = initializeState();
+const mappedPlacement = computed(() => {
+  if (placement) {
+    return placement;
+  }
+  switch (state.options.mode) {
+    case "navigation":
+      return "bottom";
+    case "menubar":
+      return !itemId ? "bottom-start" : "right-start";
+    case "dropdown":
+      return !itemId ? "bottom" : "right-start";
+    case "context":
+      return "right-start";
+    default:
+      return void 0;
   }
 });
+const view = initializeView({
+  id: mappedId.value,
+  parent: { views: parentTree, item: itemId ?? "" },
+  placement: mappedPlacement.value ?? "bottom"
+});
+provide(MagicMenuParentTree, mappedParentTree.value);
+provide(MagicMenuViewId, mappedId.value);
+provide(MagicMenuViewActive, mappedActive);
+onBeforeUnmount(() => {
+  deleteView(mappedId.value);
+});
 </script>

package/dist/plugins/MagicMenu/src/components/MagicMenuView.vue.d.ts

@@ -3,30 +3,16 @@ interface MagicMenuViewProps {
     id?: string;
     placement?: Placement;
 }
-declare function __VLS_template(): {
-    attrs: Partial<{}>;
-    slots: {
-        default?(_: {
-            viewActive: any;
-        }): any;
-    };
-    refs: {};
-    rootEl: any;
+declare var __VLS_1: {
+    viewActive: boolean;
 };
-type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
-declare const __VLS_component: import("vue").DefineComponent<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<MagicMenuViewProps>>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<MagicMenuViewProps>>> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
-export default _default;
-type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
-type __VLS_TypePropsToOption<T> = {
-    [K in keyof T]-?: {} extends Pick<T, K> ? {
-        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
-    } : {
-        type: import('vue').PropType<T[K]>;
-        required: true;
-    };
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_1) => any;
 };
-type __VLS_WithTemplateSlots<T, S> = T & {
+declare const __VLS_component: import("vue").DefineComponent<MagicMenuViewProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicMenuViewProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
     new (): {
         $slots: S;
     };

package/dist/plugins/MagicMenu/src/composables/private/useMenuCallback.mjs

@@ -24,10 +24,10 @@ export function useMenuCallback(args) {
     emitter.emit("afterEnter", { id: toValue(instanceId), viewId });
     const scrollLock = state.options.scrollLock ?? ModeScrollLock[state.options.mode].value;
     if (scrollLock) {
-      lockScroll();
       if (typeof scrollLock === "object" && scrollLock.padding) {
         addScrollLockPadding();
       }
+      lockScroll();
     }
   }
   function onBeforeLeave() {

package/dist/plugins/MagicMenu/src/composables/private/useMenuChannel.mjs

@@ -22,7 +22,9 @@ export function useMenuChannel(args) {
     return channel;
   }
   function unselectSiblings(id) {
-    if (!view?.channels) return;
+    if (!view?.channels) {
+      return;
+    }
     for (const channel of view.channels) {
       if (channel.id !== id) {
         channel.active = false;
@@ -30,7 +32,9 @@ export function useMenuChannel(args) {
     }
   }
   function getChannel(id) {
-    if (!view?.channels) return void 0;
+    if (!view?.channels) {
+      return void 0;
+    }
     const channel = view.channels.find((ch) => ch.id === id);
     if (channel) {
       channelMap.set(id, channel);
@@ -44,7 +48,9 @@ export function useMenuChannel(args) {
     return channel;
   }
   function deleteChannel(id) {
-    if (!view?.channels) return;
+    if (!view?.channels) {
+      return;
+    }
     const index = view.channels.findIndex((channel) => channel.id === id);
     if (index !== -1) {
       view.channels.splice(index, 1);
@@ -53,13 +59,17 @@ export function useMenuChannel(args) {
   }
   function selectChannel(id) {
     const channel = getChannel(id);
-    if (!channel) return;
+    if (!channel) {
+      return;
+    }
     channel.active = true;
     unselectSiblings(id);
   }
   function unselectChannel(id) {
     const channel = getChannel(id);
-    if (!channel) return;
+    if (!channel) {
+      return;
+    }
     channel.active = false;
   }
   return {

package/dist/plugins/MagicMenu/src/composables/private/useMenuCursor.d.ts

@@ -7,9 +7,9 @@ export declare function useMenuCursor(view: MenuView, debug?: boolean): {
         x: number;
         y: number;
     }[]>;
-    isInsideFrom: import("vue").Ref<boolean, boolean>;
-    isInsideTo: import("vue").Ref<boolean, boolean>;
-    isInsideTriangle: import("vue").Ref<boolean, boolean>;
+    isInsideFrom: import("vue").ShallowRef<boolean, boolean>;
+    isInsideTo: import("vue").ShallowRef<boolean, boolean>;
+    isInsideTriangle: import("vue").ShallowRef<boolean, boolean>;
     initialize: () => void;
     destroy: () => void;
 };

package/dist/plugins/MagicMenu/src/composables/private/useMenuCursor.mjs

@@ -1,4 +1,4 @@
-import { ref } from "vue";
+import { ref, shallowRef } from "vue";
 import { useEventListener } from "@vueuse/core";
 export function useMenuCursor(view, debug = false) {
   let cancelListener = new AbortController();
@@ -7,9 +7,9 @@ export function useMenuCursor(view, debug = false) {
     { x: 0, y: 0 },
     { x: 0, y: 0 }
   ]);
-  const isInsideFrom = ref(false);
-  const isInsideTo = ref(false);
-  const isInsideTriangle = ref(false);
+  const isInsideFrom = shallowRef(false);
+  const isInsideTo = shallowRef(false);
+  const isInsideTriangle = shallowRef(false);
   function extendTriangle(vertices, pixelAmount) {
     const [a, b, c] = vertices;
     switch (view?.placement) {

package/dist/plugins/MagicMenu/src/composables/private/useMenuDOM.mjs

@@ -1,7 +1,11 @@
-import { ref } from "vue";
+import { ref, shallowRef } from "vue";
 import { useScrollLock } from "@vueuse/core";
-import { matchClass } from "@maas/vue-equipment/utils";
-const scrollLock = typeof window !== "undefined" ? useScrollLock(document?.documentElement) : ref(false);
+import {
+  matchClass,
+  scrollbarGutterSupport,
+  scrollbarWidth
+} from "@maas/vue-equipment/utils";
+const scrollLock = typeof window !== "undefined" ? useScrollLock(document?.documentElement) : shallowRef(false);
 export function useMenuDOM() {
   const positionFixedElements = ref([]);
   function lockScroll() {
@@ -12,25 +16,41 @@ export function useMenuDOM() {
   }
   function addScrollLockPadding() {
     if (typeof window === "undefined") return;
-    const exclude = new RegExp(/magic-menu?/);
-    const scrollbarWidth = window.innerWidth - document.body.offsetWidth;
-    document.body.style.setProperty("--scrollbar-width", `${scrollbarWidth}px`);
-    document.body.style.paddingRight = "var(--scrollbar-width)";
+    const exclude = new RegExp(/magic-menu/);
+    document.body.style.setProperty(
+      "--scrollbar-width",
+      `${scrollbarWidth()}px`
+    );
     positionFixedElements.value = [
       ...document.body.getElementsByTagName("*")
     ].filter(
-      (x) => getComputedStyle(x, null).getPropertyValue("position") === "fixed" && !matchClass(x, exclude)
-    );
-    positionFixedElements.value.forEach(
-      (elem) => elem.style.paddingRight = "var(--scrollbar-width)"
+      (x) => getComputedStyle(x, null).getPropertyValue("position") === "fixed" && getComputedStyle(x, null).getPropertyValue("right") === "0px" && !matchClass(x, exclude)
     );
+    switch (scrollbarGutterSupport()) {
+      case true:
+        document.documentElement.style.scrollbarGutter = "stable";
+        positionFixedElements.value.forEach((elem) => {
+          elem.style.scrollbarGutter = "stable";
+          elem.style.overflow = "auto";
+        });
+        break;
+      case false:
+        document.body.style.paddingRight = "var(--scrollbar-width)";
+        positionFixedElements.value.forEach(
+          (elem) => elem.style.paddingRight = "var(--scrollbar-width)"
+        );
+        break;
+    }
   }
   function removeScrollLockPadding() {
-    document.body.style.paddingRight = "";
+    document.documentElement.style.scrollbarGutter = "";
     document.body.style.removeProperty("--scrollbar-width");
-    positionFixedElements.value.forEach(
-      (elem) => elem.style.paddingRight = ""
-    );
+    document.body.style.paddingRight = "";
+    positionFixedElements.value.forEach((elem) => {
+      elem.style.paddingRight = "";
+      elem.style.scrollbarGutter = "";
+      elem.style.overflow = "";
+    });
   }
   return {
     lockScroll,

package/dist/plugins/MagicMenu/src/composables/private/useMenuKeyListener.d.ts

@@ -5,6 +5,6 @@ export declare function useMenuKeyListener(instanceId: MaybeRef<string>): {
     onArrowUp: (e: KeyboardEvent) => void;
     onArrowDown: (e: KeyboardEvent) => void;
     onEscape: (e: KeyboardEvent) => void;
-    onEnter: (e: KeyboardEvent) => Promise<void>;
+    onReturn: (e: KeyboardEvent) => Promise<void>;
     onTab: (e: KeyboardEvent) => void;
 };

package/dist/plugins/MagicMenu/src/composables/private/useMenuKeyListener.mjs

@@ -1,3 +1,4 @@
+import {} from "vue";
 import { useMenuState } from "./useMenuState.mjs";
 import { useMenuView } from "./useMenuView.mjs";
 import { useMenuItem } from "./useMenuItem.mjs";
@@ -20,10 +21,13 @@ export function useMenuKeyListener(instanceId) {
     switch (true) {
       case (!state.active && state.options.debug):
         throw new Error(`'MagicMenu ${state.id} is not active'`);
-      default:
+      case state.active:
         state.input.type = "keyboard";
-        e.preventDefault();
         e.stopPropagation();
+        e.preventDefault();
+        break;
+      default:
+        state.input.type = "keyboard";
     }
   }
   function getEnabledItems(view) {
@@ -140,7 +144,7 @@ export function useMenuKeyListener(instanceId) {
     state.input.view = "";
     unselectAllViews();
   }
-  async function onEnter(e) {
+  async function onReturn(e) {
     try {
       keyStrokeGuard(e);
     } catch (e2) {
@@ -177,7 +181,7 @@ export function useMenuKeyListener(instanceId) {
     onArrowUp,
     onArrowDown,
     onEscape,
-    onEnter,
+    onReturn,
     onTab
   };
 }

package/dist/plugins/MagicMenu/src/composables/private/useMenuTrigger.d.ts

@@ -7,11 +7,11 @@ type UseMenuTriggerArgs = {
     itemId?: string;
     mappedDisabled: ComputedRef<boolean>;
     mappedTrigger: ComputedRef<Interaction[]>;
-    elRef: Ref<InstanceType<typeof Primitive> | undefined>;
+    elRef: Ref<InstanceType<typeof Primitive> | null>;
 };
 export declare function useMenuTrigger(args: UseMenuTriggerArgs): {
     onMouseenter: () => void;
     onClick: (e: MouseEvent) => void;
-    onEnter: (e: KeyboardEvent) => void;
+    onKeypress: (e: KeyboardEvent) => void;
 };
 export {};