@studiometa/js-toolkit 2.4.1 → 2.4.2

package/Base/managers/ServicesManager.cjs

@@ -17,7 +17,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);
 var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -84,12 +87,16 @@ var ServicesManager = class extends import_AbstractManager.default {
     return this.disable.bind(this, service);
   }
   enableAll() {
-    return Object.keys(this.__services).map((serviceName) => this.enable(serviceName));
+    return Object.keys(this.__services).map(
+      (serviceName) => this.enable(serviceName)
+    );
   }
   disableAll() {
-    Object.keys(this.__services).forEach((serviceName) => {
-      this.disable(serviceName);
-    });
+    Object.keys(this.__services).forEach(
+      (serviceName) => {
+        this.disable(serviceName);
+      }
+    );
   }
   disable(service) {
     if (!this.__services[service]) {

package/Base/managers/ServicesManager.d.ts

@@ -79,7 +79,7 @@ export default class ServicesManager extends AbstractManager {
      */
     unregister(name: string): void;
 }
-export type Base = import('../index').default;
+export type Base = import("../index").default<any>;
 export type BaseConstructor = import('../index').BaseConstructor;
 export type ServiceInterface = import('../../services').ServiceInterface<any>;
 export type Services = typeof SERVICES_MAP & Record<string, () => ServiceInterface>;

package/Base/managers/ServicesManager.js

@@ -58,12 +58,16 @@ class ServicesManager extends AbstractManager {
     return this.disable.bind(this, service);
   }
   enableAll() {
-    return Object.keys(this.__services).map((serviceName) => this.enable(serviceName));
+    return Object.keys(this.__services).map(
+      (serviceName) => this.enable(serviceName)
+    );
   }
   disableAll() {
-    Object.keys(this.__services).forEach((serviceName) => {
-      this.disable(serviceName);
-    });
+    Object.keys(this.__services).forEach(
+      (serviceName) => {
+        this.disable(serviceName);
+      }
+    );
   }
   disable(service) {
     if (!this.__services[service]) {

package/Base/utils.cjs

@@ -52,7 +52,11 @@ function getEventTarget(instance, event, config) {
     return instance.$el;
   }
   if (import_utils.isDev) {
-    console.warn(`[${config.name}]`, `The "${event}" event is missing from the configuration and is not a native`, `event for the root element of type \`${instance.$el.constructor.name}\`.`);
+    console.warn(
+      `[${config.name}]`,
+      `The "${event}" event is missing from the configuration and is not a native`,
+      `event for the root element of type \`${instance.$el.constructor.name}\`.`
+    );
   }
   return instance;
 }

package/Base/utils.d.ts

@@ -36,5 +36,5 @@ export function eventIsNative(event: string, element: HTMLElement): boolean;
  * @param   {import('./index.js').BaseConfig} config
  * @returns {Base|Base['$el']}
  */
-export function getEventTarget(instance: Base, event: string, config: import('./index.js').BaseConfig): Base | Base['$el'];
-export type Base = import('./index.js').default;
+export function getEventTarget(instance: import("./index.js").default<any>, event: string, config: import('./index.js').BaseConfig): import("./index.js").default<any> | import("./index.js").default<any>['$el'];
+export type Base = import("./index.js").default<any>;

package/Base/utils.js

@@ -25,7 +25,11 @@ function getEventTarget(instance, event, config) {
     return instance.$el;
   }
   if (isDev) {
-    console.warn(`[${config.name}]`, `The "${event}" event is missing from the configuration and is not a native`, `event for the root element of type \`${instance.$el.constructor.name}\`.`);
+    console.warn(
+      `[${config.name}]`,
+      `The "${event}" event is missing from the configuration and is not a native`,
+      `event for the root element of type \`${instance.$el.constructor.name}\`.`
+    );
   }
   return instance;
 }

package/decorators/index.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/index.js

package/decorators/withBreakpointManager.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/withBreakpointManager.js

package/decorators/withBreakpointManager.d.ts

@@ -6,5 +6,5 @@
  * @returns {T}
  */
 export default function withBreakpointManager<T extends typeof import("../Base").default>(BaseClass: T, breakpoints: Array<[string, BaseConstructor]>): T;
-export type Base = import('../Base').default;
+export type Base = import("../Base").default<any>;
 export type BaseConstructor = import('../Base').BaseConstructor;

package/decorators/withBreakpointObserver.cjs

@@ -17,7 +17,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);
 var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -48,7 +51,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) {
@@ -76,7 +81,9 @@ function withBreakpointObserver(BaseClass) {
       const { name } = this.$options;
       if (!props().breakpoint) {
         if (import_utils.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/withBreakpointObserver.d.ts

@@ -6,7 +6,7 @@
  * @returns {T}
  */
 export default function withBreakpointObserver<T extends typeof import("../Base").default>(BaseClass: T): T;
-export type Base = import('../Base').default;
+export type Base = import("../Base").default<any>;
 export type BaseConstructor = import('../Base').BaseConstructor;
 export type WithBreakpointObserverOptions = {
     activeBreakpoints?: string;

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) {
@@ -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,7 +17,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);
 var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -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.d.ts

@@ -15,9 +15,7 @@
  * @returns {T}
  */
 export default function withDrag<T extends typeof import("../Base").default>(BaseClass: T, { target, ...options }?: DragDecoratorOptions): T;
-export type Base = import('../Base').default;
+export type Base = import("../Base").default<any>;
 export type BaseConstructor = import('../Base').BaseConstructor;
 export type DragServiceOptions = import('../services/drag').DragServiceOptions;
-export type DragDecoratorOptions = import("../services/drag.js").DragServiceOptions & {
-    target?: (this: import("../Base").default, Base: any) => HTMLElement;
-};
+export type DragDecoratorOptions = DragDecoratorOptions;

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,7 +17,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);
 var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);

package/decorators/withIntersectionObserver.cjs

@@ -35,12 +35,15 @@ 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
-      });
+      this.$observer = new IntersectionObserver(
+        (entries) => {
+          this.__callMethod("intersected", entries);
+        },
+        {
+          ...defaultOptions,
+          ...this.$options.intersectionObserver
+        }
+      );
       this.$on("mounted", () => {
         this.$observer.observe(this.$el);
       });

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

@@ -12,12 +12,15 @@ 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
-      });
+      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

@@ -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.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

@@ -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,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

@@ -17,7 +17,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);
 var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -33,6 +36,25 @@ 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) {
@@ -51,6 +73,10 @@ function withScrolledInView(BaseClass, options = {}) {
           x: 0,
           y: 0
         },
+        dampedCurrent: {
+          x: 0,
+          y: 0
+        },
         progress: {
           x: 0,
           y: 0
@@ -62,6 +88,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 +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", () => {
@@ -106,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() {
@@ -144,10 +174,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.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;
+    };
+};