@surdeddd/bottom-sheet 0.22.1 → 0.23.1

package/dist/qwik-lib/index.qwik.mjs

@@ -1502,13 +1502,14 @@ class AnimationRunner {
     });
     let stopped = false;
     let auxRaf = 0;
-    const start = performance.now();
     const lastIdx = samples.values.length - 1;
     const auxTick = () => {
       if (stopped) return;
-      const elapsed = performance.now() - start;
-      const idx = Math.min(Math.floor(elapsed / samples.stepMs), lastIdx);
-      applyAux(samples.values[idx]);
+      const at = Math.min((Number(anim.currentTime) || 0) / samples.stepMs, lastIdx);
+      const idx = Math.floor(at);
+      const from = samples.values[idx];
+      const to = samples.values[Math.min(idx + 1, lastIdx)];
+      applyAux(from + (to - from) * (at - idx));
       auxRaf = requestAnimationFrame(auxTick);
     };
     auxRaf = requestAnimationFrame(auxTick);
@@ -2747,7 +2748,11 @@ class BottomSheetCore {
       getSize: () => this.size,
       isDragging: () => this.isDraggingAny(),
       applyAux: (size) => this.applySize(size, true),
-      getTransformFor: (size) => this.transformTemplate(this.snaps.getMaxAxisSize() - size)
+      getTransformFor: (size) => {
+        const cap = this.snaps.getMaxAxisSize();
+        const shown = cap > 0 && !this.allowOvershoot ? Math.min(size, cap) : size;
+        return this.transformTemplate(cap - shown);
+      }
     }, resolved.animation);
     this.lifecycle = new LifecycleController({
       element: this.element,
@@ -4226,6 +4231,9 @@ function visualViewportFeature() {
   };
 }
 const INSET_VAR = "--bs-content-inset";
+const SIZE_VAR = "--bs-size";
+const CAP_VAR = "--bs-max-size";
+const LIFT_VAR = "--bs-footer-lift-max";
 const FIT_ATTR = "data-bs-fit-content";
 function contentFitFeature() {
   return {
@@ -4239,6 +4247,8 @@ function contentFitFeature() {
       let inset = 0;
       let unpaddedMax = -1;
       let top = 0;
+      let resting = false;
+      const put = (name, px) => sheet.style.setProperty(name, `${px}px`);
       const hiddenAt = (size) => sheet.dataset.mode === "bottom" ? Math.max(0, ctx.getMaxAxisSize() - size) : 0;
       const follow = (size) => {
         if (unpaddedMax < 0) {
@@ -4254,19 +4264,34 @@ function contentFitFeature() {
       const settle = () => {
         if (ctx.isDestroyed()) return;
         const size = ctx.getSize();
-        unpaddedMax = -1;
-        follow(size);
+        if (!resting) {
+          unpaddedMax = -1;
+          follow(size);
+        }
         inset = hiddenAt(size);
-        sheet.style.setProperty(INSET_VAR, `${inset}px`);
+        put(INSET_VAR, inset);
+        put(SIZE_VAR, size);
+        put(CAP_VAR, ctx.getMaxAxisSize());
+        if (!resting) {
+          resting = true;
+          sheet.setAttribute(FIT_ATTR, "rest");
+        }
         unpaddedMax = -1;
       };
+      const move = (size) => {
+        if (resting) {
+          resting = false;
+          sheet.setAttribute(FIT_ATTR, "moving");
+          put(LIFT_VAR, scroller.offsetHeight);
+        }
+        follow(size);
+      };
       const moving = () => ctx.isAnimating() || ctx.isDragging();
       const whenIdle = () => {
         if (!moving()) settle();
       };
-      sheet.setAttribute(FIT_ATTR, "");
       settle();
-      const offProgress = ctx.on("progress", (p) => moving() ? follow(p.size) : settle());
+      const offProgress = ctx.on("progress", (p) => moving() ? move(p.size) : settle());
       const offSnap = ctx.on("snap", settle);
       const observer = typeof ResizeObserver === "undefined" ? null : new ResizeObserver(whenIdle);
       observer?.observe(document.documentElement);
@@ -4277,7 +4302,13 @@ function contentFitFeature() {
         observer?.disconnect();
         window.removeEventListener("orientationchange", whenIdle);
         sheet.removeAttribute(FIT_ATTR);
-        sheet.style.removeProperty(INSET_VAR);
+        for (const name of [
+          INSET_VAR,
+          CAP_VAR,
+          LIFT_VAR
+        ]) {
+          sheet.style.removeProperty(name);
+        }
       };
     }
   };

package/dist/qwik.cjs

@@ -1490,13 +1490,17 @@ var AnimationRunner = class {
     });
     let stopped = false;
     let auxRaf = 0;
-    const start = performance.now();
     const lastIdx = samples.values.length - 1;
     const auxTick = () => {
       if (stopped) return;
-      const elapsed = performance.now() - start;
-      const idx = Math.min(Math.floor(elapsed / samples.stepMs), lastIdx);
-      applyAux(samples.values[idx]);
+      const at = Math.min(
+        (Number(anim.currentTime) || 0) / samples.stepMs,
+        lastIdx
+      );
+      const idx = Math.floor(at);
+      const from = samples.values[idx];
+      const to = samples.values[Math.min(idx + 1, lastIdx)];
+      applyAux(from + (to - from) * (at - idx));
       auxRaf = requestAnimationFrame(auxTick);
     };
     auxRaf = requestAnimationFrame(auxTick);
@@ -2708,7 +2712,11 @@ var BottomSheetCore = class {
         getSize: () => this.size,
         isDragging: () => this.isDraggingAny(),
         applyAux: (size) => this.applySize(size, true),
-        getTransformFor: (size) => this.transformTemplate(this.snaps.getMaxAxisSize() - size)
+        getTransformFor: (size) => {
+          const cap = this.snaps.getMaxAxisSize();
+          const shown = cap > 0 && !this.allowOvershoot ? Math.min(size, cap) : size;
+          return this.transformTemplate(cap - shown);
+        }
       },
       resolved.animation
     );
@@ -4240,6 +4248,9 @@ function visualViewportFeature() {
 
 // src/core/features/content-fit.ts
 var INSET_VAR = "--bs-content-inset";
+var SIZE_VAR = "--bs-size";
+var CAP_VAR = "--bs-max-size";
+var LIFT_VAR = "--bs-footer-lift-max";
 var FIT_ATTR = "data-bs-fit-content";
 function contentFitFeature() {
   return {
@@ -4253,6 +4264,8 @@ function contentFitFeature() {
       let inset = 0;
       let unpaddedMax = -1;
       let top = 0;
+      let resting = false;
+      const put = (name, px) => sheet.style.setProperty(name, `${px}px`);
       const hiddenAt = (size) => sheet.dataset.mode === "bottom" ? Math.max(0, ctx.getMaxAxisSize() - size) : 0;
       const follow = (size) => {
         if (unpaddedMax < 0) {
@@ -4268,21 +4281,36 @@ function contentFitFeature() {
       const settle = () => {
         if (ctx.isDestroyed()) return;
         const size = ctx.getSize();
-        unpaddedMax = -1;
-        follow(size);
+        if (!resting) {
+          unpaddedMax = -1;
+          follow(size);
+        }
         inset = hiddenAt(size);
-        sheet.style.setProperty(INSET_VAR, `${inset}px`);
+        put(INSET_VAR, inset);
+        put(SIZE_VAR, size);
+        put(CAP_VAR, ctx.getMaxAxisSize());
+        if (!resting) {
+          resting = true;
+          sheet.setAttribute(FIT_ATTR, "rest");
+        }
         unpaddedMax = -1;
       };
+      const move = (size) => {
+        if (resting) {
+          resting = false;
+          sheet.setAttribute(FIT_ATTR, "moving");
+          put(LIFT_VAR, scroller.offsetHeight);
+        }
+        follow(size);
+      };
       const moving = () => ctx.isAnimating() || ctx.isDragging();
       const whenIdle = () => {
         if (!moving()) settle();
       };
-      sheet.setAttribute(FIT_ATTR, "");
       settle();
       const offProgress = ctx.on(
         "progress",
-        (p) => moving() ? follow(p.size) : settle()
+        (p) => moving() ? move(p.size) : settle()
       );
       const offSnap = ctx.on("snap", settle);
       const observer = typeof ResizeObserver === "undefined" ? null : new ResizeObserver(whenIdle);
@@ -4294,7 +4322,9 @@ function contentFitFeature() {
         observer?.disconnect();
         window.removeEventListener("orientationchange", whenIdle);
         sheet.removeAttribute(FIT_ATTR);
-        sheet.style.removeProperty(INSET_VAR);
+        for (const name of [INSET_VAR, CAP_VAR, LIFT_VAR]) {
+          sheet.style.removeProperty(name);
+        }
       };
     }
   };

package/dist/qwik.js

@@ -1488,13 +1488,17 @@ var AnimationRunner = class {
     });
     let stopped = false;
     let auxRaf = 0;
-    const start = performance.now();
     const lastIdx = samples.values.length - 1;
     const auxTick = () => {
       if (stopped) return;
-      const elapsed = performance.now() - start;
-      const idx = Math.min(Math.floor(elapsed / samples.stepMs), lastIdx);
-      applyAux(samples.values[idx]);
+      const at = Math.min(
+        (Number(anim.currentTime) || 0) / samples.stepMs,
+        lastIdx
+      );
+      const idx = Math.floor(at);
+      const from = samples.values[idx];
+      const to = samples.values[Math.min(idx + 1, lastIdx)];
+      applyAux(from + (to - from) * (at - idx));
       auxRaf = requestAnimationFrame(auxTick);
     };
     auxRaf = requestAnimationFrame(auxTick);
@@ -2706,7 +2710,11 @@ var BottomSheetCore = class {
         getSize: () => this.size,
         isDragging: () => this.isDraggingAny(),
         applyAux: (size) => this.applySize(size, true),
-        getTransformFor: (size) => this.transformTemplate(this.snaps.getMaxAxisSize() - size)
+        getTransformFor: (size) => {
+          const cap = this.snaps.getMaxAxisSize();
+          const shown = cap > 0 && !this.allowOvershoot ? Math.min(size, cap) : size;
+          return this.transformTemplate(cap - shown);
+        }
       },
       resolved.animation
     );
@@ -4238,6 +4246,9 @@ function visualViewportFeature() {
 
 // src/core/features/content-fit.ts
 var INSET_VAR = "--bs-content-inset";
+var SIZE_VAR = "--bs-size";
+var CAP_VAR = "--bs-max-size";
+var LIFT_VAR = "--bs-footer-lift-max";
 var FIT_ATTR = "data-bs-fit-content";
 function contentFitFeature() {
   return {
@@ -4251,6 +4262,8 @@ function contentFitFeature() {
       let inset = 0;
       let unpaddedMax = -1;
       let top = 0;
+      let resting = false;
+      const put = (name, px) => sheet.style.setProperty(name, `${px}px`);
       const hiddenAt = (size) => sheet.dataset.mode === "bottom" ? Math.max(0, ctx.getMaxAxisSize() - size) : 0;
       const follow = (size) => {
         if (unpaddedMax < 0) {
@@ -4266,21 +4279,36 @@ function contentFitFeature() {
       const settle = () => {
         if (ctx.isDestroyed()) return;
         const size = ctx.getSize();
-        unpaddedMax = -1;
-        follow(size);
+        if (!resting) {
+          unpaddedMax = -1;
+          follow(size);
+        }
         inset = hiddenAt(size);
-        sheet.style.setProperty(INSET_VAR, `${inset}px`);
+        put(INSET_VAR, inset);
+        put(SIZE_VAR, size);
+        put(CAP_VAR, ctx.getMaxAxisSize());
+        if (!resting) {
+          resting = true;
+          sheet.setAttribute(FIT_ATTR, "rest");
+        }
         unpaddedMax = -1;
       };
+      const move = (size) => {
+        if (resting) {
+          resting = false;
+          sheet.setAttribute(FIT_ATTR, "moving");
+          put(LIFT_VAR, scroller.offsetHeight);
+        }
+        follow(size);
+      };
       const moving = () => ctx.isAnimating() || ctx.isDragging();
       const whenIdle = () => {
         if (!moving()) settle();
       };
-      sheet.setAttribute(FIT_ATTR, "");
       settle();
       const offProgress = ctx.on(
         "progress",
-        (p) => moving() ? follow(p.size) : settle()
+        (p) => moving() ? move(p.size) : settle()
       );
       const offSnap = ctx.on("snap", settle);
       const observer = typeof ResizeObserver === "undefined" ? null : new ResizeObserver(whenIdle);
@@ -4292,7 +4320,9 @@ function contentFitFeature() {
         observer?.disconnect();
         window.removeEventListener("orientationchange", whenIdle);
         sheet.removeAttribute(FIT_ATTR);
-        sheet.style.removeProperty(INSET_VAR);
+        for (const name of [INSET_VAR, CAP_VAR, LIFT_VAR]) {
+          sheet.style.removeProperty(name);
+        }
       };
     }
   };

package/dist/react.cjs

@@ -1497,13 +1497,17 @@ var AnimationRunner = class {
     });
     let stopped = false;
     let auxRaf = 0;
-    const start = performance.now();
     const lastIdx = samples.values.length - 1;
     const auxTick = () => {
       if (stopped) return;
-      const elapsed = performance.now() - start;
-      const idx = Math.min(Math.floor(elapsed / samples.stepMs), lastIdx);
-      applyAux(samples.values[idx]);
+      const at = Math.min(
+        (Number(anim.currentTime) || 0) / samples.stepMs,
+        lastIdx
+      );
+      const idx = Math.floor(at);
+      const from = samples.values[idx];
+      const to = samples.values[Math.min(idx + 1, lastIdx)];
+      applyAux(from + (to - from) * (at - idx));
       auxRaf = requestAnimationFrame(auxTick);
     };
     auxRaf = requestAnimationFrame(auxTick);
@@ -2715,7 +2719,11 @@ var BottomSheetCore = class {
         getSize: () => this.size,
         isDragging: () => this.isDraggingAny(),
         applyAux: (size) => this.applySize(size, true),
-        getTransformFor: (size) => this.transformTemplate(this.snaps.getMaxAxisSize() - size)
+        getTransformFor: (size) => {
+          const cap = this.snaps.getMaxAxisSize();
+          const shown = cap > 0 && !this.allowOvershoot ? Math.min(size, cap) : size;
+          return this.transformTemplate(cap - shown);
+        }
       },
       resolved.animation
     );
@@ -4247,6 +4255,9 @@ function visualViewportFeature() {
 
 // src/core/features/content-fit.ts
 var INSET_VAR = "--bs-content-inset";
+var SIZE_VAR = "--bs-size";
+var CAP_VAR = "--bs-max-size";
+var LIFT_VAR = "--bs-footer-lift-max";
 var FIT_ATTR = "data-bs-fit-content";
 function contentFitFeature() {
   return {
@@ -4260,6 +4271,8 @@ function contentFitFeature() {
       let inset = 0;
       let unpaddedMax = -1;
       let top = 0;
+      let resting = false;
+      const put = (name, px) => sheet.style.setProperty(name, `${px}px`);
       const hiddenAt = (size) => sheet.dataset.mode === "bottom" ? Math.max(0, ctx.getMaxAxisSize() - size) : 0;
       const follow = (size) => {
         if (unpaddedMax < 0) {
@@ -4275,21 +4288,36 @@ function contentFitFeature() {
       const settle = () => {
         if (ctx.isDestroyed()) return;
         const size = ctx.getSize();
-        unpaddedMax = -1;
-        follow(size);
+        if (!resting) {
+          unpaddedMax = -1;
+          follow(size);
+        }
         inset = hiddenAt(size);
-        sheet.style.setProperty(INSET_VAR, `${inset}px`);
+        put(INSET_VAR, inset);
+        put(SIZE_VAR, size);
+        put(CAP_VAR, ctx.getMaxAxisSize());
+        if (!resting) {
+          resting = true;
+          sheet.setAttribute(FIT_ATTR, "rest");
+        }
         unpaddedMax = -1;
       };
+      const move = (size) => {
+        if (resting) {
+          resting = false;
+          sheet.setAttribute(FIT_ATTR, "moving");
+          put(LIFT_VAR, scroller.offsetHeight);
+        }
+        follow(size);
+      };
       const moving = () => ctx.isAnimating() || ctx.isDragging();
       const whenIdle = () => {
         if (!moving()) settle();
       };
-      sheet.setAttribute(FIT_ATTR, "");
       settle();
       const offProgress = ctx.on(
         "progress",
-        (p) => moving() ? follow(p.size) : settle()
+        (p) => moving() ? move(p.size) : settle()
       );
       const offSnap = ctx.on("snap", settle);
       const observer = typeof ResizeObserver === "undefined" ? null : new ResizeObserver(whenIdle);
@@ -4301,7 +4329,9 @@ function contentFitFeature() {
         observer?.disconnect();
         window.removeEventListener("orientationchange", whenIdle);
         sheet.removeAttribute(FIT_ATTR);
-        sheet.style.removeProperty(INSET_VAR);
+        for (const name of [INSET_VAR, CAP_VAR, LIFT_VAR]) {
+          sheet.style.removeProperty(name);
+        }
       };
     }
   };

package/dist/react.js

@@ -1495,13 +1495,17 @@ var AnimationRunner = class {
     });
     let stopped = false;
     let auxRaf = 0;
-    const start = performance.now();
     const lastIdx = samples.values.length - 1;
     const auxTick = () => {
       if (stopped) return;
-      const elapsed = performance.now() - start;
-      const idx = Math.min(Math.floor(elapsed / samples.stepMs), lastIdx);
-      applyAux(samples.values[idx]);
+      const at = Math.min(
+        (Number(anim.currentTime) || 0) / samples.stepMs,
+        lastIdx
+      );
+      const idx = Math.floor(at);
+      const from = samples.values[idx];
+      const to = samples.values[Math.min(idx + 1, lastIdx)];
+      applyAux(from + (to - from) * (at - idx));
       auxRaf = requestAnimationFrame(auxTick);
     };
     auxRaf = requestAnimationFrame(auxTick);
@@ -2713,7 +2717,11 @@ var BottomSheetCore = class {
         getSize: () => this.size,
         isDragging: () => this.isDraggingAny(),
         applyAux: (size) => this.applySize(size, true),
-        getTransformFor: (size) => this.transformTemplate(this.snaps.getMaxAxisSize() - size)
+        getTransformFor: (size) => {
+          const cap = this.snaps.getMaxAxisSize();
+          const shown = cap > 0 && !this.allowOvershoot ? Math.min(size, cap) : size;
+          return this.transformTemplate(cap - shown);
+        }
       },
       resolved.animation
     );
@@ -4245,6 +4253,9 @@ function visualViewportFeature() {
 
 // src/core/features/content-fit.ts
 var INSET_VAR = "--bs-content-inset";
+var SIZE_VAR = "--bs-size";
+var CAP_VAR = "--bs-max-size";
+var LIFT_VAR = "--bs-footer-lift-max";
 var FIT_ATTR = "data-bs-fit-content";
 function contentFitFeature() {
   return {
@@ -4258,6 +4269,8 @@ function contentFitFeature() {
       let inset = 0;
       let unpaddedMax = -1;
       let top = 0;
+      let resting = false;
+      const put = (name, px) => sheet.style.setProperty(name, `${px}px`);
       const hiddenAt = (size) => sheet.dataset.mode === "bottom" ? Math.max(0, ctx.getMaxAxisSize() - size) : 0;
       const follow = (size) => {
         if (unpaddedMax < 0) {
@@ -4273,21 +4286,36 @@ function contentFitFeature() {
       const settle = () => {
         if (ctx.isDestroyed()) return;
         const size = ctx.getSize();
-        unpaddedMax = -1;
-        follow(size);
+        if (!resting) {
+          unpaddedMax = -1;
+          follow(size);
+        }
         inset = hiddenAt(size);
-        sheet.style.setProperty(INSET_VAR, `${inset}px`);
+        put(INSET_VAR, inset);
+        put(SIZE_VAR, size);
+        put(CAP_VAR, ctx.getMaxAxisSize());
+        if (!resting) {
+          resting = true;
+          sheet.setAttribute(FIT_ATTR, "rest");
+        }
         unpaddedMax = -1;
       };
+      const move = (size) => {
+        if (resting) {
+          resting = false;
+          sheet.setAttribute(FIT_ATTR, "moving");
+          put(LIFT_VAR, scroller.offsetHeight);
+        }
+        follow(size);
+      };
       const moving = () => ctx.isAnimating() || ctx.isDragging();
       const whenIdle = () => {
         if (!moving()) settle();
       };
-      sheet.setAttribute(FIT_ATTR, "");
       settle();
       const offProgress = ctx.on(
         "progress",
-        (p) => moving() ? follow(p.size) : settle()
+        (p) => moving() ? move(p.size) : settle()
       );
       const offSnap = ctx.on("snap", settle);
       const observer = typeof ResizeObserver === "undefined" ? null : new ResizeObserver(whenIdle);
@@ -4299,7 +4327,9 @@ function contentFitFeature() {
         observer?.disconnect();
         window.removeEventListener("orientationchange", whenIdle);
         sheet.removeAttribute(FIT_ATTR);
-        sheet.style.removeProperty(INSET_VAR);
+        for (const name of [INSET_VAR, CAP_VAR, LIFT_VAR]) {
+          sheet.style.removeProperty(name);
+        }
       };
     }
   };

package/dist/solid.cjs

@@ -1490,13 +1490,17 @@ var AnimationRunner = class {
     });
     let stopped = false;
     let auxRaf = 0;
-    const start = performance.now();
     const lastIdx = samples.values.length - 1;
     const auxTick = () => {
       if (stopped) return;
-      const elapsed = performance.now() - start;
-      const idx = Math.min(Math.floor(elapsed / samples.stepMs), lastIdx);
-      applyAux(samples.values[idx]);
+      const at = Math.min(
+        (Number(anim.currentTime) || 0) / samples.stepMs,
+        lastIdx
+      );
+      const idx = Math.floor(at);
+      const from = samples.values[idx];
+      const to = samples.values[Math.min(idx + 1, lastIdx)];
+      applyAux(from + (to - from) * (at - idx));
       auxRaf = requestAnimationFrame(auxTick);
     };
     auxRaf = requestAnimationFrame(auxTick);
@@ -2708,7 +2712,11 @@ var BottomSheetCore = class {
         getSize: () => this.size,
         isDragging: () => this.isDraggingAny(),
         applyAux: (size) => this.applySize(size, true),
-        getTransformFor: (size) => this.transformTemplate(this.snaps.getMaxAxisSize() - size)
+        getTransformFor: (size) => {
+          const cap = this.snaps.getMaxAxisSize();
+          const shown = cap > 0 && !this.allowOvershoot ? Math.min(size, cap) : size;
+          return this.transformTemplate(cap - shown);
+        }
       },
       resolved.animation
     );
@@ -4240,6 +4248,9 @@ function visualViewportFeature() {
 
 // src/core/features/content-fit.ts
 var INSET_VAR = "--bs-content-inset";
+var SIZE_VAR = "--bs-size";
+var CAP_VAR = "--bs-max-size";
+var LIFT_VAR = "--bs-footer-lift-max";
 var FIT_ATTR = "data-bs-fit-content";
 function contentFitFeature() {
   return {
@@ -4253,6 +4264,8 @@ function contentFitFeature() {
       let inset = 0;
       let unpaddedMax = -1;
       let top = 0;
+      let resting = false;
+      const put = (name, px) => sheet.style.setProperty(name, `${px}px`);
       const hiddenAt = (size) => sheet.dataset.mode === "bottom" ? Math.max(0, ctx.getMaxAxisSize() - size) : 0;
       const follow = (size) => {
         if (unpaddedMax < 0) {
@@ -4268,21 +4281,36 @@ function contentFitFeature() {
       const settle = () => {
         if (ctx.isDestroyed()) return;
         const size = ctx.getSize();
-        unpaddedMax = -1;
-        follow(size);
+        if (!resting) {
+          unpaddedMax = -1;
+          follow(size);
+        }
         inset = hiddenAt(size);
-        sheet.style.setProperty(INSET_VAR, `${inset}px`);
+        put(INSET_VAR, inset);
+        put(SIZE_VAR, size);
+        put(CAP_VAR, ctx.getMaxAxisSize());
+        if (!resting) {
+          resting = true;
+          sheet.setAttribute(FIT_ATTR, "rest");
+        }
         unpaddedMax = -1;
       };
+      const move = (size) => {
+        if (resting) {
+          resting = false;
+          sheet.setAttribute(FIT_ATTR, "moving");
+          put(LIFT_VAR, scroller.offsetHeight);
+        }
+        follow(size);
+      };
       const moving = () => ctx.isAnimating() || ctx.isDragging();
       const whenIdle = () => {
         if (!moving()) settle();
       };
-      sheet.setAttribute(FIT_ATTR, "");
       settle();
       const offProgress = ctx.on(
         "progress",
-        (p) => moving() ? follow(p.size) : settle()
+        (p) => moving() ? move(p.size) : settle()
       );
       const offSnap = ctx.on("snap", settle);
       const observer = typeof ResizeObserver === "undefined" ? null : new ResizeObserver(whenIdle);
@@ -4294,7 +4322,9 @@ function contentFitFeature() {
         observer?.disconnect();
         window.removeEventListener("orientationchange", whenIdle);
         sheet.removeAttribute(FIT_ATTR);
-        sheet.style.removeProperty(INSET_VAR);
+        for (const name of [INSET_VAR, CAP_VAR, LIFT_VAR]) {
+          sheet.style.removeProperty(name);
+        }
       };
     }
   };