@maas/vue-equipment 0.9.7 → 0.9.9

package/dist/nuxt/module.json

@@ -1,5 +1,5 @@
 {
   "name": "@maas/vue-equipment",
   "configKey": "vueEquipment",
-  "version": "0.9.6"
+  "version": "0.9.8"
 }

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

@@ -39,6 +39,7 @@ const props = withDefaults(defineProps<Props>(), {
 const scrollPosition = inject(ScrollPositionKey, undefined)
 const scrollParent = inject(ScrollParentKey)
 
+const intersecting = ref()
 const sceneRef = ref<HTMLElement | undefined>(undefined)
 const progress = ref(0)
 
@@ -49,11 +50,10 @@ const { getCalculations, getProgress } = useScrollApi({
   to: props.to,
 })
 
-const calculate = () => {
+async function calculate() {
   getCalculations()
-  nextTick(() => {
-    progress.value = getProgress()
-  })
+  await nextTick()
+  progress.value = getProgress()
 }
 
 onMounted(() => {
@@ -69,15 +69,15 @@ watch(
   },
 )
 
-const intersecting = ref()
-
 useIntersectionObserver(
   toRaw(sceneRef),
   ([{ isIntersecting }]) => {
     intersecting.value = isIntersecting
-    calculate()
+    if (isIntersecting) {
+      calculate()
+    }
   },
-  { rootMargin: '150% 0px 150% 0px' },
+  { rootMargin: '150% 0px 150% 0px', threshold: 0.01 },
 )
 
 provide('mapValue', mapValue)

package/dist/plugins/MagicScroll/src/composables/useScrollApi.mjs

@@ -1,5 +1,5 @@
 import { ref, inject, toValue } from "vue";
-import { useElementBounding, useWindowSize } from "@vueuse/core";
+import { useWindowSize } from "@vueuse/core";
 import { ScrollPositionKey } from "../symbols/index.mjs";
 import { clampValue } from "@maas/vue-equipment/utils";
 export function useScrollApi(params) {
@@ -9,13 +9,13 @@ export function useScrollApi(params) {
   const parentRect = ref();
   const start = ref(0);
   const end = ref(0);
-  const splitLocation = (location) => {
+  function splitLocation(location) {
     return {
       child: location.match(/^[a-z]+/)[0],
       parent: location.match(/[a-z]+$/)[0]
     };
-  };
-  const getOffsetTop = (points) => {
+  }
+  function getOffsetTop(points) {
     let y = 0;
     if (!childRect.value)
       return y;
@@ -53,18 +53,18 @@ export function useScrollApi(params) {
         break;
     }
     return y;
-  };
-  const getCalculations = () => {
+  }
+  function getCalculations() {
     childRect.value = toValue(child)?.getBoundingClientRect();
-    parentRect.value = toValue(parent) ? useElementBounding(parent) : { ...useWindowSize(), top: 0 };
+    parentRect.value = toValue(parent) ? toValue(parent)?.getBoundingClientRect() : { ...useWindowSize(), top: 0 };
     start.value = getOffsetTop(splitLocation(from));
     end.value = getOffsetTop(splitLocation(to));
-  };
-  const getProgress = () => {
+  }
+  function getProgress() {
     const scrollY = toValue(scrollPosition?.y) || 0;
     const total = Math.abs(end.value - start.value);
     const current = scrollY - start.value;
     return clampValue(current / total, 0, 1);
-  };
+  }
   return { getCalculations, getProgress };
 }

package/package.json

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