@studiometa/js-toolkit 2.3.0 → 2.4.2

package/decorators/withIntersectionObserver.d.ts

@@ -11,7 +11,7 @@ export default function withIntersectionObserver<T extends typeof import("../Bas
         $observer: IntersectionObserver;
     };
 };
-export type Base = import('../Base').default;
+export type Base = import("../Base").default<any>;
 export type BaseConstructor = import('../Base').BaseConstructor;
 export type WithIntersectionObserverOptions = {
     intersectionObserver: any;

package/decorators/withIntersectionObserver.js

@@ -1,25 +1,26 @@
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 function createArrayOfNumber(length) {
   return [...new Array(length + 1)].map((val, index) => index / length);
 }
 function withIntersectionObserver(BaseClass, defaultOptions = { threshold: createArrayOfNumber(100) }) {
-  return class extends BaseClass {
-    static config = {
-      ...BaseClass.config,
-      name: `${BaseClass.config.name}WithIntersectionObserver`,
-      options: {
-        ...BaseClass.config?.options || {},
-        intersectionObserver: Object
-      },
-      emits: ["intersected"]
-    };
+  var _a, _b;
+  return _b = class extends BaseClass {
     constructor(element) {
       super(element);
-      this.$observer = new IntersectionObserver((entries) => {
-        this.__callMethod("intersected", entries);
-      }, {
-        ...defaultOptions,
-        ...this.$options.intersectionObserver
-      });
+      this.$observer = new IntersectionObserver(
+        (entries) => {
+          this.__callMethod("intersected", entries);
+        },
+        {
+          ...defaultOptions,
+          ...this.$options.intersectionObserver
+        }
+      );
       this.$on("mounted", () => {
         this.$observer.observe(this.$el);
       });
@@ -27,7 +28,15 @@ function withIntersectionObserver(BaseClass, defaultOptions = { threshold: creat
         this.$observer.unobserve(this.$el);
       });
     }
-  };
+  }, __publicField(_b, "config", {
+    ...BaseClass.config,
+    name: `${BaseClass.config.name}WithIntersectionObserver`,
+    options: {
+      ...((_a = BaseClass.config) == null ? void 0 : _a.options) || {},
+      intersectionObserver: Object
+    },
+    emits: ["intersected"]
+  }), _b;
 }
 export {
   withIntersectionObserver as default

package/decorators/withMountWhenInView.cjs

@@ -2,6 +2,7 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -15,6 +16,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 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/withMountWhenInView.js
 var withMountWhenInView_exports = {};
@@ -23,30 +28,26 @@ __export(withMountWhenInView_exports, {
 });
 module.exports = __toCommonJS(withMountWhenInView_exports);
 function withMountWhenInView(BaseClass, defaultOptions = { threshold: [0, 1] }) {
-  return class extends BaseClass {
-    static config = {
-      ...BaseClass.config,
-      name: `${BaseClass.config.name}WithMountWhenInView`,
-      options: {
-        ...BaseClass.config?.options || {},
-        intersectionObserver: Object
-      }
-    };
-    __isVisible = false;
-    __observer;
+  var _a, _b;
+  return _b = class extends BaseClass {
     constructor(element) {
       super(element);
-      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());
+      __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());
+            }
           }
-        }
-      }, { ...defaultOptions, ...this.$options.intersectionObserver });
+        },
+        { ...defaultOptions, ...this.$options.intersectionObserver }
+      );
       this.__observer.observe(this.$el);
       this.$on("terminated", () => {
         this.__observer.disconnect();
@@ -58,6 +59,13 @@ function withMountWhenInView(BaseClass, defaultOptions = { threshold: [0, 1] })
       }
       return this;
     }
-  };
+  }, __publicField(_b, "config", {
+    ...BaseClass.config,
+    name: `${BaseClass.config.name}WithMountWhenInView`,
+    options: {
+      ...((_a = BaseClass.config) == null ? void 0 : _a.options) || {},
+      intersectionObserver: Object
+    }
+  }), _b;
 }
 if (module.exports.default) module.exports = module.exports.default;

package/decorators/withMountWhenInView.d.ts

@@ -21,7 +21,7 @@
  * @returns {T}
  */
 export default function withMountWhenInView<T extends typeof import("../Base").default>(BaseClass: T, defaultOptions?: IntersectionObserverInit): T;
-export type Base = import('../Base').default;
+export type Base = import("../Base").default<any>;
 export type BaseOptions = import('../Base').BaseOptions;
 export type BaseConstructor = import('../Base').BaseConstructor;
 export type WithMountWhenInViewOptions = {

package/decorators/withMountWhenInView.js

@@ -1,28 +1,30 @@
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 function withMountWhenInView(BaseClass, defaultOptions = { threshold: [0, 1] }) {
-  return class extends BaseClass {
-    static config = {
-      ...BaseClass.config,
-      name: `${BaseClass.config.name}WithMountWhenInView`,
-      options: {
-        ...BaseClass.config?.options || {},
-        intersectionObserver: Object
-      }
-    };
-    __isVisible = false;
-    __observer;
+  var _a, _b;
+  return _b = class extends BaseClass {
     constructor(element) {
       super(element);
-      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());
+      __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());
+            }
           }
-        }
-      }, { ...defaultOptions, ...this.$options.intersectionObserver });
+        },
+        { ...defaultOptions, ...this.$options.intersectionObserver }
+      );
       this.__observer.observe(this.$el);
       this.$on("terminated", () => {
         this.__observer.disconnect();
@@ -34,7 +36,14 @@ function withMountWhenInView(BaseClass, defaultOptions = { threshold: [0, 1] })
       }
       return this;
     }
