@maas/vue-equipment 0.25.0 → 0.25.2

package/dist/nuxt/module.json

@@ -1,5 +1,5 @@
 {
   "name": "@maas/vue-equipment/nuxt",
   "configKey": "vueEquipment",
-  "version": "0.24.8"
+  "version": "0.25.1"
 }

package/dist/plugins/MagicDrawer/src/components/MagicDrawer.vue

@@ -154,6 +154,15 @@ const {
   removeScrollLockPadding,
 } = drawerApi
 
+// Make sure this is reactive
+const disabled = computed(() => {
+  if (props.options.disabled === undefined) {
+    return defaultOptions.disabled
+  } else {
+    return props.options.disabled
+  }
+})
+
 const { onPointerdown, onClick, style, hasDragged } = useDrawerDrag({
   id: props.id,
   isActive,
@@ -170,8 +179,8 @@ const { onPointerdown, onClick, style, hasDragged } = useDrawerDrag({
 const { initializeWheelListener, destroyWheelListener } = useDrawerWheel({
   id: props.id,
   elRef,
-  drawerRef,
   position,
+  disabled,
 })
 
 const { findState } = useDrawerState(props.id)
@@ -226,15 +235,6 @@ const contentTransition = computed(() => {
     : mappedOptions.transitions?.content
 })
 
-// Make sure this is reactive
-const disabled = computed(() => {
-  if (props.options.disabled === undefined) {
-    return defaultOptions.disabled
-  } else {
-    return props.options.disabled
-  }
-})
-
 // Private functions
 function convertToPixels(value: string) {
   const regex = /^(\d*\.?\d+)\s*(rem|px)$/

package/dist/plugins/MagicDrawer/src/composables/private/useDrawerWheel.d.ts

@@ -1,10 +1,10 @@
-import { type Ref, type MaybeRef } from 'vue';
+import { type Ref, type MaybeRef, type ComputedRef } from 'vue';
 import { type DefaultOptions } from '../../utils/defaultOptions.js';
 type UseDrawerWheelArgs = {
     id: MaybeRef<string>;
     elRef: Ref<HTMLElement | undefined>;
-    drawerRef: Ref<HTMLElement | undefined>;
     position: MaybeRef<DefaultOptions['position']>;
+    disabled: ComputedRef<boolean>;
 };
 export declare function useDrawerWheel(args: UseDrawerWheelArgs): {
     initializeWheelListener: () => void;

package/dist/plugins/MagicDrawer/src/composables/private/useDrawerWheel.mjs

@@ -1,9 +1,12 @@
-import { computed, toValue } from "vue";
+import {
+  computed,
+  toValue
+} from "vue";
 import { unrefElement } from "@vueuse/core";
 import WheelGestures from "wheel-gestures";
 import { useDrawerState } from "./useDrawerState.mjs";
 export function useDrawerWheel(args) {
-  const { id, elRef, drawerRef, position } = args;
+  const { id, elRef, position, disabled } = args;
   const { findState } = useDrawerState(toValue(id));
   const { dragging, wheeling } = findState();
   let startEvent;
@@ -18,7 +21,7 @@ export function useDrawerWheel(args) {
     }
   });
   const wheelGestures = WheelGestures({
-    preventWheelAction: axis.value,
+    preventWheelAction: disabled ? false : axis.value,
     reverseSign: [true, true, false]
     // Reverse scroll direction for x and y axis
   });
@@ -71,7 +74,7 @@ export function useDrawerWheel(args) {
     if (primaryAxisDeltaIsDominant && !dragging.value && !state.isMomentum) {
       onWheelStarted(state);
     }
-    if (!dragging.value) {
+    if (!dragging.value || !wheeling.value) {
       return;
     }
     if (isEndingOrRelease) {
@@ -81,10 +84,7 @@ export function useDrawerWheel(args) {
     }
   }
   function initializeWheelListener() {
-    if (!unrefElement(drawerRef)) {
-      return;
-    }
-    unobserveTargetNode = wheelGestures.observe(unrefElement(drawerRef));
+    unobserveTargetNode = wheelGestures.observe(document);
     cancelWheel = wheelGestures.on("wheel", handleWheel);
   }
   function destroyWheelListener() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@maas/vue-equipment",
   "description": "A magic collection of Vue composables, plugins, components and directives",
-  "version": "0.25.0",
+  "version": "0.25.2",
   "author": "Robin Scholz <https://github.com/robinscholz>, Christoph Jeworutzki <https://github.com/ChristophJeworutzki>",
   "devDependencies": {
     "@antfu/ni": "^0.21.12",