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

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

@@ -1,46 +1,29 @@
 import { type MaybeRef } from 'vue';
 import type { MagicDrawerOptions } from '../types/index.js';
-import '@maas/vue-equipment/utils/css/animations/fade-in.css';
-import '@maas/vue-equipment/utils/css/animations/fade-out.css';
-import '@maas/vue-equipment/utils/css/animations/slide-ltr-in.css';
-import '@maas/vue-equipment/utils/css/animations/slide-rtl-in.css';
-import '@maas/vue-equipment/utils/css/animations/slide-ttb-in.css';
-import '@maas/vue-equipment/utils/css/animations/slide-btt-in.css';
-import '@maas/vue-equipment/utils/css/animations/slide-ltr-out.css';
-import '@maas/vue-equipment/utils/css/animations/slide-rtl-out.css';
-import '@maas/vue-equipment/utils/css/animations/slide-ttb-out.css';
-import '@maas/vue-equipment/utils/css/animations/slide-btt-out.css';
+import '@maas/vue-equipment/utils/css/keyframes/fade-in.css';
+import '@maas/vue-equipment/utils/css/keyframes/fade-out.css';
+import '@maas/vue-equipment/utils/css/keyframes/slide-ltr-in.css';
+import '@maas/vue-equipment/utils/css/keyframes/slide-rtl-in.css';
+import '@maas/vue-equipment/utils/css/keyframes/slide-ttb-in.css';
+import '@maas/vue-equipment/utils/css/keyframes/slide-btt-in.css';
+import '@maas/vue-equipment/utils/css/keyframes/slide-ltr-out.css';
+import '@maas/vue-equipment/utils/css/keyframes/slide-rtl-out.css';
+import '@maas/vue-equipment/utils/css/keyframes/slide-ttb-out.css';
+import '@maas/vue-equipment/utils/css/keyframes/slide-btt-out.css';
 interface MagicDrawerProps {
     id: MaybeRef<string>;
     options?: MagicDrawerOptions;
 }
