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

package/dist/plugins/MagicScroll/src/components/MagicScrollCollision.vue.d.ts

@@ -3,30 +3,14 @@ interface MagicScrollCollisionProps {
     id?: string;
     offset?: CollisionOffset;
 }
-declare function __VLS_template(): {
-    attrs: Partial<{}>;
-    slots: {
-        default?(_: {}): any;
-    };
-    refs: {
-        elRef: any;
-    };
-    rootEl: any;
+declare var __VLS_1: {};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_1) => any;
 };
-type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
-declare const __VLS_component: import("vue").DefineComponent<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<MagicScrollCollisionProps>>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<MagicScrollCollisionProps>>> & 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<MagicScrollCollisionProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicScrollCollisionProps> & 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/MagicScroll/src/components/MagicScrollMotion.vue

@@ -1,81 +1,66 @@
-<script>
-import { defineComponent as _defineComponent } from "vue";
-import { renderSlot as _renderSlot, openBlock as _openBlock, createElementBlock as _createElementBlock } from "vue";
-import { ref, inject, computed, onMounted, watch } from "vue";
+<template>
+  <div ref="el" class="magic-scroll-motion">
+    <slot />
+  </div>
+</template>
+
+<script setup>
+import { ref, inject, computed, onMounted, watch, useTemplateRef } from "vue";
 import { unrefElement } from "@vueuse/core";
 import defu from "defu";
 import {
   animate
 } from "motion";
 import { MagicScrollProgress } from "../symbols";
