@maas/vue-equipment 0.28.2 → 0.28.4

package/dist/nuxt/module.json

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

package/dist/plugins/MagicCommand/src/components/MagicCommandProvider.vue

@@ -14,9 +14,6 @@ import { MagicCommandInstanceId, MagicCommandOptions } from '../symbols'
 
 import type { CommandOptions } from './../types/index'
 
-import '@maas/vue-equipment/utils/css/animations/fade-in.css'
-import '@maas/vue-equipment/utils/css/animations/fade-out.css'
-
 // Prevent keys arrays from being merged with default
 const customDefu = createDefu((obj, key, value) => {
   if (key === 'open' || key === 'close' || key === 'next' || key === 'prev') {

package/dist/plugins/MagicCommand/src/components/MagicCommandProvider.vue.d.ts

@@ -1,7 +1,5 @@
 import { type MaybeRef } from 'vue';
 import type { CommandOptions } from './../types/index';
-import '@maas/vue-equipment/utils/css/animations/fade-in.css';
-import '@maas/vue-equipment/utils/css/animations/fade-out.css';
 interface MagicCommandProps {
     id: MaybeRef<string>;
     options?: CommandOptions;

package/dist/plugins/MagicDraggable/nuxt.mjs

@@ -1,8 +1,4 @@
-import {
-  defineNuxtModule,
-  createResolver,
-  addComponent
-} from "@nuxt/kit";
+import { defineNuxtModule, createResolver, addComponent } from "@nuxt/kit";
 export default defineNuxtModule({
   meta: {
     name: "@maas/vue-equipment/nuxt/MagicDraggable"

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

@@ -181,6 +181,7 @@ const { onPointerdown, onClick, style, hasDragged } = useDrawerDrag({
   animation,
   initial,
   preventDragClose,
+  disabled,
   close,
 })
 

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

@@ -11,6 +11,7 @@ type UseDrawerDragArgs = {
     initial: MaybeRef<DefaultOptions['initial']>;
     animation: MaybeRef<DefaultOptions['animation']>;
     preventDragClose: MaybeRef<DefaultOptions['preventDragClose']>;
+    disabled: MaybeRef<boolean>;
     overshoot: MaybeRef<number>;
     close: () => void;
 };

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

@@ -32,6 +32,7 @@ export function useDrawerDrag(args) {
     initial,
     animation,
     preventDragClose,
+    disabled,
     close
   } = args;
   const { findState } = useDrawerState(toValue(id));
@@ -281,6 +282,24 @@ export function useDrawerDrag(args) {
       }
     }
   }
+  function onCancel() {
+    switch (position) {
+      case "bottom":
+      case "top":
+        interpolateDragged({
+          to: snappedY.value
+        });
+        break;
+      case "right":
+      case "left":
+        interpolateDragged({
+          to: snappedX.value
+        });
+        break;
+    }
+    resetStateAndListeners();
+    resetScrollLock();
+  }
   function onPointerup(e) {
     if (shouldClose.value) {
       close();
@@ -401,6 +420,14 @@ export function useDrawerDrag(args) {
     lastDraggedX.value = x;
     lastDraggedY.value = y;
   });
+  watch(
+    () => toValue(disabled),
+    (value) => {
+      if (value) {
+        onCancel();
+      }
+    }
+  );
   useResizeObserver(elRef, async () => {
     useThrottleFn(async () => {
       await getSizes();

package/dist/plugins/MagicScroll/src/components/MagicScrollScene.vue

@@ -47,10 +47,6 @@ async function calculate() {
   progress.value = getProgress()
 }
 
-onMounted(() => {
-  calculate()
-})
-
 watch(
   () => scrollReturn?.y.value,
   () => {
@@ -60,6 +56,14 @@ watch(
   }
 )
 
+watch(
+  () => scrollReturn?.y.value,
+  () => {
+    calculate()
+  },
+  { once: true }
+)
+
 useIntersectionObserver(
   elRef,
   ([{ isIntersecting }]) => {

package/package.json

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