@studiometa/js-toolkit 2.4.1 → 2.4.4-alpha.0

package/decorators/withBreakpointObserver.js

@@ -22,7 +22,9 @@ function hasBreakpointConfiguration(instance) {
 function testConflictingBreakpointConfiguration(instance) {
   const { activeBreakpoints, inactiveBreakpoints, name } = instance.$options;
   if (activeBreakpoints && inactiveBreakpoints) {
-    throw new Error(`[${name}] Incorrect configuration: the \`activeBreakpoints\` and \`inactiveBreakpoints\` are not compatible.`);
+    throw new Error(
+      `[${name}] Incorrect configuration: the \`activeBreakpoints\` and \`inactiveBreakpoints\` are not compatible.`
+    );
   }
 }
 function addToResize(key, instance) {
@@ -31,7 +33,7 @@ function addToResize(key, instance) {
   }
   const { add, has } = useResize();
   if (!has(key)) {
-    add(key, function onResize({ breakpoint }) {
+    add(key, ({ breakpoint }) => {
       const action = testBreakpoints(instance, breakpoint);
       if (action === "$destroy" && instance.$isMounted) {
         instance[action]();
@@ -50,7 +52,9 @@ function withBreakpointObserver(BaseClass) {
       const { name } = this.$options;
       if (!props().breakpoint) {
         if (isDev) {
-          throw new Error(`[${name}] The \`BreakpointObserver\` class requires breakpoints to be defined.`);
+          throw new Error(
+            `[${name}] The \`BreakpointObserver\` class requires breakpoints to be defined.`
+          );
         }
         return;
       }

package/decorators/withDrag.cjs

@@ -17,14 +17,17 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
 
-// packages/js-toolkit/decorators/withDrag.js
+// packages/js-toolkit/decorators/withDrag.ts
 var withDrag_exports = {};
 __export(withDrag_exports, {
   default: () => withDrag
@@ -37,7 +40,10 @@ function withDrag(BaseClass, { target = (instance) => instance.$el, ...options }
     constructor(el) {
       super(el);
       this.$on("mounted", () => {
-        this.$services.register("dragged", import_drag.default.bind(void 0, target.call(this, this), options));
+        this.$services.register(
+          "dragged",
+          import_drag.default.bind(void 0, target.call(this, this), options)
+        );
         this.$services.enable("dragged");
       });
       this.$on("destroyed", () => {

package/decorators/withDrag.js

@@ -11,7 +11,10 @@ function withDrag(BaseClass, { target = (instance) => instance.$el, ...options }
     constructor(el) {
       super(el);
       this.$on("mounted", () => {
-        this.$services.register("dragged", useDrag.bind(void 0, target.call(this, this), options));
+        this.$services.register(
+          "dragged",
+          useDrag.bind(void 0, target.call(this, this), options)
+        );
         this.$services.enable("dragged");
       });
       this.$on("destroyed", () => {

package/decorators/withExtraConfig.cjs

@@ -17,14 +17,17 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
 
-// packages/js-toolkit/decorators/withExtraConfig.js
+// packages/js-toolkit/decorators/withExtraConfig.ts
 var withExtraConfig_exports = {};
 __export(withExtraConfig_exports, {
   default: () => withExtraConfig

package/decorators/withFreezedOptions.cjs

@@ -21,24 +21,26 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 
-// packages/js-toolkit/decorators/withFreezedOptions.js
+// packages/js-toolkit/decorators/withFreezedOptions.ts
 var withFreezedOptions_exports = {};
 __export(withFreezedOptions_exports, {
   default: () => withFreezedOptions
 });
 module.exports = __toCommonJS(withFreezedOptions_exports);
 function withFreezedOptions(BaseClass) {
-  return class extends BaseClass {
+  return class WithFreezedOptions extends BaseClass {
     constructor() {
       super(...arguments);
       __publicField(this, "__freezedOptions");
     }
     get $options() {
-      Object.defineProperty(this, "__freezedOptions", {
-        value: Object.freeze({ ...super.$options }),
-        enumerable: false,
-        configurable: true
-      });
+      if (!this.__freezedOptions) {
+        Object.defineProperty(this, "__freezedOptions", {
+          value: Object.freeze({ ...super.$options }),
+          enumerable: false,
+          configurable: true
+        });
+      }
       return this.__freezedOptions;
     }
   };

package/decorators/withFreezedOptions.js

@@ -5,17 +5,19 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 function withFreezedOptions(BaseClass) {
-  return class extends BaseClass {
+  return class WithFreezedOptions extends BaseClass {
     constructor() {
       super(...arguments);
       __publicField(this, "__freezedOptions");
     }
     get $options() {
-      Object.defineProperty(this, "__freezedOptions", {
-        value: Object.freeze({ ...super.$options }),
-        enumerable: false,
-        configurable: true
-      });
+      if (!this.__freezedOptions) {
+        Object.defineProperty(this, "__freezedOptions", {
+          value: Object.freeze({ ...super.$options }),
+          enumerable: false,
+          configurable: true
+        });
+      }
       return this.__freezedOptions;
     }
   };

package/decorators/withIntersectionObserver.cjs

@@ -21,7 +21,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 
-// packages/js-toolkit/decorators/withIntersectionObserver.js
+// packages/js-toolkit/decorators/withIntersectionObserver.ts
 var withIntersectionObserver_exports = {};
 __export(withIntersectionObserver_exports, {
   default: () => withIntersectionObserver
@@ -35,12 +35,16 @@ function withIntersectionObserver(BaseClass, defaultOptions = { threshold: creat
   return _b = class extends BaseClass {
     constructor(element) {
       super(element);
-      this.$observer = new IntersectionObserver((entries) => {
-        this.__callMethod("intersected", entries);
-      }, {
-        ...defaultOptions,
-        ...this.$options.intersectionObserver
-      });
+      __publicField(this, "$observer");
+      this.$observer = new IntersectionObserver(
+        (entries) => {
+          this.__callMethod("intersected", entries);
+        },
+        {
+          ...defaultOptions,
+          ...this.$options.intersectionObserver
+        }
+      );
       this.$on("mounted", () => {
         this.$observer.observe(this.$el);
       });

package/decorators/withIntersectionObserver.js

@@ -12,12 +12,16 @@ function withIntersectionObserver(BaseClass, defaultOptions = { threshold: creat
   return _b = class extends BaseClass {
     constructor(element) {
       super(element);
-      this.$observer = new IntersectionObserver((entries) => {
-        this.__callMethod("intersected", entries);
-      }, {
-        ...defaultOptions,
-        ...this.$options.intersectionObserver
-      });
+      __publicField(this, "$observer");
+      this.$observer = new IntersectionObserver(
+        (entries) => {
+          this.__callMethod("intersected", entries);
+        },
+        {
+          ...defaultOptions,
+          ...this.$options.intersectionObserver
+        }
+      );
       this.$on("mounted", () => {
         this.$observer.observe(this.$el);
       });

package/decorators/withMountWhenInView.cjs

@@ -21,7 +21,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 
-// packages/js-toolkit/decorators/withMountWhenInView.js
+// packages/js-toolkit/decorators/withMountWhenInView.ts
 var withMountWhenInView_exports = {};
 __export(withMountWhenInView_exports, {
   default: () => withMountWhenInView
@@ -34,17 +34,20 @@ function withMountWhenInView(BaseClass, defaultOptions = { threshold: [0, 1] })
       super(element);
       __publicField(this, "__isVisible", false);
       __publicField(this, "__observer");
-      this.__observer = new IntersectionObserver((entries) => {
-        const isVisible = entries.reduce((acc, entry) => acc || entry.isIntersecting, false);
-        if (this.__isVisible !== isVisible) {
-          this.__isVisible = isVisible;
-          if (isVisible) {
-            this.$mount();
-          } else {
-            setTimeout(() => this.$destroy());
+      this.__observer = new IntersectionObserver(
+        (entries) => {
+          const isVisible = entries.reduce((acc, entry) => acc || entry.isIntersecting, false);
+          if (this.__isVisible !== isVisible) {
+            this.__isVisible = isVisible;
+            if (isVisible) {
+              this.$mount();
+            } else {
+              setTimeout(() => this.$destroy());
+            }
           }
-        }
-      }, { ...defaultOptions, ...this.$options.intersectionObserver });
+        },
+        { ...defaultOptions, ...this.$options.intersectionObserver }
+      );
       this.__observer.observe(this.$el);
       this.$on("terminated", () => {
         this.__observer.disconnect();

package/decorators/withMountWhenInView.js

@@ -11,17 +11,20 @@ function withMountWhenInView(BaseClass, defaultOptions = { threshold: [0, 1] })
       super(element);
       __publicField(this, "__isVisible", false);
       __publicField(this, "__observer");
-      this.__observer = new IntersectionObserver((entries) => {
-        const isVisible = entries.reduce((acc, entry) => acc || entry.isIntersecting, false);
-        if (this.__isVisible !== isVisible) {
-          this.__isVisible = isVisible;
-          if (isVisible) {
-            this.$mount();
-          } else {
-            setTimeout(() => this.$destroy());
+      this.__observer = new IntersectionObserver(
+        (entries) => {
+          const isVisible = entries.reduce((acc, entry) => acc || entry.isIntersecting, false);
+          if (this.__isVisible !== isVisible) {
+            this.__isVisible = isVisible;
+            if (isVisible) {
+              this.$mount();
+            } else {
+              setTimeout(() => this.$destroy());
+            }
           }
-        }
-      }, { ...defaultOptions, ...this.$options.intersectionObserver });
+        },
+        { ...defaultOptions, ...this.$options.intersectionObserver }
+      );
       this.__observer.observe(this.$el);
       this.$on("terminated", () => {
         this.__observer.disconnect();

package/decorators/withResponsiveOptions.cjs

@@ -16,10 +16,13 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// packages/js-toolkit/decorators/withResponsiveOptions.js
+// packages/js-toolkit/decorators/withResponsiveOptions.ts
 var withResponsiveOptions_exports = {};
 __export(withResponsiveOptions_exports, {
   default: () => withResponsiveOptions
@@ -27,7 +30,7 @@ __export(withResponsiveOptions_exports, {
 module.exports = __toCommonJS(withResponsiveOptions_exports);
 var import_ResponsiveOptionsManager = __toESM(require("../Base/managers/ResponsiveOptionsManager.cjs"), 1);
 function withResponsiveOptions(BaseClass) {
-  return class extends BaseClass {
+  return class WithResponsiveOptions extends BaseClass {
     get __managers() {
       return {
         ...super.__managers,

package/decorators/withResponsiveOptions.js

@@ -1,6 +1,6 @@
 import ResponsiveOptionsManager from "../Base/managers/ResponsiveOptionsManager.js";
 function withResponsiveOptions(BaseClass) {
-  return class extends BaseClass {
+  return class WithResponsiveOptions extends BaseClass {
     get __managers() {
       return {
         ...super.__managers,

package/decorators/withScrolledInView.cjs

@@ -17,14 +17,17 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
 
-// packages/js-toolkit/decorators/withScrolledInView.js
+// packages/js-toolkit/decorators/withScrolledInView.ts
 var withScrolledInView_exports = {};
 __export(withScrolledInView_exports, {
   default: () => withScrolledInView
@@ -33,9 +36,29 @@ module.exports = __toCommonJS(withScrolledInView_exports);
 var import_withMountWhenInView = __toESM(require("./withMountWhenInView.cjs"), 1);
 var import_utils = require("../utils/index.cjs");
 var scheduler = (0, import_utils.useScheduler)(["update", "render"]);
+function updateProps(props, dampFactor, dampPrecision, axis = "x") {
+  props.current[axis] = (0, import_utils.clamp)(
+    axis === "x" ? window.pageXOffset : window.pageYOffset,
+    props.start[axis],
+    props.end[axis]
+  );
+  props.dampedCurrent[axis] = (0, import_utils.damp)(
+    props.current[axis],
+    props.dampedCurrent[axis],
+    dampFactor,
+    dampPrecision
+  );
+  props.progress[axis] = (0, import_utils.clamp01)(
+    (props.current[axis] - props.start[axis]) / (props.end[axis] - props.start[axis])
+  );
+  props.dampedProgress[axis] = (0, import_utils.clamp01)(
+    (props.dampedCurrent[axis] - props.start[axis]) / (props.end[axis] - props.start[axis])
+  );
+}
 function withScrolledInView(BaseClass, options = {}) {
   var _a;
-  return _a = class extends (0, import_withMountWhenInView.default)(BaseClass, options) {
+  const WithMountWhenInView = (0, import_withMountWhenInView.default)(BaseClass, options);
+  return _a = class extends WithMountWhenInView {
     constructor(element) {
       super(element);
       __publicField(this, "__props", {
@@ -51,6 +74,10 @@ function withScrolledInView(BaseClass, options = {}) {
           x: 0,
           y: 0
         },
+        dampedCurrent: {
+          x: 0,
+          y: 0
+        },
         progress: {
           x: 0,
           y: 0
@@ -62,6 +89,16 @@ function withScrolledInView(BaseClass, options = {}) {
       });
       __publicField(this, "dampFactor", 0.1);
       __publicField(this, "dampPrecision", 1e-3);
+      const render = () => {
+        scheduler.update(() => {
+          const renderFn = this.__callMethod("scrolledInView", this.__props);
+          if ((0, import_utils.isFunction)(renderFn)) {
+            scheduler.render(() => {
+              renderFn(this.__props);
+            });
+          }
+        });
+      };
       const delegate = {
         handleEvent(event) {
           delegate[event.type](event.detail[0]);
@@ -75,23 +112,12 @@ function withScrolledInView(BaseClass, options = {}) {
           }
         },
         ticked: () => {
-          this.__props.current.x = (0, import_utils.clamp)(window.pageXOffset, this.__props.start.x, this.__props.end.x);
-          this.__props.progress.x = (0, import_utils.clamp01)((this.__props.current.x - this.__props.start.x) / (this.__props.end.x - this.__props.start.x));
-          this.__props.dampedProgress.x = (0, import_utils.damp)(this.__props.progress.x, this.__props.dampedProgress.x, this.dampFactor, this.dampPrecision);
-          this.__props.current.y = (0, import_utils.clamp)(window.pageYOffset, this.__props.start.y, this.__props.end.y);
-          this.__props.progress.y = (0, import_utils.clamp01)((this.__props.current.y - this.__props.start.y) / (this.__props.end.y - this.__props.start.y));
-          this.__props.dampedProgress.y = (0, import_utils.damp)(this.__props.progress.y, this.__props.dampedProgress.y, this.dampFactor, this.dampPrecision);
-          if (this.__props.dampedProgress.x === this.__props.progress.x && this.__props.dampedProgress.y === this.__props.progress.y) {
+          updateProps(this.__props, this.dampFactor, this.dampPrecision, "x");
+          updateProps(this.__props, this.dampFactor, this.dampPrecision, "y");
+          if (this.__props.dampedCurrent.x === this.__props.current.x && this.__props.dampedCurrent.y === this.__props.current.y) {
             this.$services.disable("ticked");
           }
-          scheduler.update(() => {
-            const renderFn = this.__callMethod("scrolledInView", this.__props);
-            if ((0, import_utils.isFunction)(renderFn)) {
-              scheduler.render(() => {
-                renderFn(this.__props);
-              });
-            }
-          });
+          render();
         }
       };
       this.$on("before-mounted", () => {
@@ -106,27 +132,37 @@ function withScrolledInView(BaseClass, options = {}) {
         this.$off("resized", delegate);
         this.$off("scrolled", delegate);
         this.$off("ticked", delegate);
+        this.__props.dampedCurrent.x = this.__props.current.x;
+        this.__props.dampedCurrent.y = this.__props.current.y;
+        this.__props.dampedProgress.x = this.__props.progress.x;
+        this.__props.dampedProgress.y = this.__props.progress.y;
+        render();
       });
     }
     mounted() {
-      if ((0, import_utils.isFunction)(super.mounted))
+      if ((0, import_utils.isFunction)(super.mounted)) {
         super.mounted();
+      }
     }
     resized(props) {
-      if ((0, import_utils.isFunction)(super.resized))
+      if ((0, import_utils.isFunction)(super.resized)) {
         super.resized(props);
+      }
     }
     scrolled(props) {
-      if ((0, import_utils.isFunction)(super.scrolled))
+      if ((0, import_utils.isFunction)(super.scrolled)) {
         super.scrolled(props);
+      }
     }
     ticked(props) {
-      if ((0, import_utils.isFunction)(super.ticked))
+      if ((0, import_utils.isFunction)(super.ticked)) {
         super.ticked(props);
+      }
     }
     destroyed() {
-      if ((0, import_utils.isFunction)(super.destroyed))
+      if ((0, import_utils.isFunction)(super.destroyed)) {
         super.destroyed();
+      }
     }
     __setProps() {
       const sizes = options.useOffsetSizes ? (0, import_utils.getOffsetSizes)(this.$el) : this.$el.getBoundingClientRect();
@@ -144,10 +180,26 @@ function withScrolledInView(BaseClass, options = {}) {
       this.__props.end.y = yEnd;
       this.__props.current.x = xCurrent;
       this.__props.current.y = yCurrent;
+      this.__props.dampedCurrent.x = (0, import_utils.damp)(
+        xCurrent,
+        this.__props.dampedCurrent.x,
+        this.dampFactor,
+        this.dampPrecision
+      );
+      this.__props.dampedCurrent.y = (0, import_utils.damp)(
+        yCurrent,
+        this.__props.dampedCurrent.y,
+        this.dampFactor,
+        this.dampPrecision
+      );
       this.__props.progress.x = xProgress;
       this.__props.progress.y = yProgress;
-      this.__props.dampedProgress.x = (0, import_utils.damp)(xProgress, this.__props.dampedProgress.x);
-      this.__props.dampedProgress.y = (0, import_utils.damp)(yProgress, this.__props.dampedProgress.y);
+      this.__props.dampedProgress.x = (0, import_utils.clamp01)(
+        (this.__props.dampedCurrent.x - xStart) / (xEnd - xStart)
+      );
+      this.__props.dampedProgress.y = (0, import_utils.clamp01)(
+        (this.__props.dampedCurrent.y - yStart) / (yEnd - yStart)
+      );
     }
   }, __publicField(_a, "config", {
     name: `${BaseClass.config.name}WithMountWhenInView`,

package/decorators/withScrolledInView.js

@@ -7,9 +7,29 @@ var __publicField = (obj, key, value) => {
 import withMountWhenInView from "./withMountWhenInView.js";
 import { damp, clamp, clamp01, getOffsetSizes, isFunction, useScheduler } from "../utils/index.js";
 const scheduler = useScheduler(["update", "render"]);
+function updateProps(props, dampFactor, dampPrecision, axis = "x") {
+  props.current[axis] = clamp(
+    axis === "x" ? window.pageXOffset : window.pageYOffset,
+    props.start[axis],
+    props.end[axis]
+  );
+  props.dampedCurrent[axis] = damp(
+    props.current[axis],
+    props.dampedCurrent[axis],
+    dampFactor,
+    dampPrecision
+  );
+  props.progress[axis] = clamp01(
+    (props.current[axis] - props.start[axis]) / (props.end[axis] - props.start[axis])
+  );
+  props.dampedProgress[axis] = clamp01(
+    (props.dampedCurrent[axis] - props.start[axis]) / (props.end[axis] - props.start[axis])
+  );
+}
 function withScrolledInView(BaseClass, options = {}) {
   var _a;
-  return _a = class extends withMountWhenInView(BaseClass, options) {
+  const WithMountWhenInView = withMountWhenInView(BaseClass, options);
+  return _a = class extends WithMountWhenInView {
     constructor(element) {
       super(element);
       __publicField(this, "__props", {
@@ -25,6 +45,10 @@ function withScrolledInView(BaseClass, options = {}) {
           x: 0,
           y: 0
         },
+        dampedCurrent: {
+          x: 0,
+          y: 0
+        },
         progress: {
           x: 0,
           y: 0
@@ -36,6 +60,16 @@ function withScrolledInView(BaseClass, options = {}) {
       });
       __publicField(this, "dampFactor", 0.1);
       __publicField(this, "dampPrecision", 1e-3);
+      const render = () => {
+        scheduler.update(() => {
+          const renderFn = this.__callMethod("scrolledInView", this.__props);
+          if (isFunction(renderFn)) {
+            scheduler.render(() => {
+              renderFn(this.__props);
+            });
+          }
+        });
+      };
       const delegate = {
         handleEvent(event) {
           delegate[event.type](event.detail[0]);
@@ -49,23 +83,12 @@ function withScrolledInView(BaseClass, options = {}) {
           }
         },
         ticked: () => {
-          this.__props.current.x = clamp(window.pageXOffset, this.__props.start.x, this.__props.end.x);
-          this.__props.progress.x = clamp01((this.__props.current.x - this.__props.start.x) / (this.__props.end.x - this.__props.start.x));
-          this.__props.dampedProgress.x = damp(this.__props.progress.x, this.__props.dampedProgress.x, this.dampFactor, this.dampPrecision);
-          this.__props.current.y = clamp(window.pageYOffset, this.__props.start.y, this.__props.end.y);
-          this.__props.progress.y = clamp01((this.__props.current.y - this.__props.start.y) / (this.__props.end.y - this.__props.start.y));
-          this.__props.dampedProgress.y = damp(this.__props.progress.y, this.__props.dampedProgress.y, this.dampFactor, this.dampPrecision);
-          if (this.__props.dampedProgress.x === this.__props.progress.x && this.__props.dampedProgress.y === this.__props.progress.y) {
+          updateProps(this.__props, this.dampFactor, this.dampPrecision, "x");
+          updateProps(this.__props, this.dampFactor, this.dampPrecision, "y");
+          if (this.__props.dampedCurrent.x === this.__props.current.x && this.__props.dampedCurrent.y === this.__props.current.y) {
             this.$services.disable("ticked");
           }
-          scheduler.update(() => {
-            const renderFn = this.__callMethod("scrolledInView", this.__props);
-            if (isFunction(renderFn)) {
-              scheduler.render(() => {
-                renderFn(this.__props);
-              });
-            }
-          });
+          render();
         }
       };
       this.$on("before-mounted", () => {
@@ -80,27 +103,37 @@ function withScrolledInView(BaseClass, options = {}) {
         this.$off("resized", delegate);
         this.$off("scrolled", delegate);
         this.$off("ticked", delegate);
+        this.__props.dampedCurrent.x = this.__props.current.x;
+        this.__props.dampedCurrent.y = this.__props.current.y;
+        this.__props.dampedProgress.x = this.__props.progress.x;
+        this.__props.dampedProgress.y = this.__props.progress.y;
+        render();
       });
     }
     mounted() {
-      if (isFunction(super.mounted))
+      if (isFunction(super.mounted)) {
         super.mounted();
+      }
     }
     resized(props) {
-      if (isFunction(super.resized))
+      if (isFunction(super.resized)) {
         super.resized(props);
+      }
     }
     scrolled(props) {
-      if (isFunction(super.scrolled))
+      if (isFunction(super.scrolled)) {
         super.scrolled(props);
+      }
     }
     ticked(props) {
-      if (isFunction(super.ticked))
+      if (isFunction(super.ticked)) {
         super.ticked(props);
+      }
     }
     destroyed() {
-      if (isFunction(super.destroyed))
+      if (isFunction(super.destroyed)) {
         super.destroyed();
+      }
     }
     __setProps() {
       const sizes = options.useOffsetSizes ? getOffsetSizes(this.$el) : this.$el.getBoundingClientRect();
@@ -118,10 +151,26 @@ function withScrolledInView(BaseClass, options = {}) {
       this.__props.end.y = yEnd;
       this.__props.current.x = xCurrent;
       this.__props.current.y = yCurrent;
+      this.__props.dampedCurrent.x = damp(
+        xCurrent,
+        this.__props.dampedCurrent.x,
+        this.dampFactor,
+        this.dampPrecision
+      );
+      this.__props.dampedCurrent.y = damp(
+        yCurrent,
+        this.__props.dampedCurrent.y,
+        this.dampFactor,
+        this.dampPrecision
+      );
       this.__props.progress.x = xProgress;
       this.__props.progress.y = yProgress;
-      this.__props.dampedProgress.x = damp(xProgress, this.__props.dampedProgress.x);
-      this.__props.dampedProgress.y = damp(yProgress, this.__props.dampedProgress.y);
+      this.__props.dampedProgress.x = clamp01(
+        (this.__props.dampedCurrent.x - xStart) / (xEnd - xStart)
+      );
+      this.__props.dampedProgress.y = clamp01(
+        (this.__props.dampedCurrent.y - yStart) / (yEnd - yStart)
+      );
     }
   }, __publicField(_a, "config", {
     name: `${BaseClass.config.name}WithMountWhenInView`,