@surdeddd/bottom-sheet 0.20.2 → 0.21.1

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

@@ -783,7 +783,6 @@ class ScrimController {
     __publicField(this, "backdrop");
     __publicField(this, "mode");
     __publicField(this, "isDestroyed");
-    __publicField(this, "isTopSheet");
     __publicField(this, "getAllowedIds");
     __publicField(this, "getResolvedSnaps");
     __publicField(this, "snapToFn");
@@ -805,7 +804,6 @@ class ScrimController {
     this.backdrop = deps.backdrop;
     this.mode = deps.mode;
     this.isDestroyed = deps.isDestroyed;
-    this.isTopSheet = deps.isTopSheet;
     this.getAllowedIds = deps.getAllowedIds;
     this.getResolvedSnaps = deps.getResolvedSnaps;
     this.snapToFn = deps.snapTo;
@@ -857,15 +855,13 @@ class ScrimController {
       const [s, e] = this.backdropRange;
       const range = Math.max(e - s, RANGE_DIVISION_EPSILON);
       const backdropOpacity = Math.min(Math.max((progress - s) / range, 0), 1);
-      if (this.isTopSheet() || backdropOpacity === 0) {
-        if (this.backdropOpacitySentinel.shouldWrite(backdropOpacity, OPACITY_WRITE_EPSILON)) {
-          this.backdrop.style.opacity = String(backdropOpacity);
-        }
-        const nextPointer = backdropOpacity > POINTER_EVENTS_OPACITY_THRESHOLD ? "auto" : "none";
-        if (nextPointer !== this.lastBackdropPointer) {
-          this.backdrop.style.pointerEvents = nextPointer;
-          this.lastBackdropPointer = nextPointer;
-        }
+      if (this.backdropOpacitySentinel.shouldWrite(backdropOpacity, OPACITY_WRITE_EPSILON)) {
+        this.backdrop.style.opacity = String(backdropOpacity);
+      }
+      const nextPointer = backdropOpacity > POINTER_EVENTS_OPACITY_THRESHOLD ? "auto" : "none";
+      if (nextPointer !== this.lastBackdropPointer) {
+        this.backdrop.style.pointerEvents = nextPointer;
+        this.lastBackdropPointer = nextPointer;
       }
     }
     if (this.screenComponent && this.scrimMode !== "off") {
@@ -1410,18 +1406,20 @@ class AnimationRunner {
   get isAnimating() {
     return this.currentTween !== null || this.currentSpring !== null || this.currentWaapi !== null;
   }
+  cancelWaapi() {
+    if (!this.currentWaapi) return;
+    const entry = this.currentWaapi;
+    this.currentWaapi = null;
+    entry.stop();
+    try {
+      entry.anim.cancel();
+    } catch {
+    }
+  }
   cancel() {
     this.currentTween?.cancel();
     this.currentSpring?.cancel();
-    if (this.currentWaapi) {
-      const entry = this.currentWaapi;
-      this.currentWaapi = null;
-      entry.stop();
-      try {
-        entry.anim.cancel();
-      } catch {
-      }
-    }
+    this.cancelWaapi();
   }
   async animateTo(target, velocityPxPerMs) {
     if (target === this.getSize()) {
@@ -1432,6 +1430,7 @@ class AnimationRunner {
     }
     this.currentTween?.cancel();
     this.currentSpring?.cancel();
+    this.cancelWaapi();
     this.getRootEl()?.setAttribute("data-animating", "true");
     this.element.style.willChange = "transform";
     if (this.reducedMotion) {
@@ -2662,6 +2661,7 @@ class BottomSheetCore {
     __publicField(this, "progressWriteSentinel", new WriteSentinel());
     __publicField(this, "isTopSheet", true);
     __publicField(this, "opening", false);
+    __publicField(this, "promotedForOpen", false);
     __publicField(this, "allowOvershoot", false);
     __publicField(this, "progressPayload", {
       value: 0,
@@ -2718,7 +2718,6 @@ class BottomSheetCore {
       screenComponent: this.screenComponent,
       backdrop: this.backdrop,
       isDestroyed: () => this.destroyed,
-      isTopSheet: () => this.isTopSheet,
       getAllowedIds: () => this.snaps.getAllowedIds().slice(),
       getResolvedSnaps: () => this.snaps.getResolvedSnaps().slice(),
       snapTo: (id) => {
@@ -2966,6 +2965,7 @@ class BottomSheetCore {
     if (!_skipBeforeSnap && this.emitBeforeSnap(target, this.activeId)) {
       return;
     }
+    const resumingOpen = this.opening;
     const signal = this.newCycle();
     const onExternalAbort = () => {
       this.animation.cancel();
@@ -2974,7 +2974,7 @@ class BottomSheetCore {
     externalSignal?.addEventListener("abort", onExternalAbort, {
       once: true
     });
-    const wasClosed = this.size === 0;
+    const wasClosed = this.size === 0 || resumingOpen;
     const previousId = this.activeId;
     const previousSize = this.size;
     this.scrollCache.cache(previousId, previousSize, target.size);
@@ -2983,7 +2983,10 @@ class BottomSheetCore {
     const opensToRest = id === "closed" || rawTargetSize === 0;
     if (wasClosed && !opensToRest) {
       this.opening = true;
-      sheetStack.promote(this.id);
+      if (!resumingOpen) {
+        this.promotedForOpen = true;
+        sheetStack.promote(this.id);
+      }
     }
     if (this.animation.viewTransitionsAvailable) {
       this.currentViewTransition?.skipTransition?.();
@@ -3663,6 +3666,7 @@ class BottomSheetCore {
     this.activeId = target.id;
     if (previousSnapSize === 0 && target.size > 0) {
       this.opening = true;
+      this.promotedForOpen = true;
       sheetStack.promote(this.id);
     }
     const settleCap = this.snaps.getMaxAxisSize();
@@ -3735,7 +3739,8 @@ class BottomSheetCore {
     return Math.min(Math.max((size - min) / (reachableMax - min), 0), 1);
   }
   handleOpen() {
-    sheetStack.promote(this.id);
+    if (this.promotedForOpen) this.promotedForOpen = false;
+    else sheetStack.promote(this.id);
     try {
       this.lifecycle.install();
     } catch (err) {
@@ -3767,6 +3772,7 @@ class BottomSheetCore {
   }
   handleClose() {
     this.opening = false;
+    this.promotedForOpen = false;
     this.lifecycle.release();
     sheetStack.update();
   }
@@ -4424,6 +4430,12 @@ const BottomSheet = qwik.component$((props) => {
     }
     if (dragFrom !== void 0) engine.setDragFrom(dragFrom);
   });
+  qwik.useTask$(({ track }) => {
+    const nextMode = track(() => props.mode);
+    const engine = engineStore.engine;
+    if (!engine || nextMode === void 0) return;
+    engine.setMode(nextMode);
+  });
   const showBackdrop = props.backdrop !== false;
   const mode = props.mode ?? "bottom";
   const ariaLabel = props.ariaLabel ?? "Bottom sheet";

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

@@ -781,7 +781,6 @@ class ScrimController {
     __publicField(this, "backdrop");
     __publicField(this, "mode");
     __publicField(this, "isDestroyed");
-    __publicField(this, "isTopSheet");
     __publicField(this, "getAllowedIds");
     __publicField(this, "getResolvedSnaps");
     __publicField(this, "snapToFn");
@@ -803,7 +802,6 @@ class ScrimController {
     this.backdrop = deps.backdrop;
     this.mode = deps.mode;
     this.isDestroyed = deps.isDestroyed;
-    this.isTopSheet = deps.isTopSheet;
     this.getAllowedIds = deps.getAllowedIds;
     this.getResolvedSnaps = deps.getResolvedSnaps;
     this.snapToFn = deps.snapTo;
@@ -855,15 +853,13 @@ class ScrimController {
       const [s, e] = this.backdropRange;
       const range = Math.max(e - s, RANGE_DIVISION_EPSILON);
       const backdropOpacity = Math.min(Math.max((progress - s) / range, 0), 1);
-      if (this.isTopSheet() || backdropOpacity === 0) {
-        if (this.backdropOpacitySentinel.shouldWrite(backdropOpacity, OPACITY_WRITE_EPSILON)) {
-          this.backdrop.style.opacity = String(backdropOpacity);
-        }
-        const nextPointer = backdropOpacity > POINTER_EVENTS_OPACITY_THRESHOLD ? "auto" : "none";
-        if (nextPointer !== this.lastBackdropPointer) {
-          this.backdrop.style.pointerEvents = nextPointer;
-          this.lastBackdropPointer = nextPointer;
-        }
+      if (this.backdropOpacitySentinel.shouldWrite(backdropOpacity, OPACITY_WRITE_EPSILON)) {
+        this.backdrop.style.opacity = String(backdropOpacity);
+      }
+      const nextPointer = backdropOpacity > POINTER_EVENTS_OPACITY_THRESHOLD ? "auto" : "none";
+      if (nextPointer !== this.lastBackdropPointer) {
+        this.backdrop.style.pointerEvents = nextPointer;
+        this.lastBackdropPointer = nextPointer;
       }
     }
     if (this.screenComponent && this.scrimMode !== "off") {
@@ -1408,18 +1404,20 @@ class AnimationRunner {
   get isAnimating() {
     return this.currentTween !== null || this.currentSpring !== null || this.currentWaapi !== null;
   }
+  cancelWaapi() {
+    if (!this.currentWaapi) return;
+    const entry = this.currentWaapi;
+    this.currentWaapi = null;
+    entry.stop();
+    try {
+      entry.anim.cancel();
+    } catch {
+    }
+  }
   cancel() {
     this.currentTween?.cancel();
     this.currentSpring?.cancel();
-    if (this.currentWaapi) {
-      const entry = this.currentWaapi;
-      this.currentWaapi = null;
-      entry.stop();
-      try {
-        entry.anim.cancel();
-      } catch {
-      }
-    }
+    this.cancelWaapi();
   }
   async animateTo(target, velocityPxPerMs) {
     if (target === this.getSize()) {
@@ -1430,6 +1428,7 @@ class AnimationRunner {
     }
     this.currentTween?.cancel();
     this.currentSpring?.cancel();
+    this.cancelWaapi();
     this.getRootEl()?.setAttribute("data-animating", "true");
     this.element.style.willChange = "transform";
     if (this.reducedMotion) {
@@ -2660,6 +2659,7 @@ class BottomSheetCore {
     __publicField(this, "progressWriteSentinel", new WriteSentinel());
     __publicField(this, "isTopSheet", true);
     __publicField(this, "opening", false);
+    __publicField(this, "promotedForOpen", false);
     __publicField(this, "allowOvershoot", false);
     __publicField(this, "progressPayload", {
       value: 0,
@@ -2716,7 +2716,6 @@ class BottomSheetCore {
       screenComponent: this.screenComponent,
       backdrop: this.backdrop,
       isDestroyed: () => this.destroyed,
-      isTopSheet: () => this.isTopSheet,
       getAllowedIds: () => this.snaps.getAllowedIds().slice(),
       getResolvedSnaps: () => this.snaps.getResolvedSnaps().slice(),
       snapTo: (id) => {
@@ -2964,6 +2963,7 @@ class BottomSheetCore {
     if (!_skipBeforeSnap && this.emitBeforeSnap(target, this.activeId)) {
       return;
     }
+    const resumingOpen = this.opening;
     const signal = this.newCycle();
     const onExternalAbort = () => {
       this.animation.cancel();
@@ -2972,7 +2972,7 @@ class BottomSheetCore {
     externalSignal?.addEventListener("abort", onExternalAbort, {
       once: true
     });
-    const wasClosed = this.size === 0;
+    const wasClosed = this.size === 0 || resumingOpen;
     const previousId = this.activeId;
     const previousSize = this.size;
     this.scrollCache.cache(previousId, previousSize, target.size);
@@ -2981,7 +2981,10 @@ class BottomSheetCore {
     const opensToRest = id === "closed" || rawTargetSize === 0;
     if (wasClosed && !opensToRest) {
       this.opening = true;
-      sheetStack.promote(this.id);
+      if (!resumingOpen) {
+        this.promotedForOpen = true;
+        sheetStack.promote(this.id);
+      }
     }
     if (this.animation.viewTransitionsAvailable) {
       this.currentViewTransition?.skipTransition?.();
@@ -3661,6 +3664,7 @@ class BottomSheetCore {
     this.activeId = target.id;
     if (previousSnapSize === 0 && target.size > 0) {
       this.opening = true;
+      this.promotedForOpen = true;
       sheetStack.promote(this.id);
     }
     const settleCap = this.snaps.getMaxAxisSize();
@@ -3733,7 +3737,8 @@ class BottomSheetCore {
     return Math.min(Math.max((size - min) / (reachableMax - min), 0), 1);
   }
   handleOpen() {
-    sheetStack.promote(this.id);
+    if (this.promotedForOpen) this.promotedForOpen = false;
+    else sheetStack.promote(this.id);
     try {
       this.lifecycle.install();
     } catch (err) {
@@ -3765,6 +3770,7 @@ class BottomSheetCore {
   }
   handleClose() {
     this.opening = false;
+    this.promotedForOpen = false;
     this.lifecycle.release();
     sheetStack.update();
   }
@@ -4422,6 +4428,12 @@ const BottomSheet = component$((props) => {
     }
     if (dragFrom !== void 0) engine.setDragFrom(dragFrom);
   });
+  useTask$(({ track }) => {
+    const nextMode = track(() => props.mode);
+    const engine = engineStore.engine;
+    if (!engine || nextMode === void 0) return;
+    engine.setMode(nextMode);
+  });
   const showBackdrop = props.backdrop !== false;
   const mode = props.mode ?? "bottom";
   const ariaLabel = props.ariaLabel ?? "Bottom sheet";

package/dist/qwik.cjs

@@ -777,7 +777,6 @@ var ScrimController = class {
     __publicField(this, "backdrop");
     __publicField(this, "mode");
     __publicField(this, "isDestroyed");
-    __publicField(this, "isTopSheet");
     __publicField(this, "getAllowedIds");
     __publicField(this, "getResolvedSnaps");
     __publicField(this, "snapToFn");
@@ -799,7 +798,6 @@ var ScrimController = class {
     this.backdrop = deps.backdrop;
     this.mode = deps.mode;
     this.isDestroyed = deps.isDestroyed;
-    this.isTopSheet = deps.isTopSheet;
     this.getAllowedIds = deps.getAllowedIds;
     this.getResolvedSnaps = deps.getResolvedSnaps;
     this.snapToFn = deps.snapTo;
@@ -848,18 +846,16 @@ var ScrimController = class {
         Math.max((progress - s) / range, 0),
         1
       );
-      if (this.isTopSheet() || backdropOpacity === 0) {
-        if (this.backdropOpacitySentinel.shouldWrite(
-          backdropOpacity,
-          OPACITY_WRITE_EPSILON
-        )) {
-          this.backdrop.style.opacity = String(backdropOpacity);
-        }
-        const nextPointer = backdropOpacity > POINTER_EVENTS_OPACITY_THRESHOLD ? "auto" : "none";
-        if (nextPointer !== this.lastBackdropPointer) {
-          this.backdrop.style.pointerEvents = nextPointer;
-          this.lastBackdropPointer = nextPointer;
-        }
+      if (this.backdropOpacitySentinel.shouldWrite(
+        backdropOpacity,
+        OPACITY_WRITE_EPSILON
+      )) {
+        this.backdrop.style.opacity = String(backdropOpacity);
+      }
+      const nextPointer = backdropOpacity > POINTER_EVENTS_OPACITY_THRESHOLD ? "auto" : "none";
+      if (nextPointer !== this.lastBackdropPointer) {
+        this.backdrop.style.pointerEvents = nextPointer;
+        this.lastBackdropPointer = nextPointer;
       }
     }
     if (this.screenComponent && this.scrimMode !== "off") {
@@ -1389,18 +1385,20 @@ var AnimationRunner = class {
   get isAnimating() {
     return this.currentTween !== null || this.currentSpring !== null || this.currentWaapi !== null;
   }
+  cancelWaapi() {
+    if (!this.currentWaapi) return;
+    const entry = this.currentWaapi;
+    this.currentWaapi = null;
+    entry.stop();
+    try {
+      entry.anim.cancel();
+    } catch {
+    }
+  }
   cancel() {
     this.currentTween?.cancel();
     this.currentSpring?.cancel();
-    if (this.currentWaapi) {
-      const entry = this.currentWaapi;
-      this.currentWaapi = null;
-      entry.stop();
-      try {
-        entry.anim.cancel();
-      } catch {
-      }
-    }
+    this.cancelWaapi();
   }
   async animateTo(target, velocityPxPerMs) {
     if (target === this.getSize()) {
@@ -1411,6 +1409,7 @@ var AnimationRunner = class {
     }
     this.currentTween?.cancel();
     this.currentSpring?.cancel();
+    this.cancelWaapi();
     this.getRootEl()?.setAttribute("data-animating", "true");
     this.element.style.willChange = "transform";
     if (this.reducedMotion) {
@@ -2621,6 +2620,7 @@ var BottomSheetCore = class {
     __publicField(this, "progressWriteSentinel", new WriteSentinel());
     __publicField(this, "isTopSheet", true);
     __publicField(this, "opening", false);
+    __publicField(this, "promotedForOpen", false);
     __publicField(this, "allowOvershoot", false);
     __publicField(this, "progressPayload", {
       value: 0,
@@ -2677,7 +2677,6 @@ var BottomSheetCore = class {
         screenComponent: this.screenComponent,
         backdrop: this.backdrop,
         isDestroyed: () => this.destroyed,
-        isTopSheet: () => this.isTopSheet,
         getAllowedIds: () => this.snaps.getAllowedIds().slice(),
         getResolvedSnaps: () => this.snaps.getResolvedSnaps().slice(),
         snapTo: (id) => {
@@ -2947,13 +2946,14 @@ var BottomSheetCore = class {
     if (!_skipBeforeSnap && this.emitBeforeSnap(target, this.activeId)) {
       return;
     }
+    const resumingOpen = this.opening;
     const signal = this.newCycle();
     const onExternalAbort = () => {
       this.animation.cancel();
       this.newCycle();
     };
     externalSignal?.addEventListener("abort", onExternalAbort, { once: true });
-    const wasClosed = this.size === 0;
+    const wasClosed = this.size === 0 || resumingOpen;
     const previousId = this.activeId;
     const previousSize = this.size;
     this.scrollCache.cache(previousId, previousSize, target.size);
@@ -2962,7 +2962,10 @@ var BottomSheetCore = class {
     const opensToRest = id === "closed" || rawTargetSize === 0;
     if (wasClosed && !opensToRest) {
       this.opening = true;
-      sheetStack.promote(this.id);
+      if (!resumingOpen) {
+        this.promotedForOpen = true;
+        sheetStack.promote(this.id);
+      }
     }
     if (this.animation.viewTransitionsAvailable) {
       this.currentViewTransition?.skipTransition?.();
@@ -3653,6 +3656,7 @@ var BottomSheetCore = class {
     this.activeId = target.id;
     if (previousSnapSize === 0 && target.size > 0) {
       this.opening = true;
+      this.promotedForOpen = true;
       sheetStack.promote(this.id);
     }
     const settleCap = this.snaps.getMaxAxisSize();
@@ -3734,7 +3738,8 @@ var BottomSheetCore = class {
     return Math.min(Math.max((size - min) / (reachableMax - min), 0), 1);
   }
   handleOpen() {
-    sheetStack.promote(this.id);
+    if (this.promotedForOpen) this.promotedForOpen = false;
+    else sheetStack.promote(this.id);
     try {
       this.lifecycle.install();
     } catch (err) {
@@ -3766,6 +3771,7 @@ var BottomSheetCore = class {
   }
   handleClose() {
     this.opening = false;
+    this.promotedForOpen = false;
     this.lifecycle.release();
     sheetStack.update();
   }
@@ -4436,6 +4442,12 @@ var BottomSheet = qwik.component$((props) => {
     }
     if (dragFrom !== void 0) engine.setDragFrom(dragFrom);
   });
+  qwik.useTask$(({ track }) => {
+    const nextMode = track(() => props.mode);
+    const engine = engineStore.engine;
+    if (!engine || nextMode === void 0) return;
+    engine.setMode(nextMode);
+  });
   const showBackdrop = props.backdrop !== false;
   const mode = props.mode ?? "bottom";
   const ariaLabel = props.ariaLabel ?? "Bottom sheet";

package/dist/qwik.d.cts

@@ -1,8 +1,8 @@
 import * as _builder_io_qwik from '@builder.io/qwik';
 import { QRL } from '@builder.io/qwik';
 import { T as TeleportTarget } from './teleport-7uYNiEAT.cjs';
-import { a as SnapPointDef, b as SheetMode, c as EngineOptions, S as SheetEventMap, E as EngineState } from './BottomSheetCore-VPJZcKcg.cjs';
-export { d as SnapPoint } from './BottomSheetCore-VPJZcKcg.cjs';
+import { a as SnapPointDef, b as SheetMode, c as EngineOptions, S as SheetEventMap, E as EngineState } from './BottomSheetCore-BHv6LPmS.cjs';
+export { d as SnapPoint } from './BottomSheetCore-BHv6LPmS.cjs';
 import './transform-jVfAikE9.cjs';
 
 type BottomSheetProps<TId extends string = string> = {

package/dist/qwik.d.ts

@@ -1,8 +1,8 @@
 import * as _builder_io_qwik from '@builder.io/qwik';
 import { QRL } from '@builder.io/qwik';
 import { T as TeleportTarget } from './teleport-7uYNiEAT.js';
-import { a as SnapPointDef, b as SheetMode, c as EngineOptions, S as SheetEventMap, E as EngineState } from './BottomSheetCore-Cgn8b_6A.js';
-export { d as SnapPoint } from './BottomSheetCore-Cgn8b_6A.js';
+import { a as SnapPointDef, b as SheetMode, c as EngineOptions, S as SheetEventMap, E as EngineState } from './BottomSheetCore-CK_mq14p.js';
+export { d as SnapPoint } from './BottomSheetCore-CK_mq14p.js';
 import './transform-jVfAikE9.js';
 
 type BottomSheetProps<TId extends string = string> = {

package/dist/qwik.js

@@ -775,7 +775,6 @@ var ScrimController = class {
     __publicField(this, "backdrop");
     __publicField(this, "mode");
     __publicField(this, "isDestroyed");
-    __publicField(this, "isTopSheet");
     __publicField(this, "getAllowedIds");
     __publicField(this, "getResolvedSnaps");
     __publicField(this, "snapToFn");
@@ -797,7 +796,6 @@ var ScrimController = class {
     this.backdrop = deps.backdrop;
     this.mode = deps.mode;
     this.isDestroyed = deps.isDestroyed;
-    this.isTopSheet = deps.isTopSheet;
     this.getAllowedIds = deps.getAllowedIds;
     this.getResolvedSnaps = deps.getResolvedSnaps;
     this.snapToFn = deps.snapTo;
@@ -846,18 +844,16 @@ var ScrimController = class {
         Math.max((progress - s) / range, 0),
         1
       );
-      if (this.isTopSheet() || backdropOpacity === 0) {
-        if (this.backdropOpacitySentinel.shouldWrite(
-          backdropOpacity,
-          OPACITY_WRITE_EPSILON
-        )) {
-          this.backdrop.style.opacity = String(backdropOpacity);
-        }
-        const nextPointer = backdropOpacity > POINTER_EVENTS_OPACITY_THRESHOLD ? "auto" : "none";
-        if (nextPointer !== this.lastBackdropPointer) {
-          this.backdrop.style.pointerEvents = nextPointer;
-          this.lastBackdropPointer = nextPointer;
-        }
+      if (this.backdropOpacitySentinel.shouldWrite(
+        backdropOpacity,
+        OPACITY_WRITE_EPSILON
+      )) {
+        this.backdrop.style.opacity = String(backdropOpacity);
+      }
+      const nextPointer = backdropOpacity > POINTER_EVENTS_OPACITY_THRESHOLD ? "auto" : "none";
+      if (nextPointer !== this.lastBackdropPointer) {
+        this.backdrop.style.pointerEvents = nextPointer;
+        this.lastBackdropPointer = nextPointer;
       }
     }
     if (this.screenComponent && this.scrimMode !== "off") {
@@ -1387,18 +1383,20 @@ var AnimationRunner = class {
   get isAnimating() {
     return this.currentTween !== null || this.currentSpring !== null || this.currentWaapi !== null;
   }
+  cancelWaapi() {
+    if (!this.currentWaapi) return;
+    const entry = this.currentWaapi;
+    this.currentWaapi = null;
+    entry.stop();
+    try {
+      entry.anim.cancel();
+    } catch {
+    }
+  }
   cancel() {
     this.currentTween?.cancel();
     this.currentSpring?.cancel();
-    if (this.currentWaapi) {
-      const entry = this.currentWaapi;
-      this.currentWaapi = null;
-      entry.stop();
-      try {
-        entry.anim.cancel();
-      } catch {
-      }
-    }
+    this.cancelWaapi();
   }
   async animateTo(target, velocityPxPerMs) {
     if (target === this.getSize()) {
@@ -1409,6 +1407,7 @@ var AnimationRunner = class {
     }
     this.currentTween?.cancel();
     this.currentSpring?.cancel();
+    this.cancelWaapi();
     this.getRootEl()?.setAttribute("data-animating", "true");
     this.element.style.willChange = "transform";
     if (this.reducedMotion) {
@@ -2619,6 +2618,7 @@ var BottomSheetCore = class {
     __publicField(this, "progressWriteSentinel", new WriteSentinel());
     __publicField(this, "isTopSheet", true);
     __publicField(this, "opening", false);
+    __publicField(this, "promotedForOpen", false);
     __publicField(this, "allowOvershoot", false);
     __publicField(this, "progressPayload", {
       value: 0,
@@ -2675,7 +2675,6 @@ var BottomSheetCore = class {
         screenComponent: this.screenComponent,
         backdrop: this.backdrop,
         isDestroyed: () => this.destroyed,
-        isTopSheet: () => this.isTopSheet,
         getAllowedIds: () => this.snaps.getAllowedIds().slice(),
         getResolvedSnaps: () => this.snaps.getResolvedSnaps().slice(),
         snapTo: (id) => {
@@ -2945,13 +2944,14 @@ var BottomSheetCore = class {
     if (!_skipBeforeSnap && this.emitBeforeSnap(target, this.activeId)) {
       return;
     }
+    const resumingOpen = this.opening;
     const signal = this.newCycle();
     const onExternalAbort = () => {
       this.animation.cancel();
       this.newCycle();
     };
     externalSignal?.addEventListener("abort", onExternalAbort, { once: true });
-    const wasClosed = this.size === 0;
+    const wasClosed = this.size === 0 || resumingOpen;
     const previousId = this.activeId;
     const previousSize = this.size;
     this.scrollCache.cache(previousId, previousSize, target.size);
@@ -2960,7 +2960,10 @@ var BottomSheetCore = class {
     const opensToRest = id === "closed" || rawTargetSize === 0;
     if (wasClosed && !opensToRest) {
       this.opening = true;
-      sheetStack.promote(this.id);
+      if (!resumingOpen) {
+        this.promotedForOpen = true;
+        sheetStack.promote(this.id);
+      }
     }
     if (this.animation.viewTransitionsAvailable) {
       this.currentViewTransition?.skipTransition?.();
@@ -3651,6 +3654,7 @@ var BottomSheetCore = class {
     this.activeId = target.id;
     if (previousSnapSize === 0 && target.size > 0) {
       this.opening = true;
+      this.promotedForOpen = true;
       sheetStack.promote(this.id);
     }
     const settleCap = this.snaps.getMaxAxisSize();
@@ -3732,7 +3736,8 @@ var BottomSheetCore = class {
     return Math.min(Math.max((size - min) / (reachableMax - min), 0), 1);
   }
   handleOpen() {
-    sheetStack.promote(this.id);
+    if (this.promotedForOpen) this.promotedForOpen = false;
+    else sheetStack.promote(this.id);
     try {
       this.lifecycle.install();
     } catch (err) {
@@ -3764,6 +3769,7 @@ var BottomSheetCore = class {
   }
   handleClose() {
     this.opening = false;
+    this.promotedForOpen = false;
     this.lifecycle.release();
     sheetStack.update();
   }
@@ -4434,6 +4440,12 @@ var BottomSheet = component$((props) => {
     }
     if (dragFrom !== void 0) engine.setDragFrom(dragFrom);
   });
+  useTask$(({ track }) => {
+    const nextMode = track(() => props.mode);
+    const engine = engineStore.engine;
+    if (!engine || nextMode === void 0) return;
+    engine.setMode(nextMode);
+  });
   const showBackdrop = props.backdrop !== false;
   const mode = props.mode ?? "bottom";
   const ariaLabel = props.ariaLabel ?? "Bottom sheet";