-export default /* @__PURE__ */ _defineComponent({
-  __name: "MagicScrollMotion",
-  props: {
-    sequence: { type: Array, required: true },
-    sequenceOptions: { type: Object, required: false },
-    progress: { type: Number, required: false }
+import {} from "../types";
+const { progress, sequence, sequenceOptions } = defineProps({
+  sequence: { type: Array, required: true },
+  sequenceOptions: { type: Object, required: false },
+  progress: { type: Number, required: false }
+});
+const animation = ref(void 0);
+const elRef = useTemplateRef("el");
+const injectedProgress = inject(
+  MagicScrollProgress,
+  computed(() => 0)
+);
+const mappedProgress = computed(() => {
+  return progress || injectedProgress.value || 0;
+});
+const defaultSequenceOptions = {
+  duration: 1,
+  delay: 0
+};
+const mappedSequenceOptions = defu(sequenceOptions, defaultSequenceOptions);
+function createAnimation() {
+  const el = unrefElement(elRef);
+  if (!sequence || !sequence.length || !el) {
+    return;
+  }
+  const mappedSequence = sequence.map((item) => {
+    const [animation2 = [], options = {}] = item;
+    return [el, animation2, options];
+  });
+  animation.value = animate(mappedSequence, mappedSequenceOptions);
+  animation.value.pause();
+  animation.value.time = mappedProgress.value;
+}
+watch(mappedProgress, (value) => {
+  if (!value && value !== 0 || !animation.value) {
+    return;
+  }
+  animation.value.time = value;
+});
+watch(
+  () => sequence,
+  () => {
+    createAnimation();
   },
-  setup(__props) {
-    const animation = ref(void 0);
-    const elRef = ref(void 0);
-    const injectedProgress = inject(
-      MagicScrollProgress,
-      computed(() => 0)
-    );
-    const mappedProgress = computed(() => {
-      return __props.progress || injectedProgress.value || 0;
-    });
-    const defaultSequenceOptions = {
-      duration: 1,
-      delay: 0
-    };
-    const mappedSequenceOptions = defu(__props.sequenceOptions, defaultSequenceOptions);
-    function createAnimation() {
-      const el = unrefElement(elRef);
-      if (!__props.sequence || !__props.sequence.length || !el) {
-        return;
-      }
-      const mappedSequence = __props.sequence.map((item) => {
-        const [animation2 = [], options = {}] = item;
-        return [el, animation2, options];
-      });
-      animation.value = animate(mappedSequence, mappedSequenceOptions);
-      animation.value.pause();
-      animation.value.time = mappedProgress.value;
-    }
-    watch(mappedProgress, (value) => {
-      if (!value && value !== 0 || !animation.value) {
-        return;
-      }
-      animation.value.time = value;
-    });
-    watch(
-      () => __props.sequence,
-      () => {
-        createAnimation();
-      },
-      {
-        deep: true
-      }
-    );
-    onMounted(() => {
-      createAnimation();
-    });
-    return (_ctx, _cache) => {
-      return _openBlock(), _createElementBlock(
-        "div",
-        {
-          ref_key: "elRef",
-          ref: elRef,
-          class: "magic-scroll-motion"
-        },
-        [
-          _renderSlot(_ctx.$slots, "default")
-        ],
-        512
-        /* NEED_PATCH */
-      );
-    };
+  {
+    deep: true
   }
+);
+onMounted(() => {
+  createAnimation();
 });
 </script>

package/dist/plugins/MagicScroll/src/components/MagicScrollMotion.vue.d.ts

@@ -5,30 +5,14 @@ interface MagicScrollMotionProps {
     sequenceOptions?: SequenceOptions;
     progress?: number;
 }
-declare function __VLS_template(): {
-    attrs: Partial<{}>;
-    slots: {
-        default?(_: {}): any;
-    };
-    refs: {
-        elRef: any;
-    };
-    rootEl: any;
+declare var __VLS_1: {};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_1) => any;
 };
-type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
-declare const __VLS_component: import("vue").DefineComponent<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<MagicScrollMotionProps>>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<MagicScrollMotionProps>>> & 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<MagicScrollMotionProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicScrollMotionProps> & 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/MagicScroll/src/components/MagicScrollProvider.vue

@@ -1,40 +1,33 @@
-<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 = { class: "magic-scroll-provider" };
+<template>
+  <div class="magic-scroll-provider">
+    <slot :scroll-return="scrollReturn" />
+  </div>
+</template>
+
+<script setup>
 import { provide, computed } from "vue";
 import { useScroll, unrefElement } from "@vueuse/core";
 import { MagicScrollReturn, MagicScrollTarget } from "../symbols";
-export default /* @__PURE__ */ _defineComponent({
-  __name: "MagicScrollProvider",
-  props: {
-    target: { type: null, required: false }
-  },
-  setup(__props) {
-    const mappedTarget = computed(() => {
-      switch (true) {
-        case !!__props.target:
-          return unrefElement(__props.target);
-        case typeof window !== "undefined":
-          return window;
-        default:
-          return void 0;
-      }
-    });
-    const providedTarget = computed(() => {
-      if (__props.target) {
-        return unrefElement(__props.target);
-      }
+const { target } = defineProps({
+  target: { type: null, required: false }
+});
+const mappedTarget = computed(() => {
+  switch (true) {
+    case !!target:
+      return unrefElement(target);
+    case typeof window !== "undefined":
+      return window;
+    default:
       return void 0;
-    });
-    const scrollReturn = useScroll(mappedTarget);
-    provide(MagicScrollReturn, scrollReturn);
-    provide(MagicScrollTarget, providedTarget);
-    return (_ctx, _cache) => {
-      return _openBlock(), _createElementBlock("div", _hoisted_1, [
-        _renderSlot(_ctx.$slots, "default", { scrollReturn: _unref(scrollReturn) })
-      ]);
-    };
   }
 });
+const providedTarget = computed(() => {
+  if (target) {
+    return unrefElement(target);
+  }
+  return void 0;
+});
+const scrollReturn = useScroll(mappedTarget);
+provide(MagicScrollReturn, scrollReturn);
+provide(MagicScrollTarget, providedTarget);
 </script>

package/dist/plugins/MagicScroll/src/components/MagicScrollProvider.vue.d.ts

@@ -2,30 +2,33 @@ import { type MaybeElementRef } from '@vueuse/core';
 interface MagicScrollProviderProps {
     target?: MaybeElementRef<HTMLElement>;
 }
-declare function __VLS_template(): {
-    attrs: Partial<{}>;
-    slots: {
-        default?(_: {
-            scrollReturn: any;
-        }): any;
+declare var __VLS_1: {
+    scrollReturn: {
+        x: import("vue").WritableComputedRef<number, number>;
+        y: import("vue").WritableComputedRef<number, number>;
+        isScrolling: import("vue").ShallowRef<boolean, boolean>;
+        arrivedState: {
+            left: boolean;
+            right: boolean;
+            top: boolean;
+            bottom: boolean;
+        };
+        directions: {
+            left: boolean;
+            right: boolean;
+            top: boolean;
+            bottom: boolean;
+        };
+        measure(): void;
     };
-    refs: {};
-    rootEl: any;
 };
-type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
-declare const __VLS_component: import("vue").DefineComponent<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<MagicScrollProviderProps>>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<MagicScrollProviderProps>>> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["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_Slots = {} & {
+    default?: (props: typeof __VLS_1) => any;
 };
-type __VLS_WithTemplateSlots<T, S> = T & {
+declare const __VLS_component: import("vue").DefineComponent<MagicScrollProviderProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicScrollProviderProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
     new (): {
         $slots: S;
     };

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

@@ -1,7 +1,19 @@
-<script>
-import { defineComponent as _defineComponent } from "vue";
-import { renderSlot as _renderSlot, openBlock as _openBlock, createElementBlock as _createElementBlock } from "vue";
-import { ref, provide, inject, watch, nextTick, readonly } from "vue";
+<template>
+  <div ref="el" class="magic-scroll-scene">
+    <slot :progress="progress" />
+  </div>
+</template>
+
+<script setup>
+import {
+  shallowRef,
+  provide,
+  inject,
+  watch,
+  nextTick,
+  readonly,
+  useTemplateRef
+} from "vue";
 import { useIntersectionObserver } from "@vueuse/core";
 import { useScrollApi } from "../composables/private/useScrollApi";
 import {
@@ -9,73 +21,53 @@ import {
   MagicScrollProgress,
   MagicScrollReturn
 } from "../symbols";
-export default /* @__PURE__ */ _defineComponent({
-  __name: "MagicScrollScene",
-  props: {
-    from: { type: String, required: false, default: "top-bottom" },
-    to: { type: String, required: false, default: "bottom-top" }
-  },
-  setup(__props) {
-    const scrollReturn = inject(MagicScrollReturn, void 0);
-    const scrollTarget = inject(MagicScrollTarget);
-    if (!scrollTarget) {
-      console.error("MagicScrollScene must be used within a MagicScrollProvider");
-    }
-    const progress = ref(0);
-    const intersecting = ref(false);
-    const elRef = ref(void 0);
-    const { getCalculations, getProgress } = useScrollApi({
-      child: elRef,
-      parent: scrollTarget,
-      from: __props.from,
-      to: __props.to
-    });
-    async function calculate() {
-      getCalculations();
-      await nextTick();
-      progress.value = getProgress();
+const { from = "top-bottom", to = "bottom-top" } = defineProps({
+  from: { type: String, required: false },
+  to: { type: String, required: false }
+});
+const scrollReturn = inject(MagicScrollReturn, void 0);
+const scrollTarget = inject(MagicScrollTarget, void 0);
+if (!scrollTarget) {
+  console.error("MagicScrollScene must be used within a MagicScrollProvider");
+}
+const progress = shallowRef(0);
+const intersecting = shallowRef(false);
+const elRef = useTemplateRef("el");
+const { getCalculations, getProgress } = useScrollApi({
+  child: elRef,
+  parent: scrollTarget,
+  from,
+  to
+});
+async function calculate() {
+  getCalculations();
+  await nextTick();
+  progress.value = getProgress();
+}
+watch(
+  () => scrollReturn?.y.value,
+  () => {
+    if (intersecting.value) {
+      calculate();
     }
-    watch(
-      () => scrollReturn?.y.value,
-      () => {
-        if (intersecting.value) {
-          calculate();
-        }
-      }
-    );
-    watch(
-      () => scrollReturn?.y.value,
-      () => {
-        calculate();
-      },
-      { once: true }
-    );
-    useIntersectionObserver(
-      elRef,
-      ([{ isIntersecting }]) => {
-        intersecting.value = isIntersecting;
-        if (isIntersecting) {
-          calculate();
-        }
-      },
-      { rootMargin: "150% 0px 150% 0px", immediate: true }
-    );
-    provide(MagicScrollProgress, readonly(progress));
-    return (_ctx, _cache) => {
-      return _openBlock(), _createElementBlock(
-        "div",
-        {
-          ref_key: "elRef",
-          ref: elRef,
-          class: "magic-scroll-scene"
-        },
-        [
-          _renderSlot(_ctx.$slots, "default", { progress: progress.value })
-        ],
-        512
-        /* NEED_PATCH */
-      );
-    };
   }
-});
+);
+watch(
+  () => scrollReturn?.y.value,
+  () => {
+    calculate();
+  },
+  { once: true }
+);
+useIntersectionObserver(
+  elRef,
+  ([{ isIntersecting }]) => {
+    intersecting.value = isIntersecting;
+    if (isIntersecting) {
+      calculate();
+    }
+  },
+  { rootMargin: "150% 0px 150% 0px", immediate: true }
+);
+provide(MagicScrollProgress, readonly(progress));
 </script>

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

@@ -3,32 +3,16 @@ interface MagicScrollSceneProps {
     from?: ScrollIntersection;
     to?: ScrollIntersection;
 }
-declare function __VLS_template(): {
-    attrs: Partial<{}>;
-    slots: {
-        default?(_: {
-            progress: any;
-        }): any;
-    };
-    refs: {
-        elRef: any;
-    };
-    rootEl: any;
+declare var __VLS_1: {
+    progress: number;
 };
-type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
-declare const __VLS_component: import("vue").DefineComponent<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<MagicScrollSceneProps>>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<MagicScrollSceneProps>>> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["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_Slots = {} & {
+    default?: (props: typeof __VLS_1) => any;
 };
-type __VLS_WithTemplateSlots<T, S> = T & {
+declare const __VLS_component: import("vue").DefineComponent<MagicScrollSceneProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicScrollSceneProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
     new (): {
         $slots: S;
     };

package/dist/plugins/MagicScroll/src/composables/private/useCollisionDetection.d.ts

@@ -2,8 +2,8 @@ import { type MaybeRef } from 'vue';
 import type { CollisionOffset } from '../../types/index.js';
 type UseCollisionDetectionArgs = {
     id: string;
-    child: MaybeRef<HTMLElement | undefined>;
-    parent: MaybeRef<HTMLElement | undefined>;
+    child: MaybeRef<HTMLElement | null>;
+    parent: MaybeRef<HTMLElement | null | undefined>;
     scrollY: MaybeRef<number>;
     offset?: CollisionOffset;
 };

package/dist/plugins/MagicScroll/src/composables/private/useCollisionDetection.mjs

@@ -1,5 +1,5 @@
-import { ref, reactive, computed, toValue } from "vue";
-import { useElementBounding } from "@vueuse/core";
+import { shallowRef, reactive, computed, toValue } from "vue";
+import { useElementBounding, useWindowSize } from "@vueuse/core";
 import { useMagicEmitter } from "@maas/vue-equipment/plugins";
 export function useCollisionDetection(args) {
   const { id, scrollY, child, parent, offset } = args;
@@ -25,11 +25,21 @@ export function useCollisionDetection(args) {
       }
     }
   });
+  const { width, height } = useWindowSize();
+  const windowBoundingRect = {
+    width,
+    height,
+    right: width,
+    bottom: height,
+    top: shallowRef(0),
+    left: shallowRef(0)
+  };
   const childBoundingRect = useElementBounding(child);
   const parentBoundingRect = useElementBounding(parent);
+  const mappedParentBoundingRect = toValue(parent) ? parentBoundingRect : windowBoundingRect;
   const mappedOffset = { top: 0, bottom: 0, ...offset };
-  const lastScrollY = ref(0);
-  const scrollDirection = ref();
+  const lastScrollY = shallowRef(0);
+  const scrollDirection = shallowRef();
   const oppositeScrollDirection = computed(
     () => scrollDirection.value === "up" ? "down" : "up"
   );
@@ -101,7 +111,7 @@ export function useCollisionDetection(args) {
     }
     const offset2 = mappedOffset[parentEdge];
     const mappedChildEdge = toValue(childBoundingRect[childEdge]);
-    const mappedParentEdge = toValue(parentBoundingRect[parentEdge]) + offset2;
+    const mappedParentEdge = toValue(mappedParentBoundingRect[parentEdge]) + offset2;
     if (direction === "down" && mappedChildEdge <= mappedParentEdge || direction === "up" && mappedChildEdge >= mappedParentEdge) {
       alerted[direction][childEdge][parentEdge] = true;
       useMagicEmitter().emit("collision", {
@@ -119,7 +129,7 @@ export function useCollisionDetection(args) {
     }
     const offset2 = mappedOffset[parentEdge];
     const mappedChildEdge = toValue(childBoundingRect[childEdge]);
-    const mappedParentEdge = toValue(parentBoundingRect[parentEdge]) + offset2;
+    const mappedParentEdge = toValue(mappedParentBoundingRect[parentEdge]) + offset2;
     if (direction === "down" && mappedChildEdge >= mappedParentEdge || direction === "up" && mappedChildEdge <= mappedParentEdge) {
       alerted[direction][childEdge][parentEdge] = false;
     }

package/dist/plugins/MagicScroll/src/composables/private/useScrollApi.d.ts

@@ -1,12 +1,12 @@
 import { type MaybeRef, type MaybeRefOrGetter } from 'vue';
 import type { ScrollIntersection } from '../../types/index.js';
-type UseScrollApiParams = {
+type UseScrollApiArgs = {
     child: MaybeRef<HTMLElement | null | undefined>;
     parent: MaybeRefOrGetter<HTMLElement | null | undefined>;
     from: ScrollIntersection;
     to: ScrollIntersection;
 };
-export declare function useScrollApi(params: UseScrollApiParams): {
+export declare function useScrollApi(args: UseScrollApiArgs): {
     getCalculations: () => void;
     getProgress: () => number;
 };