@maas/vue-equipment 1.0.0-beta.2 → 1.0.0-beta.21

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

@@ -4,32 +4,104 @@ interface MagicDraggableProps {
     id: MaybeRef<string>;
     options?: MagicDraggableOptions;
 }
-declare function __VLS_template(): {
-    attrs: Partial<{}>;
-    slots: {
-        default?(_: {}): any;
+declare const mappedOptions: Omit<MagicDraggableOptions, keyof MagicDraggableOptions> & Omit<import("../types/index.js").DraggableDefaultOptions, keyof MagicDraggableOptions> & {
+    threshold: ({
+        lock?: number;
+        distance?: number;
+        momentum?: number;
+        idle?: number;
+    } & import("../../../../utils/index.js").RequireAll<{
+        lock?: number;
+        distance?: number;
+        momentum?: number;
+        idle?: number;
+    }>) | (Omit<{
+        lock?: number;
+        distance?: number;
+        momentum?: number;
+        idle?: number;
+    }, "lock" | "distance" | "momentum" | "idle"> & Omit<{
+        lock?: number;
+        distance?: number;
+        momentum?: number;
+        idle?: number;
+    } & import("../../../../utils/index.js").RequireAll<{
+        lock?: number;
+        distance?: number;
+        momentum?: number;
+        idle?: number;
+    }>, "lock" | "distance" | "momentum" | "idle"> & {
+        lock: number;
+        distance: number;
+        momentum: number;
+        idle: number;
+    });
+    disabled: boolean;
+    animation: ({
+        snap?: {
+            duration?: number;
+            easing?: (t: number) => number;
+        };
+    } & import("../../../../utils/index.js").RequireAll<{
+        snap?: {
+            duration?: number;
+            easing?: (t: number) => number;
+        };
+    }>) | (Omit<{
+        snap?: {
+            duration?: number;
+            easing?: (t: number) => number;
+        };
+    }, "snap"> & Omit<{
+        snap?: {
+            duration?: number;
+            easing?: (t: number) => number;
+        };
+    } & import("../../../../utils/index.js").RequireAll<{
+        snap?: {
+            duration?: number;
+            easing?: (t: number) => number;
+        };
+    }>, "snap"> & {
+        snap: {
+            duration?: number;
+            easing?: (t: number) => number;
+        };
+    });
+    tag: "div" | "dialog";
+    scrollLock: boolean | {
+        padding: boolean;
     };
-    refs: {
-        drawerRef: HTMLDivElement;
-        wrapperRef: HTMLDivElement;
-        elRef: unknown;
+    snapPoints: import("../types/index.js").DraggableSnapPoint[];
+    initial: {
+        snapPoint?: import("../types/index.js").DraggableSnapPoint;
     };
-    rootEl: any;
 };
-type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
-declare const __VLS_component: import("vue").DefineComponent<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<MagicDraggableProps>>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<MagicDraggableProps>>> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
+declare const mappedId: string;
+declare const dragging: import("vue").Ref<boolean, boolean>;
+declare const disabled: import("vue").ComputedRef<boolean>;
+declare const style: import("vue").ComputedRef<string>, hasDragged: import("vue").ComputedRef<boolean>;
+declare function guardedPointerdown(event: PointerEvent): void;
+declare function guardedClick(event: PointerEvent): void;
+declare const __VLS_ctx: InstanceType<__VLS_PickNotAny<typeof __VLS_self, new () => {}>>;
+declare var __VLS_12: {};
+type __VLS_Slots = __VLS_PrettifyGlobal<__VLS_OmitStringIndex<typeof __VLS_ctx.$slots> & {
+    default?: (props: typeof __VLS_12) => any;
+}>;
+declare const __VLS_self: import("vue").DefineComponent<MagicDraggableProps, {
+    mappedOptions: typeof mappedOptions;
+    mappedId: typeof mappedId;
+    dragging: typeof dragging;
+    disabled: typeof disabled;
+    style: typeof style;
+    hasDragged: typeof hasDragged;
+    guardedPointerdown: typeof guardedPointerdown;
+    guardedClick: typeof guardedClick;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicDraggableProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const __VLS_component: import("vue").DefineComponent<MagicDraggableProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicDraggableProps> & 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/MagicDraggable/src/composables/private/useDraggableDrag.d.ts

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

package/dist/plugins/MagicDraggable/src/composables/private/useDraggableDrag.mjs

@@ -1,5 +1,5 @@
 import {
-  ref,
+  shallowRef,
   computed,
   toValue,
   nextTick,
@@ -53,13 +53,14 @@ export function useDraggableDrag(args) {
     draggedX,
     draggedY,
     elRect,
-    wrapperRect
+    wrapperRect,
+    activeSnapPoint
   } = toRefs(state);
   let cancelPointerup = void 0;
   let cancelPointermove = void 0;
   let cancelTouchend = void 0;
-  const momentumThresholdReached = ref(false);
-  const distanceThresholdReached = ref(false);
+  const momentumThresholdReached = shallowRef(false);
+  const distanceThresholdReached = shallowRef(false);
   const style = computed(
     () => `transform: translate3d(${draggedX.value}px, ${draggedY.value}px, 0)`
   );
@@ -78,19 +79,15 @@ export function useDraggableDrag(args) {
   });
   const {
     snapTo,
-    activeSnapPoint,
+    mappedActiveSnapPoint,
     mapSnapPoint,
     mappedSnapPoints,
     snapPointsMap,
     interpolateDragged
   } = useDraggableSnap({
     id,
-    elRect,
-    wrapperRect,
     animation,
-    snapPoints,
-    draggedY,
-    draggedX
+    snapPoints
   });
   const emitter = useMagicEmitter();
   const {
@@ -99,10 +96,9 @@ export function useDraggableDrag(args) {
     addScrollLockPadding,
     removeScrollLockPadding
   } = useDraggableScrollLock();
-  async function getSizes() {
+  function getSizes() {
     elRect.value = unrefElement(elRef)?.getBoundingClientRect();
     wrapperRect.value = unrefElement(wrapperRef)?.getBoundingClientRect();
-    await nextTick();
   }
   function setDragged({ x, y }) {
     draggedX.value = x - originX.value;
@@ -126,33 +122,18 @@ export function useDraggableDrag(args) {
       });
     }
   }
-  function detectCollision() {
+  async function checkSizes() {
+    getSizes();
     const childRect = toValue(elRect);
     const parentRect = toValue(wrapperRect);
     if (!childRect || !parentRect) {
+      console.warn("MagicDraggable could not calculate sizing");
       return;
     }
     if (childRect.width > parentRect.width || childRect.height > parentRect.height) {
       console.warn("MagicDraggable is too small for its content");
       return;
     }
-    interpolateTo.value = { x: draggedX.value, y: draggedY.value };
-    if (childRect.top < parentRect.top) {
-      interpolateTo.value = { x: interpolateTo.value?.x, y: 0 };
-    } else if (childRect.bottom > parentRect.bottom) {
-      interpolateTo.value = {
-        x: interpolateTo.value?.x,
-        y: parentRect.height - childRect.height
-      };
-    }
-    if (childRect.left < parentRect.left) {
-      interpolateTo.value = { x: 0, y: interpolateTo.value?.y };
-    } else if (childRect.right > parentRect.right) {
-      interpolateTo.value = {
-        x: parentRect.width - childRect.width,
-        y: interpolateTo.value?.y
-      };
-    }
   }
   function vectorBetweenCoordinates(a, b) {
     const dx = b.x - a.x;
@@ -253,9 +234,18 @@ export function useDraggableDrag(args) {
     const draggedCoords = { x: draggedX.value, y: draggedY.value };
     const closestSnapPoint = mappedSnapPoints.value.reduce((a, b) => {
       return calculateDistance(a, draggedCoords) < calculateDistance(b, draggedCoords) ? a : b;
-    });
+    }, mappedSnapPoints.value[0]);
     return closestSnapPoint;
   }
+  function onIdle() {
+    interpolateTo.value = findClosestSnapPoint();
+    if (distanceThresholdReached.value && momentumThresholdReached.value) {
+      intermediateDraggedX.value = draggedX.value;
+      intermediateDraggedY.value = draggedY.value;
+      distanceThresholdReached.value = false;
+      momentumThresholdReached.value = false;
+    }
+  }
   function onPointerup(e) {
     if (!momentumThresholdReached.value && distanceThresholdReached.value) {
       interpolateTo.value = findClosestSnapPoint();
@@ -263,9 +253,7 @@ export function useDraggableDrag(args) {
     const { x, y } = interpolateTo.value || {};
     if (x !== void 0 && y !== void 0) {
       interpolateDragged({ x, y });
-    }
-    if (interpolateTo.value) {
-      const key = `x${interpolateTo.value.x}y${interpolateTo.value.y}`;
+      const key = `x${x}y${y}`;
       activeSnapPoint.value = snapPointsMap.value[key];
     }
     if (intermediateDraggedX.value === draggedX.value && intermediateDraggedY.value === draggedY.value) {
@@ -291,13 +279,11 @@ export function useDraggableDrag(args) {
     }
     guardedReleasePointerCapture({ event: e, element: elRef.value });
   }
-  function onPointermove(e) {
+  async function onPointermove(e) {
     if (!e.isPrimary) {
       return;
     }
     setDragged({ x: e.screenX, y: e.screenY });
-    getSizes();
-    detectCollision();
     if (!distanceThresholdReached.value) {
       checkDistance();
     }
@@ -305,50 +291,44 @@ export function useDraggableDrag(args) {
       checkMomentum();
     }
     if (!distanceThresholdReached.value && !momentumThresholdReached.value) {
-      interpolateTo.value = { x: lastDraggedX.value, y: lastDraggedY.value };
+      const { x, y } = mappedActiveSnapPoint.value ?? {};
+      if (x !== void 0 && y !== void 0) {
+        interpolateTo.value = { x, y };
+      }
       return;
     }
-    if (toValue(snapPoints).length) {
-      findSnapPointByVector();
-    }
+    findSnapPointByVector();
     emitter.emit("drag", {
       id: toValue(id),
       x: draggedX.value,
       y: draggedY.value
     });
   }
-  function onIdle() {
-    interpolateTo.value = findClosestSnapPoint();
-    if (distanceThresholdReached.value && momentumThresholdReached.value) {
-      intermediateDraggedX.value = draggedX.value;
-      intermediateDraggedY.value = draggedY.value;
-      distanceThresholdReached.value = false;
-      momentumThresholdReached.value = false;
-    }
-  }
   function onPointerdown(e) {
     const scrollLockValue = toValue(scrollLock);
     if (scrollLockValue) {
-      lockScroll();
       if (typeof scrollLockValue === "object" && scrollLockValue.padding) {
         addScrollLockPadding();
       }
+      lockScroll();
     }
     if (dragging.value) {
       return;
-    } else {
-      guardedSetPointerCapture({ event: e, element: elRef.value });
-      dragging.value = true;
-      emitter.emit("beforeDrag", {
-        id: toValue(id),
-        x: draggedX.value,
-        y: draggedY.value
-      });
     }
+    checkSizes();
+    guardedSetPointerCapture({ event: e, element: elRef.value });
+    dragging.value = true;
+    emitter.emit("beforeDrag", {
+      id: toValue(id),
+      x: draggedX.value,
+      y: draggedY.value
+    });
     intermediateDraggedX.value = draggedX.value;
     intermediateDraggedY.value = draggedY.value;
     lastDraggedX.value = draggedX.value;
     lastDraggedY.value = draggedY.value;
+    originX.value = e.screenX - draggedX.value;
+    originY.value = e.screenY - draggedY.value;
     cancelPointerup = useEventListener(document, "pointerup", onPointerup);
     cancelPointermove = useEventListener(
       document,
@@ -357,8 +337,6 @@ export function useDraggableDrag(args) {
       { passive: false }
     );
     cancelTouchend = isIOS() ? useEventListener(document, "touchend", onPointerup) : void 0;
-    originX.value = e.screenX - draggedX.value;
-    originY.value = e.screenY - draggedY.value;
     dragStart.value = /* @__PURE__ */ new Date();
     onPointermove(e);
   }
@@ -394,19 +372,21 @@ export function useDraggableDrag(args) {
   });
   useResizeObserver(wrapperRef, async () => {
     useThrottleFn(async () => {
-      await getSizes();
+      getSizes();
       if (activeSnapPoint.value) {
         await snapTo({ snapPoint: activeSnapPoint.value, interpolate: false });
         snapPointsMap.trigger();
+        mappedSnapPoints.trigger();
       }
     }, 100)();
   });
   useResizeObserver(elRef, async () => {
     useThrottleFn(async () => {
-      await getSizes();
+      getSizes();
       if (activeSnapPoint.value) {
         await snapTo({ snapPoint: activeSnapPoint.value, interpolate: false });
         snapPointsMap.trigger();
+        mappedSnapPoints.trigger();
       }
     }, 100)();
   });

package/dist/plugins/MagicDraggable/src/composables/private/useDraggableScrollLock.mjs

@@ -1,7 +1,11 @@
-import { ref } from "vue";
+import { shallowRef, ref } 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,
+  scrollbarWidth,
+  scrollbarGutterSupport
+} from "@maas/vue-equipment/utils";
+const scrollLock = typeof window !== "undefined" ? useScrollLock(document?.documentElement) : shallowRef(false);
 export function useDraggableScrollLock() {
   const positionFixedElements = ref([]);
   function lockScroll() {
@@ -13,24 +17,40 @@ export function useDraggableScrollLock() {
   function addScrollLockPadding() {
     if (typeof window === "undefined") return;
     const exclude = new RegExp(/magic-draggable/);
-    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 {
     lockScroll,

package/dist/plugins/MagicDraggable/src/composables/private/useDraggableSnap.d.ts

@@ -1,11 +1,7 @@
-import { type MaybeRef, type Ref } from 'vue';
+import { type MaybeRef } from 'vue';
 import type { DraggableSnapPoint, Coordinates, DraggableDefaultOptions } from '../../types/index.js';
 type UseDraggableSnapArgs = {
     id: MaybeRef<string>;
-    elRect: Ref<DOMRect | undefined>;
-    wrapperRect: Ref<DOMRect | undefined>;
-    draggedY: Ref<number>;
-    draggedX: Ref<number>;
     animation: MaybeRef<DraggableDefaultOptions['animation']>;
     snapPoints: MaybeRef<DraggableDefaultOptions['snapPoints']>;
 };
@@ -21,17 +17,8 @@ type SnapToArgs = {
     duration?: number;
 };
 export declare function useDraggableSnap(args: UseDraggableSnapArgs): {
+    mappedActiveSnapPoint: import("vue").ComputedRef<Coordinates | undefined>;
     mappedSnapPoints: import("@vueuse/core").ComputedRefWithControl<Coordinates[]>;
-    activeSnapPoint: Ref<("center" | "top-left" | "top-center" | "top-right" | "center-left" | "center-right" | "bottom-left" | "bottom-center" | "bottom-right") | ["center" | "top-left" | "top-center" | "top-right" | "center-left" | "center-right" | "bottom-left" | "bottom-center" | "bottom-right", offset?: {
-        x?: number | undefined;
-        y?: number | undefined;
-    } | undefined] | undefined, "center" | "top-left" | "top-center" | "top-right" | "center-left" | "center-right" | "bottom-left" | "bottom-center" | "bottom-right" | ["center" | "top-left" | "top-center" | "top-right" | "center-left" | "center-right" | "bottom-left" | "bottom-center" | "bottom-right", offset?: {
-        x?: number;
-        y?: number;
-    } | undefined] | ["center" | "top-left" | "top-center" | "top-right" | "center-left" | "center-right" | "bottom-left" | "bottom-center" | "bottom-right", offset?: {
-        x?: number | undefined;
-        y?: number | undefined;
-    } | undefined] | undefined>;
     snapPointsMap: import("@vueuse/core").ComputedRefWithControl<Record<string, DraggableSnapPoint>>;
     mapSnapPoint: (snapPoint: DraggableSnapPoint) => Coordinates | undefined;
     interpolateDragged: (args: InterpolateDraggedArgs) => void;