@maas/vue-equipment 1.0.0-beta.1 → 1.0.0-beta.10

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

@@ -1,6 +1,6 @@
 <script>
 import { defineComponent as _defineComponent } from "vue";
-import { unref as _unref, renderSlot as _renderSlot, normalizeClass as _normalizeClass, withCtx as _withCtx, createVNode as _createVNode, resolveComponent as _resolveComponent, openBlock as _openBlock, createBlock as _createBlock } from "vue";
+import { unref as _unref, renderSlot as _renderSlot, withCtx as _withCtx, openBlock as _openBlock, createBlock as _createBlock } from "vue";
 import { computed, inject, watch } from "vue";
 import { Primitive } from "@maas/vue-primitive";
 import { useMenuView } from "../composables/private/useMenuView";
@@ -18,16 +18,18 @@ export default /* @__PURE__ */ _defineComponent({
     asChild: { type: Boolean, required: false }
   },
   setup(__props) {
-    const mappedInstanceId = inject(MagicMenuInstanceId, __props.instanceId);
-    const mappedViewId = inject(MagicMenuViewId, __props.viewId);
-    if (!mappedInstanceId) {
+    const injectedInstanceId = inject(MagicMenuInstanceId, __props.instanceId);
+    const injectedViewId = inject(MagicMenuViewId, __props.viewId);
+    const mappedInstanceId = computed(() => __props.instanceId ?? injectedInstanceId);
+    const mappedViewId = computed(() => __props.viewId ?? injectedViewId);
+    if (!mappedInstanceId.value) {
       throw new Error(
         "MagicMenuRemote must be nested inside MagicMenuProvider or an instanceId must be provided"
       );
     }
-    if (!mappedViewId) {
+    if (!mappedViewId.value) {
       throw new Error(
-        "MagicMenuTrigger must be nested inside MagicMenuView or a viewId must be provided"
+        "MagicMenuRemote must be nested inside MagicMenuView or a viewId must be provided"
       );
     }
     if (!__props.channelId) {
@@ -35,15 +37,15 @@ export default /* @__PURE__ */ _defineComponent({
     }
     const mappedChannelId = computed(() => `magic-menu-channel-${__props.channelId}`);
     const mappedTrigger = computed(() => __props.trigger ?? ["mouseenter"]);
-    const { getView } = useMenuView(mappedInstanceId);
-    const view = getView(mappedViewId);
+    const { getView } = useMenuView(mappedInstanceId.value);
+    const view = getView(mappedViewId.value);
     const { initializeChannel, deleteChannel } = useMenuChannel({
-      instanceId: mappedInstanceId,
-      viewId: mappedViewId
+      instanceId: mappedInstanceId.value,
+      viewId: mappedViewId.value
     });
     const { onClick, onMouseenter } = useMenuRemote({
-      instanceId: mappedInstanceId,
-      viewId: mappedViewId,
+      instanceId: mappedInstanceId.value,
+      viewId: mappedViewId.value,
       mappedChannelId,
       mappedTrigger
     });
@@ -58,36 +60,24 @@ export default /* @__PURE__ */ _defineComponent({
       }
     );
     return (_ctx, _cache) => {
-      const _component_magic_menu_trigger = _resolveComponent("magic-menu-trigger");
-      return _openBlock(), _createBlock(_component_magic_menu_trigger, {
-        "view-id": _unref(mappedViewId),
-        disabled: _ctx.disabled,
-        trigger: _ctx.trigger
+      return _openBlock(), _createBlock(_unref(Primitive), {
+        class: "magic-menu-remote",
+        "data-id": `${_ctx.channelId}-remote`,
+        "data-disabled": _ctx.disabled,
+        "data-active": _unref(channel)?.active,
+        "as-child": _ctx.asChild,
+        onClick: _unref(onClick),
+        onMouseenter: _unref(onMouseenter)
       }, {
         default: _withCtx(() => [
-          _createVNode(_unref(Primitive), {
-            class: _normalizeClass([
-              "magic-menu-remote",
-              { "-active": _unref(channel)?.active, "-disabled": _ctx.disabled }
-            ]),
-            "data-id": `${_ctx.channelId}-remote`,
-            "as-child": _ctx.asChild,
-            onClick: _unref(onClick),
-            onMouseenter: _unref(onMouseenter)
-          }, {
-            default: _withCtx(() => [
-              _renderSlot(_ctx.$slots, "default", {
-                channelActive: _unref(channel)?.active,
-                remoteDisabled: _ctx.disabled
-              })
-            ]),
-            _: 3
-            /* FORWARDED */
-          }, 8, ["class", "data-id", "as-child", "onClick", "onMouseenter"])
+          _renderSlot(_ctx.$slots, "default", {
+            channelActive: _unref(channel)?.active,
+            remoteDisabled: _ctx.disabled
+          })
         ]),
         _: 3
         /* FORWARDED */
-      }, 8, ["view-id", "disabled", "trigger"]);
+      }, 8, ["data-id", "data-disabled", "data-active", "as-child", "onClick", "onMouseenter"]);
     };
   }
 });
@@ -98,7 +88,7 @@ export default /* @__PURE__ */ _defineComponent({
   cursor: var(--magic-menu-remote-cursor, pointer);
 }
 
-.magic-menu-remote.-disabled {
+.magic-menu-remote[data-disabled='true'] {
   pointer-events: none;
 }
 </style>

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

@@ -1,3 +1,4 @@
+import { Primitive } from '@maas/vue-primitive';
 import type { Interaction } from '../types/index.js';
 interface MagicMenuRemoteProps {
     channelId: string;
@@ -7,31 +8,26 @@ interface MagicMenuRemoteProps {
     trigger?: Interaction[];
     asChild?: boolean;
 }
-declare function __VLS_template(): {
-    attrs: Partial<{}>;
-    slots: {
-        default?(_: {
-            channelActive: boolean;
-            remoteDisabled: boolean | undefined;
-        }): any;
-    };
-    refs: {};
-    rootEl: any;
+declare const onClick: () => void, onMouseenter: () => void;
+declare let channel: import("../types").MenuChannel;
+declare const __VLS_ctx: InstanceType<__VLS_PickNotAny<typeof __VLS_self, new () => {}>>;
+declare var __VLS_11: {
+    channelActive: boolean;
+    remoteDisabled: boolean;
 };
-type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
-declare const __VLS_component: import("vue").DefineComponent<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<MagicMenuRemoteProps>>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<MagicMenuRemoteProps>>> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
+type __VLS_Slots = __VLS_PrettifyGlobal<__VLS_OmitStringIndex<typeof __VLS_ctx.$slots> & {
+    default?: (props: typeof __VLS_11) => any;
+}>;
+declare const __VLS_self: import("vue").DefineComponent<MagicMenuRemoteProps, {
+    Primitive: typeof Primitive;
+    onClick: typeof onClick;
+    onMouseenter: typeof onMouseenter;
+    channel: typeof channel;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicMenuRemoteProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const __VLS_component: import("vue").DefineComponent<MagicMenuRemoteProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicMenuRemoteProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_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_WithTemplateSlots<T, S> = T & {
+type __VLS_WithSlots<T, S> = T & {
     new (): {
         $slots: S;
     };

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

@@ -1,7 +1,7 @@
 <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";
+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";
@@ -16,27 +16,38 @@ import { onKeyStroke } from "@vueuse/core";
 export default /* @__PURE__ */ _defineComponent({
   __name: "MagicMenuTrigger",
   props: {
+    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 }
   },
   setup(__props) {
-    const elRef = ref(void 0);
-    const instanceId = inject(MagicMenuInstanceId, void 0);
-    const viewId = inject(MagicMenuViewId, void 0);
+    const elRef = useTemplateRef("el");
+    const injectedInstanceId = inject(MagicMenuInstanceId, void 0);
+    const injectedViewId = inject(MagicMenuViewId, void 0);
     const itemId = inject(MagicMenuItemId, void 0);
-    if (!instanceId) {
-      throw new Error("MagicMenuTrigger must be nested inside MagicMenuProvider");
+    const mappedInstanceId = computed(() => __props.instanceId ?? injectedInstanceId);
+    const mappedViewId = computed(() => __props.viewId ?? injectedViewId);
+    if (!mappedInstanceId.value) {
+      throw new Error(
+        "MagicMenuRemote must be nested inside MagicMenuProvider or an instanceId must be provided"
+      );
     }
-    if (!viewId) {
-      throw new Error("MagicMenuTrigger must be nested inside MagicMenuView");
+    if (!mappedViewId.value) {
+      throw new Error(
+        "MagicMenuTrigger must be nested inside MagicMenuView or a viewId must be provided"
+      );
     }
-    const { getView, getRelativeViewIndex } = useMenuView(instanceId);
-    const view = getView(viewId);
-    const viewIndex = getRelativeViewIndex(viewId);
-    const { initializeState } = useMenuState(instanceId);
+    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, viewId });
+    const { getItem } = useMenuItem({
+      instanceId: mappedInstanceId.value,
+      viewId: mappedViewId.value
+    });
     const item = getItem(itemId ?? "");
     const mappedDisabled = computed(() => __props.disabled ?? item?.disabled ?? false);
     const mappedTrigger = computed(() => {
@@ -64,8 +75,8 @@ export default /* @__PURE__ */ _defineComponent({
       }
     });
     const { onMouseenter, onClick, onEnter } = useMenuTrigger({
-      instanceId,
-      viewId,
+      instanceId: mappedInstanceId.value,
+      viewId: mappedViewId.value,
       itemId,
       mappedDisabled,
       mappedTrigger,
@@ -83,9 +94,8 @@ export default /* @__PURE__ */ _defineComponent({
     onKeyStroke("Enter", onEnter);
     return (_ctx, _cache) => {
       return _openBlock(), _createBlock(_unref(Primitive), {
-        ref_key: "elRef",
-        ref: elRef,
-        "data-id": `${_unref(viewId)}-trigger`,
+        ref: "el",
+        "data-id": `${mappedViewId.value}-trigger`,
         "data-active": _unref(view)?.active,
         "data-disabled": mappedDisabled.value,
         tabindex: mappedTabindex.value,
@@ -114,7 +124,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,71 +1,38 @@
+import { Primitive } from '@maas/vue-primitive';
 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: boolean | undefined;
-            triggerDisabled: boolean;
-        }): any;
-    };
-    refs: {
-        elRef: import("vue").CreateComponentPublicInstanceWithMixins<Readonly<import("vue").ExtractPropTypes<{
-            asChild: {
-                type: BooleanConstructor;
-                default: boolean;
-            };
-            as: {
-                type: import("vue").PropType<import("@maas/vue-primitive").ElementOrComponent>;
-                default: string;
-            };
-        }>>, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-            [key: string]: any;
-        }>, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, import("vue").PublicProps, {
-            asChild: boolean;
-            as: import("@maas/vue-primitive").ElementOrComponent;
-        }, true, {}, {}, import("vue").GlobalComponents, import("vue").GlobalDirectives, string, {}, any, import("vue").ComponentProvideOptions, {
-            P: {};
-            B: {};
-            D: {};
-            C: {};
-            M: {};
-            Defaults: {};
-        }, Readonly<import("vue").ExtractPropTypes<{
-            asChild: {
-                type: BooleanConstructor;
-                default: boolean;
-            };
-            as: {
-                type: import("vue").PropType<import("@maas/vue-primitive").ElementOrComponent>;
-                default: string;
-            };
-        }>>, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-            [key: string]: any;
-        }>, {}, {}, {}, {
-            asChild: boolean;
-            as: import("@maas/vue-primitive").ElementOrComponent;
-        }> | null;
-    };
-    rootEl: any;
+declare const mappedViewId: import("vue").ComputedRef<string | undefined>;
+declare const view: import("../types").MenuView | undefined;
+declare const mappedDisabled: import("vue").ComputedRef<boolean>;
+declare const mappedTabindex: import("vue").ComputedRef<0 | undefined>;
+declare const onMouseenter: () => void, onClick: (e: MouseEvent) => void;
+declare const __VLS_ctx: InstanceType<__VLS_PickNotAny<typeof __VLS_self, new () => {}>>;
+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"]>;
+type __VLS_Slots = __VLS_PrettifyGlobal<__VLS_OmitStringIndex<typeof __VLS_ctx.$slots> & {
+    default?: (props: typeof __VLS_13) => any;
+}>;
+declare const __VLS_self: import("vue").DefineComponent<MagicMenuTriggerProps, {
+    Primitive: typeof Primitive;
+    mappedViewId: typeof mappedViewId;
+    view: typeof view;
+    mappedDisabled: typeof mappedDisabled;
+    mappedTabindex: typeof mappedTabindex;
+    onMouseenter: typeof onMouseenter;
+    onClick: typeof onClick;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicMenuTriggerProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+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_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_WithTemplateSlots<T, S> = T & {
+type __VLS_WithSlots<T, S> = T & {
     new (): {
         $slots: S;
     };

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

@@ -1,7 +1,7 @@
 <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"];
+const _hoisted_1 = ["data-id"];
 import { computed, inject, onBeforeUnmount, provide, useId } from "vue";
 import { useMenuView } from "../composables/private/useMenuView";
 import {
@@ -61,7 +61,7 @@ export default /* @__PURE__ */ _defineComponent({
     });
     return (_ctx, _cache) => {
       return _openBlock(), _createElementBlock("div", {
-        id: mappedId.value,
+        "data-id": mappedId.value,
         class: "magic-menu-view"
       }, [
         _renderSlot(_ctx.$slots, "default", {

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

@@ -3,30 +3,23 @@ interface MagicMenuViewProps {
     id?: string;
     placement?: Placement;
 }
-declare function __VLS_template(): {
-    attrs: Partial<{}>;
-    slots: {
-        default?(_: {
-            viewActive: boolean;
-        }): any;
-    };
-    refs: {};
-    rootEl: HTMLDivElement;
+declare const mappedId: import("vue").ComputedRef<string>;
+declare const view: import("../types").MenuView;
+declare const __VLS_ctx: InstanceType<__VLS_PickNotAny<typeof __VLS_self, new () => {}>>;
+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"]>;
+type __VLS_Slots = __VLS_PrettifyGlobal<__VLS_OmitStringIndex<typeof __VLS_ctx.$slots> & {
+    default?: (props: typeof __VLS_1) => any;
+}>;
+declare const __VLS_self: import("vue").DefineComponent<MagicMenuViewProps, {
+    mappedId: typeof mappedId;
+    view: typeof view;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicMenuViewProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+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_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_WithTemplateSlots<T, S> = T & {
+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/useMenuTrigger.d.ts

@@ -7,7 +7,7 @@ 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;