-declare function __VLS_template(): {
-    attrs: Partial<{}>;
-    slots: {
-        backdrop?(_: {}): any;
-        default?(_: {}): any;
-    };
-    refs: {
-        drawerRef: any;
-        wrapperRef: any;
-        elRef: any;
-    };
-    rootEl: any;
+declare var __VLS_9: {}, __VLS_35: {};
+type __VLS_Slots = {} & {
+    backdrop?: (props: typeof __VLS_9) => any;
+} & {
+    default?: (props: typeof __VLS_35) => any;
 };
-type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
-declare const __VLS_component: import("vue").DefineComponent<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<MagicDrawerProps>>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<MagicDrawerProps>>> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
+declare const __VLS_component: import("vue").DefineComponent<MagicDrawerProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicDrawerProps> & 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/MagicDrawer/src/composables/private/useDrawerDOM.mjs

@@ -1,14 +1,18 @@
-import { ref } from "vue";
+import { ref, shallowRef } from "vue";
 import { defu } from "defu";
 import { useScrollLock } from "@vueuse/core";
 import { useFocusTrap } from "@vueuse/integrations/useFocusTrap";
-import { matchClass } from "@maas/vue-equipment/utils";
+import {
+  matchClass,
+  scrollbarGutterSupport,
+  scrollbarWidth
+} from "@maas/vue-equipment/utils";
 const defaultOptions = {
   focusTrap: false,
   focusTarget: void 0,
   scrollLock: true
 };
-const scrollLock = typeof window !== "undefined" ? useScrollLock(document?.documentElement) : ref(false);
+const scrollLock = typeof window !== "undefined" ? useScrollLock(document?.documentElement) : shallowRef(false);
 export function useDrawerDOM(args) {
   const positionFixedElements = ref([]);
   const mappedOptions = defu(args, defaultOptions);
@@ -36,24 +40,40 @@ export function useDrawerDOM(args) {
   function addScrollLockPadding() {
     if (typeof window === "undefined") return;
     const exclude = new RegExp(/magic-drawer(__backdrop)?/);
-    const scrollbarWidth = window.innerWidth - document.body.offsetWidth;
-    document.body.style.setProperty("--scrollbar-width", `${scrollbarWidth}px`);
-    document.body.style.paddingRight = "var(--scrollbar-width)";
+    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 {
     trapFocus,

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

@@ -2,8 +2,8 @@ import { type Ref, type MaybeRef } from 'vue';
 import type { DrawerDefaultOptions } from '../../types/index.js';
 type UseDrawerDragArgs = {
     id: MaybeRef<string>;
-    elRef: Ref<HTMLElement | undefined>;
-    wrapperRef: Ref<HTMLDivElement | undefined>;
+    elRef: Ref<HTMLElement | null>;
+    wrapperRef: Ref<HTMLDivElement | null>;
     position: MaybeRef<DrawerDefaultOptions['position']>;
     snapPoints: MaybeRef<DrawerDefaultOptions['snapPoints']>;
     threshold: MaybeRef<DrawerDefaultOptions['threshold']>;

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

@@ -383,9 +383,9 @@ export function useDrawerDrag(args) {
     shouldClose.value = false;
     checkDirection({ x: e.screenX, y: e.screenY });
     if (!scrollLock) {
-      const target = lockScroll(e.target);
-      if (target) {
-        scrollLock = useScrollLock(target);
+      const scrollLockTarget = lockScroll(e.target);
+      if (scrollLockTarget) {
+        scrollLock = useScrollLock(scrollLockTarget);
         scrollLock.value = true;
       }
     }

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

@@ -1,7 +1,7 @@
 import { type Ref, type MaybeRef } from 'vue';
 import type { DrawerSnapPoint, DrawerDefaultOptions } from '../../types/index.js';
 interface UseDrawerGuardsArgs {
-    elRef: Ref<HTMLElement | undefined>;
+    elRef: Ref<HTMLElement | null>;
     absDirectionX: MaybeRef<'with' | 'against' | undefined>;
     absDirectionY: MaybeRef<'with' | 'against' | undefined>;
     position: MaybeRef<DrawerDefaultOptions['position']>;

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

@@ -8,6 +8,20 @@ export function useDrawerGuards(args) {
   const canSnap = computed(() => {
     return toValue(activeSnapPoint) !== 1 && !!toValue(activeSnapPoint);
   });
+  function canScrollY(element) {
+    const style = window.getComputedStyle(element);
+    const overflowY = style.overflowY;
+    const canScroll = ["auto", "scroll"].includes(overflowY);
+    const hasOverflow = Math.round(element.scrollHeight) > Math.round(element.clientHeight);
+    return canScroll && hasOverflow;
+  }
+  function canScrollX(element) {
+    const style = window.getComputedStyle(element);
+    const overflowX = style.overflowX;
+    const canScroll = ["auto", "scroll"].includes(overflowX);
+    const hasOverflow = Math.round(element.scrollWidth) > Math.round(element.clientWidth);
+    return canScroll && hasOverflow;
+  }
   function canDrag(el) {
     let element = el;
     if (hasCursor.value) {
@@ -22,7 +36,7 @@ export function useDrawerGuards(args) {
       }
       switch (position) {
         case "bottom":
-          if (element.scrollHeight > element.clientHeight) {
+          if (canScrollY(element)) {
             if (element.scrollTop > 0) {
               return false;
             }
@@ -35,7 +49,7 @@ export function useDrawerGuards(args) {
           }
           break;
         case "top":
-          if (element.scrollHeight > element.clientHeight) {
+          if (canScrollY(element)) {
             const maxScroll = element.scrollHeight - element.clientHeight;
             if (element.scrollTop < maxScroll) {
               return false;
@@ -49,7 +63,7 @@ export function useDrawerGuards(args) {
           }
           break;
         case "right":
-          if (element.scrollWidth > element.clientWidth) {
+          if (canScrollX(element)) {
             if (element.scrollLeft > 0) {
               return false;
             }
@@ -62,7 +76,7 @@ export function useDrawerGuards(args) {
           }
           break;
         case "left":
-          if (element.scrollWidth > element.clientWidth) {
+          if (canScrollX(element)) {
             const maxScroll = element.scrollWidth - element.clientWidth;
             if (element.scrollLeft < maxScroll) {
               return false;
@@ -89,13 +103,13 @@ export function useDrawerGuards(args) {
       switch (position) {
         case "bottom":
         case "top":
-          if (element.scrollHeight > element.clientHeight) {
+          if (canScrollY(element)) {
             return false;
           }
           break;
         case "left":
         case "right":
-          if (element.scrollWidth > element.clientWidth) {
+          if (canScrollX(element)) {
             return false;
           }
           break;
@@ -117,41 +131,45 @@ export function useDrawerGuards(args) {
       }
       switch (position) {
         case "bottom":
-          if (element.scrollHeight > element.clientHeight) {
+          if (canScrollY(element)) {
             if (element.scrollTop === 0 || canSnap.value) {
               if (toValue(absDirectionY) === "against") {
                 return element;
               }
             }
+            return void 0;
           }
           break;
         case "top":
-          if (element.scrollHeight > element.clientHeight) {
+          if (canScrollY(element)) {
             const maxScroll = element.scrollHeight - element.clientHeight;
             if (element.scrollTop === maxScroll || canSnap.value) {
               if (toValue(absDirectionY) === "against") {
                 return element;
               }
             }
+            return void 0;
           }
           break;
         case "right":
-          if (element.scrollWidth > element.clientWidth) {
+          if (canScrollX(element)) {
             if (element.scrollLeft === 0 || canSnap.value) {
               if (toValue(absDirectionX) === "against") {
                 return element;
               }
             }
+            return void 0;
           }
           break;
         case "left":
-          if (element.scrollWidth > element.clientWidth) {
+          if (canScrollX(element)) {
             const maxScroll = element.scrollWidth - element.clientWidth;
             if (element.scrollLeft === maxScroll || canSnap.value) {
               if (toValue(absDirectionX) === "against") {
                 return element;
               }
             }
+            return void 0;
           }
           break;
       }

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

@@ -2,8 +2,8 @@ import { type Ref, type MaybeRef } from 'vue';
 import type { DrawerDefaultOptions } from '../../types/index.js';
 interface UseDrawerProgressArgs {
     id: MaybeRef<string>;
-    elRef: Ref<HTMLElement | undefined>;
-    drawerRef: Ref<HTMLDivElement | undefined>;
+    elRef: Ref<HTMLElement | null>;
+    drawerRef: Ref<HTMLDivElement | null>;
     position: MaybeRef<DrawerDefaultOptions['position']>;
     overshoot: MaybeRef<number>;
 }

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

@@ -27,9 +27,9 @@ type InterpolateDraggedArgs = {
     easing?: (t: number) => number;
 };
 export declare function useDrawerSnap(args: UseDrawerSnapArgs): {
-    snappedY: Ref<number, number>;
-    snappedX: Ref<number, number>;
-    activeSnapPoint: Ref<DrawerSnapPoint | undefined, DrawerSnapPoint | undefined>;
+    snappedY: import("vue").ShallowRef<number, number>;
+    snappedX: import("vue").ShallowRef<number, number>;
+    activeSnapPoint: import("vue").ShallowRef<DrawerSnapPoint | undefined, DrawerSnapPoint | undefined>;
     snapTo: (args: SnapToArgs) => Promise<void>;
     findClosestSnapPoint: (args: FindClosestSnapPointArgs) => number | undefined;
     interpolateDragged: (args: InterpolateDraggedArgs) => void;

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

@@ -1,4 +1,9 @@
-import { ref, computed, toValue, nextTick } from "vue";
+import {
+  shallowRef,
+  computed,
+  toValue,
+  nextTick
+} from "vue";
 import { computedWithControl } from "@vueuse/core";
 import { mapValue, interpolate } from "@maas/vue-equipment/utils";
 import { useMagicEmitter } from "@maas/vue-equipment/plugins";
@@ -31,22 +36,19 @@ export function useDrawerSnap(args) {
     () => toValue(snapPoints),
     () => {
       const extended = toValue(preventDragClose) ? toValue(snapPoints) : [...toValue(snapPoints), 0];
-      const mapped = extended.reduce(
-        (acc, current) => {
-          const key = mapSnapPoint(current);
-          if (key || key === 0) {
-            acc[key] = current;
-          }
-          return acc;
-        },
-        {}
-      );
+      const mapped = extended.reduce((acc, current) => {
+        const key = mapSnapPoint(current);
+        if (key || key === 0) {
+          acc[key] = current;
+        }
+        return acc;
+      }, {});
       return mapped;
     }
   );
-  const snappedY = ref(0);
-  const snappedX = ref(0);
-  const activeSnapPoint = ref(void 0);
+  const snappedY = shallowRef(0);
+  const snappedX = shallowRef(0);
+  const activeSnapPoint = shallowRef(void 0);
   const drawerHeight = computed(() => {
     const rect = toValue(wrapperRect);
     if (rect === void 0) {

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

@@ -2,7 +2,7 @@ import { type Ref, type MaybeRef, type ComputedRef } from 'vue';
 import type { DrawerDefaultOptions } from '../../types/index.js';
 type UseDrawerWheelArgs = {
     id: MaybeRef<string>;
-    elRef: Ref<HTMLElement | undefined>;
+    elRef: Ref<HTMLElement | null>;
     position: MaybeRef<DrawerDefaultOptions['position']>;
     disabled: ComputedRef<boolean>;
 };

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

@@ -4,7 +4,7 @@ import {
   toRefs
 } from "vue";
 import { unrefElement } from "@vueuse/core";
-import WheelGestures from "wheel-gestures";
+import WheelGestures, {} from "wheel-gestures";
 import { useDrawerState } from "./useDrawerState.mjs";
 export function useDrawerWheel(args) {
   const { id, elRef, position, disabled } = args;

package/dist/plugins/MagicDrawer/src/composables/useMagicDrawer.mjs

@@ -1,5 +1,5 @@
 import { computed, toValue, toRefs } from "vue";
-import { useMagicEmitter } from "../../../MagicEmitter/index.mjs";
+import { useMagicEmitter } from "@maas/vue-equipment/plugins";
 import { useDrawerState } from "./private/useDrawerState.mjs";
 export function useMagicDrawer(id) {
   const { initializeState } = useDrawerState(toValue(id));

package/dist/plugins/MagicDrawer/src/types/index.mjs

@@ -0,0 +1 @@
+import {} from "focus-trap";

package/dist/plugins/MagicDrawer/src/utils/defaultOptions.mjs

@@ -14,8 +14,8 @@ const defaultOptions = {
     disabled: false
   },
   transition: {
-    content: "magic-drawer--content",
-    backdrop: "magic-drawer--backdrop"
+    content: "magic-drawer-content",
+    backdrop: "magic-drawer-backdrop"
   },
   threshold: {
     lock: 0,

package/dist/plugins/MagicEmitter/nuxt.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("@nuxt/schema").NuxtModule<import("@nuxt/schema").ModuleOptions, import("@nuxt/schema").ModuleOptions, false>;
+declare const _default: import("nuxt/schema").NuxtModule<import("nuxt/schema").ModuleOptions, import("nuxt/schema").ModuleOptions, false>;
 export default _default;