-  };
+  }, __publicField(_b, "config", {
+    ...BaseClass.config,
+    name: `${BaseClass.config.name}WithMountWhenInView`,
+    options: {
+      ...((_a = BaseClass.config) == null ? void 0 : _a.options) || {},
+      intersectionObserver: Object
+    }
+  }), _b;
 }
 export {
   withMountWhenInView as default

package/decorators/withResponsiveOptions.cjs

@@ -16,7 +16,10 @@ 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

package/decorators/withScrolledInView.cjs

@@ -4,6 +4,7 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -16,8 +17,15 @@ 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
 var withScrolledInView_exports = {};
@@ -28,38 +36,68 @@ 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 = {}) {
-  return class extends (0, import_withMountWhenInView.default)(BaseClass, options) {
-    static config = {
-      name: `${BaseClass.config.name}WithMountWhenInView`,
-      emits: ["scrolledInView"]
-    };
-    __props = {
-      start: {
-        x: 0,
-        y: 0
-      },
-      end: {
-        x: 0,
-        y: 0
-      },
-      current: {
-        x: 0,
-        y: 0
-      },
-      progress: {
-        x: 0,
-        y: 0
-      },
-      dampedProgress: {
-        x: 0,
-        y: 0
-      }
-    };
-    dampFactor = 0.1;
-    dampPrecision = 1e-3;
+  var _a;
+  return _a = class extends (0, import_withMountWhenInView.default)(BaseClass, options) {
     constructor(element) {
       super(element);
+      __publicField(this, "__props", {
+        start: {
+          x: 0,
+          y: 0
+        },
+        end: {
+          x: 0,
+          y: 0
+        },
+        current: {
+          x: 0,
+          y: 0
+        },
+        dampedCurrent: {
+          x: 0,
+          y: 0
+        },
+        progress: {
+          x: 0,
+          y: 0
+        },
+        dampedProgress: {
+          x: 0,
+          y: 0
+        }
+      });
+      __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]);
@@ -73,23 +111,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", () => {
@@ -104,6 +131,11 @@ 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() {
@@ -142,11 +174,30 @@ 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`,
+    emits: ["scrolledInView"]
+  }), _a;
 }
 if (module.exports.default) module.exports = module.exports.default;

package/decorators/withScrolledInView.d.ts

@@ -1,8 +1,3 @@
-/**
- * @typedef {import('../Base').default} Base
- * @typedef {import('../Base').BaseConstructor} BaseConstructor
- * @typedef {import('../Base').BaseConfig} BaseConfig
- */
 /**
  * Add scrolled in view capabilities to a component.
  *
@@ -14,6 +9,32 @@
 export default function withScrolledInView<T extends typeof import("../Base").default>(BaseClass: T, options?: IntersectionObserverInit & {
     useOffsetSizes?: boolean;
 }): T;
-export type Base = import('../Base').default;
+export type Base = import("../Base").default<any>;
 export type BaseConstructor = import('../Base').BaseConstructor;
 export type BaseConfig = import('../Base').BaseConfig;
+export type ScrollInViewProps = {
+    start: {
+        x: number;
+        y: number;
+    };
+    end: {
+        x: number;
+        y: number;
+    };
+    current: {
+        x: number;
+        y: number;
+    };
+    dampedCurrent: {
+        x: number;
+        y: number;
+    };
+    progress: {
+        x: number;
+        y: number;
+    };
+    dampedProgress: {
+        x: number;
+        y: number;
+    };
+};

package/decorators/withScrolledInView.js

@@ -1,38 +1,74 @@
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return 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 = {}) {
-  return class extends withMountWhenInView(BaseClass, options) {
-    static config = {
-      name: `${BaseClass.config.name}WithMountWhenInView`,
-      emits: ["scrolledInView"]
-    };
-    __props = {
-      start: {
-        x: 0,
-        y: 0
-      },
-      end: {
-        x: 0,
-        y: 0
-      },
-      current: {
-        x: 0,
-        y: 0
-      },
-      progress: {
-        x: 0,
-        y: 0
-      },
-      dampedProgress: {
-        x: 0,
-        y: 0
-      }
-    };
-    dampFactor = 0.1;
-    dampPrecision = 1e-3;
+  var _a;
+  return _a = class extends withMountWhenInView(BaseClass, options) {
     constructor(element) {
       super(element);
+      __publicField(this, "__props", {
+        start: {
+          x: 0,
+          y: 0
+        },
+        end: {
+          x: 0,
+          y: 0
+        },
+        current: {
+          x: 0,
+          y: 0
+        },
+        dampedCurrent: {
+          x: 0,
+          y: 0
+        },
+        progress: {
+          x: 0,
+          y: 0
+        },
+        dampedProgress: {
+          x: 0,
+          y: 0
+        }
+      });
+      __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]);
@@ -46,23 +82,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", () => {
@@ -77,6 +102,11 @@ 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() {
@@ -115,12 +145,31 @@ 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`,
+    emits: ["scrolledInView"]
+  }), _a;
 }
 export {
   withScrolledInView as default