@surdeddd/bottom-sheet 0.9.1 → 0.11.0

package/dist/solid.source.jsx

@@ -186,11 +186,18 @@ var resolveSnap = (point, mode, measureFit) => {
   return Math.max(0, el.getBoundingClientRect().width);
 };
 
+// src/core/primitives/devWarn.ts
+function devWarn(...args) {
+  if (typeof process !== "undefined" && process.env && process.env.NODE_ENV !== "production" && typeof console !== "undefined") {
+    console.warn(...args);
+  }
+}
+
 // src/core/primitives/snap-points.ts
 var resolveSnapList = (points, mode, measureFit) => points.map((p) => {
   const raw = resolveSnap(p.size, mode, measureFit);
   if (!Number.isFinite(raw) || raw < 0) {
-    console.warn(
+    devWarn(
       `[BottomSheet] snap "${p.id}" resolved to invalid size (${String(p.size)} \u2192 ${raw}); clamped to 0.`
     );
     return { id: p.id, size: 0 };
@@ -202,7 +209,7 @@ var auditVhUsage = (points) => {
   for (const p of points) {
     if (typeof p.size !== "string") continue;
     if (!VH_NOT_DVH.test(p.size)) continue;
-    console.warn(
+    devWarn(
       `[BottomSheet] snap "${p.id}" uses "vh" \u2014 prefer "dvh" on mobile (iOS Safari URL bar makes vh unstable). See https://web.dev/blog/viewport-units`
     );
   }
@@ -256,6 +263,26 @@ var findDragSettleTarget = (input) => {
   );
 };
 
+// src/core/primitives/cancelable-emit.ts
+function emitCancelable(emit, base, warnLabel) {
+  let cancelled = false;
+  let frozen = false;
+  emit({
+    ...base,
+    cancel: () => {
+      if (frozen) {
+        devWarn(
+          `[BottomSheet] ${warnLabel}.cancel() called asynchronously \u2014 ignored. cancel() must be invoked synchronously inside the listener.`
+        );
+        return;
+      }
+      cancelled = true;
+    }
+  });
+  frozen = true;
+  return cancelled;
+}
+
 // src/core/primitives/snap-resolver.ts
 var SnapResolver = class {
   constructor(raw, allowed, mode, measureFit, onMaxAxisSizeChange) {
@@ -403,7 +430,9 @@ function notifyLinkedSheets(sheets, self) {
     try {
       if (linked.state.size === 0) continue;
       const ids = linked.getAllowedIds();
-      const target = ids.find((id) => id !== "closed");
+      const resolved = linked.getResolvedSnaps();
+      const sizeOf = (id) => resolved.find((s) => s.id === id)?.size ?? 0;
+      const target = ids.find((id) => sizeOf(id) > 0);
       if (target && target !== linked.state.activeId) {
         void linked.snapTo(target);
       }
@@ -415,46 +444,198 @@ function notifyLinkedSheets(sheets, self) {
   }
 }
 
-// src/core/features/route.ts
-var closers = [];
-var handlerInstalled = false;
+// src/core/features/history-coordinator.ts
+var entries = [];
+var subscribers = /* @__PURE__ */ new Set();
 var suppress = 0;
-var ensureHandler = () => {
-  if (handlerInstalled || typeof window === "undefined") return;
-  handlerInstalled = true;
-  window.addEventListener("popstate", () => {
-    if (suppress > 0) {
-      suppress -= 1;
-      return;
+var internalDepth = 0;
+var pendingRebrand = null;
+var listenerInstalled = false;
+var patchInstalled = false;
+var origPushState = null;
+var origReplaceState = null;
+var patchedPushState = null;
+var patchedReplaceState = null;
+var hasWindow = () => typeof window !== "undefined";
+var hasHistory = () => typeof history !== "undefined";
+var runInternal = (fn) => {
+  internalDepth += 1;
+  try {
+    fn();
+  } finally {
+    internalDepth -= 1;
+  }
+};
+var notifyRouteChange = () => {
+  const snapshot = Array.from(subscribers);
+  for (const fn of snapshot) fn();
+};
+var ensureListener = () => {
+  if (listenerInstalled || !hasWindow()) return;
+  window.addEventListener("popstate", onPopState);
+  listenerInstalled = true;
+};
+var maybeTeardownListener = () => {
+  if (!listenerInstalled) return;
+  if (entries.length > 0 || subscribers.size > 0 || suppress > 0) return;
+  if (hasWindow()) window.removeEventListener("popstate", onPopState);
+  listenerInstalled = false;
+};
+var installPatch = () => {
+  if (patchInstalled || !hasHistory()) return;
+  origPushState = history.pushState;
+  origReplaceState = history.replaceState;
+  patchedPushState = function(...args) {
+    origPushState.apply(this, args);
+    if (internalDepth === 0) notifyRouteChange();
+  };
+  patchedReplaceState = function(...args) {
+    origReplaceState.apply(this, args);
+    if (internalDepth === 0) notifyRouteChange();
+  };
+  history.pushState = patchedPushState;
+  history.replaceState = patchedReplaceState;
+  patchInstalled = true;
+};
+var removePatch = () => {
+  if (!patchInstalled) return;
+  if (history.pushState === patchedPushState && origPushState) {
+    history.pushState = origPushState;
+  }
+  if (history.replaceState === patchedReplaceState && origReplaceState) {
+    history.replaceState = origReplaceState;
+  }
+  origPushState = null;
+  origReplaceState = null;
+  patchedPushState = null;
+  patchedReplaceState = null;
+  patchInstalled = false;
+};
+function onPopState() {
+  if (suppress > 0) {
+    suppress -= 1;
+    const rebrand = pendingRebrand;
+    pendingRebrand = null;
+    if (rebrand) rebrand();
+    maybeTeardownListener();
+    return;
+  }
+  if (entries.length === 0) {
+    notifyRouteChange();
+    maybeTeardownListener();
+    return;
+  }
+  let target = null;
+  let targetIdx = -1;
+  for (let i = entries.length - 1; i >= 0; i -= 1) {
+    const entry = entries[i];
+    if (!entry.surface.isOpen()) continue;
+    if (!target) {
+      target = entry;
+      targetIdx = i;
     }
-    let target = null;
-    for (let i = closers.length - 1; i >= 0; i -= 1) {
-      const c = closers[i];
-      if (!c.isOpen()) continue;
-      if (!target) target = c;
-      if (c.isTop()) {
-        target = c;
-        break;
-      }
+    if (entry.surface.isTop()) {
+      target = entry;
+      targetIdx = i;
+      break;
     }
-    if (!target) return;
-    target.consumed = true;
-    const idx = closers.indexOf(target);
-    if (idx !== -1) closers.splice(idx, 1);
-    const settled = target;
-    void Promise.resolve(settled.close()).then(() => {
-      if (settled.isOpen()) settled.restore();
-    });
+  }
+  if (!target) {
+    const removed = entries.pop();
+    if (removed) removed.live = false;
+    maybeTeardownListener();
+    return;
+  }
+  target.live = false;
+  entries.splice(targetIdx, 1);
+  const settled = target;
+  void Promise.resolve(settled.surface.close()).then(() => {
+    if (settled.surface.isOpen()) restore(settled);
   });
-};
-var programmaticBack = () => {
-  suppress += 1;
-  try {
-    history.back();
-  } catch {
-    suppress = Math.max(0, suppress - 1);
+  maybeTeardownListener();
+}
+function restore(entry) {
+  if (!hasWindow() || !hasHistory()) return;
+  entry.live = true;
+  runInternal(() => {
+    try {
+      history.pushState(entry.surface.markerState(), "", entry.surface.url);
+    } catch {
+      entry.live = false;
+    }
+  });
+  if (entry.live) {
+    entries.push(entry);
+    ensureListener();
   }
-};
+}
+function pushBackMarker(surface) {
+  const entry = { surface, priorUrl: void 0, live: false };
+  if (!hasWindow() || !hasHistory()) {
+    return entry;
+  }
+  entry.priorUrl = surface.url !== void 0 ? location.href : void 0;
+  runInternal(() => {
+    try {
+      history.pushState(surface.markerState(), "", surface.url);
+      entry.live = true;
+    } catch {
+      entry.live = false;
+    }
+  });
+  if (entry.live) {
+    entries.push(entry);
+    ensureListener();
+  }
+  return entry;
+}
+function popBackMarker(handle) {
+  if (!hasWindow() || !hasHistory()) return;
+  const entry = handle;
+  const idx = entries.indexOf(entry);
+  if (idx === -1 || !entry.live) return;
+  const last = entries.length - 1;
+  entry.live = false;
+  entries.splice(idx, 1);
+  if (idx !== last) {
+    const rebrandSurface = entries[entries.length - 1].surface;
+    const rebrandUrl = entry.priorUrl;
+    pendingRebrand = () => {
+      runInternal(() => {
+        history.replaceState(
+          rebrandSurface.markerState(),
+          "",
+          rebrandUrl !== void 0 ? rebrandUrl : location.href
+        );
+      });
+    };
+  }
+  suppress += 1;
+  runInternal(() => {
+    try {
+      history.back();
+    } catch {
+      suppress = Math.max(0, suppress - 1);
+      pendingRebrand = null;
+    }
+  });
+  maybeTeardownListener();
+}
+function subscribeRouteChange(fn) {
+  if (!hasWindow() || !hasHistory()) return () => {
+  };
+  subscribers.add(fn);
+  if (subscribers.size === 1) installPatch();
+  ensureListener();
+  return () => {
+    if (!subscribers.has(fn)) return;
+    subscribers.delete(fn);
+    if (subscribers.size === 0) removePatch();
+    maybeTeardownListener();
+  };
+}
+
+// src/core/features/route.ts
 function installRoute(deps) {
   if (typeof window === "undefined") {
     return () => {
@@ -464,92 +645,39 @@ function installRoute(deps) {
     return () => {
     };
   }
-  let pushed = false;
-  let closer = null;
-  const teardownEntry = () => {
-    if (closer) {
-      const idx = closers.indexOf(closer);
-      if (idx !== -1) closers.splice(idx, 1);
-    }
-    const wasConsumed = closer?.consumed ?? false;
-    closer = null;
-    if (pushed && !wasConsumed) {
-      pushed = false;
-      programmaticBack();
-    } else {
-      pushed = false;
-    }
-  };
-  const pushEntry = () => {
-    try {
-      if (deps.routedTo !== void 0) {
-        history.pushState({ __bsRouted: deps.sheetId }, "", deps.routedTo);
-      } else {
-        history.pushState({ __bsSheet: deps.sheetId }, "");
-      }
-      pushed = true;
-    } catch {
-      pushed = false;
-    }
-  };
+  let handle = null;
   const onOpen = () => {
-    if (closer) return;
-    const self = {
+    if (handle) return;
+    handle = pushBackMarker({
       isOpen: () => !deps.isDestroyed() && deps.getSize() > 0,
-      isTop: () => deps.isTopSheet(),
-      close: () => deps.close(),
-      restore: () => {
-        if (deps.isDestroyed() || closer !== self) return;
-        self.consumed = false;
-        if (!closers.includes(self)) closers.push(self);
-        pushEntry();
-      },
-      consumed: false
-    };
-    closer = self;
-    ensureHandler();
-    closers.push(self);
-    pushEntry();
+      isTop: deps.isTopSheet,
+      close: deps.close,
+      markerState: () => deps.routedTo !== void 0 ? { __bsRouted: deps.sheetId } : { __bsSheet: deps.sheetId },
+      url: deps.routedTo
+    });
+  };
+  const onClose = () => {
+    if (!handle) return;
+    popBackMarker(handle);
+    handle = null;
   };
   const unsubscribeOpen = deps.on("open", onOpen);
-  const unsubscribeClose = deps.on("close", teardownEntry);
+  const unsubscribeClose = deps.on("close", onClose);
   if (deps.getSize() > 0) onOpen();
   return () => {
     unsubscribeOpen();
     unsubscribeClose();
-    teardownEntry();
+    if (handle) {
+      popBackMarker(handle);
+      handle = null;
+    }
   };
 }
 function installRouteChange(deps) {
-  if (typeof window === "undefined" || typeof history === "undefined") {
-    return () => {
-    };
-  }
-  const onChange = () => {
+  return subscribeRouteChange(() => {
     if (deps.isDestroyed() || deps.getSize() <= 0) return;
     void deps.close();
-  };
-  const wrap = (key) => {
-    const original = history[key];
-    const patched = function(...args) {
-      original.apply(this, args);
-      onChange();
-    };
-    history[key] = patched;
-    return () => {
-      if (history[key] === patched) {
-        history[key] = original;
-      }
-    };
-  };
-  window.addEventListener("popstate", onChange);
-  const restorePush = wrap("pushState");
-  const restoreReplace = wrap("replaceState");
-  return () => {
-    window.removeEventListener("popstate", onChange);
-    restorePush();
-    restoreReplace();
-  };
+  });
 }
 
 // src/core/features/content-swipe.ts
@@ -620,11 +748,15 @@ function installVisualViewport(deps) {
       if (clamp < deps.getMaxAxisSize()) {
         deps.setMaxAxisSize(clamp);
       }
+      const wasAnimating = deps.isAnimating?.() ?? false;
+      deps.cancelInFlight();
+      deps.newCycle();
       const max = deps.getMaxAxisSize();
       deps.setSize(Math.min(deps.getSize(), max));
       const current = deps.resolveActiveSnap();
       if (current && !deps.isDragging()) {
         deps.applySize(Math.min(current.size, max));
+        if (wasAnimating) deps.resyncAfterCancel?.();
       } else {
         deps.applySize(deps.getSize());
       }
@@ -765,6 +897,54 @@ function installFitObserver(deps) {
   };
 }
 
+// src/core/features/max-height-controller.ts
+function createMaxHeightController(deps) {
+  let maxHeightCap;
+  let maxHeightRaw;
+  const resolveCap = () => {
+    const raw = maxHeightRaw;
+    if (raw === void 0) {
+      maxHeightCap = void 0;
+      return;
+    }
+    if (typeof raw === "number") {
+      maxHeightCap = raw;
+      return;
+    }
+    if (typeof window === "undefined") return;
+    const measured = resolveSnap(raw, deps.mode);
+    maxHeightCap = measured > 0 ? measured : void 0;
+  };
+  const clampTo = () => {
+    if (maxHeightCap === void 0) return;
+    if (deps.getMaxAxisSize() > maxHeightCap) {
+      deps.setMaxAxisSize(maxHeightCap);
+    }
+  };
+  return {
+    setRadius(r) {
+      deps.element.style.setProperty(
+        "--bs-radius",
+        typeof r === "number" ? `${r}px` : r
+      );
+    },
+    setMaxHeight(h) {
+      const value = typeof h === "number" ? `${h}px` : h;
+      const axis = layoutAxis(deps.mode);
+      deps.element.style.setProperty(
+        axis === "height" ? "max-height" : "max-width",
+        value
+      );
+      maxHeightRaw = h;
+      resolveCap();
+      deps.recompute();
+    },
+    resolveCap,
+    clampTo,
+    getCap: () => maxHeightCap
+  };
+}
+
 // src/core/features/fit-measurement.ts
 var measureSheetNatural = (element, content, vertical) => {
   if (!content) {
@@ -894,13 +1074,6 @@ var WriteSentinel = class {
   }
 };
 
-// src/core/primitives/devWarn.ts
-function devWarn(...args) {
-  if (typeof process !== "undefined" && process.env && process.env.NODE_ENV !== "production" && typeof console !== "undefined") {
-    console.warn(...args);
-  }
-}
-
 // src/core/primitives/overlay-position.ts
 function resolveSheetAnchoredStyle(mode, position, inset) {
   const sizeOffset = `calc(var(--bs-size, 0px) + ${inset})`;
@@ -2356,7 +2529,7 @@ var matchesRange = (def, progress) => {
 };
 function installScrimStages(deps, opts) {
   const doc = deps.host.ownerDocument;
-  const entries = opts.stages.map((def) => {
+  const entries2 = opts.stages.map((def) => {
     const wrapper = doc.createElement("div");
     wrapper.className = "bs-scrim-stage";
     const ws = wrapper.style;
@@ -2377,9 +2550,9 @@ function installScrimStages(deps, opts) {
   const resolveActive = () => {
     const state = deps.getState();
     if (state.size === 0) {
-      return entries.find((e) => matchesId(e.def, state.activeId)) ?? null;
+      return entries2.find((e) => matchesId(e.def, state.activeId)) ?? null;
     }
-    return entries.find((e) => matchesId(e.def, state.activeId)) ?? entries.find((e) => matchesRange(e.def, state.progress)) ?? null;
+    return entries2.find((e) => matchesId(e.def, state.activeId)) ?? entries2.find((e) => matchesRange(e.def, state.progress)) ?? null;
   };
   const hide = (entry, animate) => {
     entry.inFlight?.cancel();
@@ -2428,13 +2601,13 @@ function installScrimStages(deps, opts) {
     deps.on("open", () => update(true)),
     deps.on("close", () => update(true))
   ];
-  if (entries.some((e) => e.def.forRange)) {
+  if (entries2.some((e) => e.def.forRange)) {
     offs.push(deps.on("progress", () => update(true)));
   }
   update(false);
   return () => {
     offs.forEach((off) => off());
-    for (const entry of entries) {
+    for (const entry of entries2) {
       entry.inFlight?.cancel();
       entry.inFlight = null;
       if (entry.wrapper.parentNode) {
@@ -2544,8 +2717,7 @@ var BottomSheetEngine = class {
   disableCloseFlag;
   disableDragFlag;
   closeOnRouteChange;
-  maxHeightCap;
-  maxHeightRaw;
+  maxHeight;
   snapPointsRaw;
   snaps;
   activeId;
@@ -2657,11 +2829,20 @@ var BottomSheetEngine = class {
     auditVhUsage(this.snapPointsRaw);
     this.auditDuplicateSnapIds(this.snapPointsRaw);
     this.rootEl = this.element.closest(".bs-root");
+    this.maxHeight = createMaxHeightController({
+      element: this.element,
+      mode: this.mode,
+      getMaxAxisSize: () => this.snaps.getMaxAxisSize(),
+      setMaxAxisSize: (size) => {
+        this.snaps.setMaxAxisSize(size);
+      },
+      recompute: () => this.recompute()
+    });
     this.fitDeps = {
       element: this.element,
       scrollContainer: this.scrollContainer,
       mode: this.mode,
-      getMaxHeightCap: () => this.maxHeightCap
+      getMaxHeightCap: () => this.maxHeight.getCap()
     };
     this.snaps = new SnapResolver(
       this.snapPointsRaw,
@@ -2683,8 +2864,8 @@ var BottomSheetEngine = class {
     this.attach();
     this.registerInStack();
     if (this.snaps.getMaxAxisSize() === 0 && typeof IntersectionObserver !== "undefined" && typeof document !== "undefined") {
-      const io = new IntersectionObserver((entries) => {
-        for (const entry of entries) {
+      const io = new IntersectionObserver((entries2) => {
+        for (const entry of entries2) {
           if (!entry.isIntersecting) continue;
           if (this.destroyed) return;
           this.snaps.recompute();
@@ -2772,7 +2953,7 @@ var BottomSheetEngine = class {
   }
   use(plugin) {
     if (this.destroyed) {
-      console.warn(
+      devWarn(
         `[BottomSheet] use("${plugin.name}") called on destroyed engine \u2014 ignored.`
       );
       return this;
@@ -2814,6 +2995,9 @@ var BottomSheetEngine = class {
   getAllowedIds() {
     return this.snaps.getAllowedIds().slice();
   }
+  getResolvedSnaps() {
+    return this.snaps.getResolvedSnaps();
+  }
   async snapTo(id, velocityOrOpts = 0, _skipBeforeSnap = false) {
     if (this.destroyed) return;
     const opts = typeof velocityOrOpts === "object" ? velocityOrOpts : { velocity: velocityOrOpts };
@@ -2822,11 +3006,11 @@ var BottomSheetEngine = class {
     if (externalSignal?.aborted) return;
     const target = this.snaps.findById(id);
     if (!target) {
-      console.warn(`[BottomSheet] unknown snap id: ${id}`);
+      devWarn(`[BottomSheet] unknown snap id: ${id}`);
       return;
     }
     if (!this.snaps.getAllowedIds().includes(id)) {
-      console.warn(`[BottomSheet] snap "${id}" is not in allowed list`);
+      devWarn(`[BottomSheet] snap "${id}" is not in allowed list`);
       return;
     }
     if (!_skipBeforeSnap && this.emitBeforeSnap(target, this.activeId)) {
@@ -2958,42 +3142,11 @@ var BottomSheetEngine = class {
   }
   setRadius(r) {
     if (this.destroyed) return;
-    this.element.style.setProperty(
-      "--bs-radius",
-      typeof r === "number" ? `${r}px` : r
-    );
+    this.maxHeight.setRadius(r);
   }
   setMaxHeight(h) {
     if (this.destroyed) return;
-    const value = typeof h === "number" ? `${h}px` : h;
-    const axis = layoutAxis(this.mode);
-    this.element.style.setProperty(
-      axis === "height" ? "max-height" : "max-width",
-      value
-    );
-    this.maxHeightRaw = h;
-    this.resolveMaxHeightCap();
-    this.recompute();
-  }
-  resolveMaxHeightCap() {
-    const raw = this.maxHeightRaw;
-    if (raw === void 0) {
-      this.maxHeightCap = void 0;
-      return;
-    }
-    if (typeof raw === "number") {
-      this.maxHeightCap = raw;
-      return;
-    }
-    if (typeof window === "undefined") return;
-    const measured = resolveSnap(raw, this.mode);
-    this.maxHeightCap = measured > 0 ? measured : void 0;
-  }
-  clampToMaxHeight() {
-    if (this.maxHeightCap === void 0) return;
-    if (this.snaps.getMaxAxisSize() > this.maxHeightCap) {
-      this.snaps.setMaxAxisSize(this.maxHeightCap);
-    }
+    this.maxHeight.setMaxHeight(h);
   }
   setAllowed(ids, snap) {
     if (this.destroyed) return;
@@ -3081,7 +3234,7 @@ var BottomSheetEngine = class {
     };
     const host = this.screenComponent?.parentElement;
     if (!host) {
-      console.warn(
+      devWarn(
         "[BottomSheet] setScrimStages: no scrim element mounted \u2014 pass `scrim` to the engine first."
       );
       return () => {
@@ -3131,9 +3284,9 @@ var BottomSheetEngine = class {
   }
   recompute() {
     if (this.destroyed) return;
-    this.resolveMaxHeightCap();
+    this.maxHeight.resolveCap();
     this.snaps.recompute();
-    this.clampToMaxHeight();
+    this.maxHeight.clampTo();
     this.scrim.invalidateOpacityCache();
     if (this.gesture?.isDragging) return;
     const current = this.snaps.findById(this.activeId);
@@ -3183,42 +3336,18 @@ var BottomSheetEngine = class {
     return this.currentAbort.signal;
   }
   emitBeforeSnap(target, previousId) {
-    let cancelled = false;
-    let frozen = false;
-    this.emit("before-snap", {
-      id: target.id,
-      size: target.size,
-      previousId,
-      cancel: () => {
-        if (frozen) {
-          console.warn(
-            "[BottomSheet] before-snap.cancel() called asynchronously \u2014 ignored. cancel() must be invoked synchronously inside the listener."
-          );
-          return;
-        }
-        cancelled = true;
-      }
-    });
-    frozen = true;
-    return cancelled;
+    return emitCancelable(
+      (payload) => this.emit("before-snap", payload),
+      { id: target.id, size: target.size, previousId },
+      "before-snap"
+    );
   }
   emitBeforeClose(reason) {
-    let cancelled = false;
-    let frozen = false;
-    this.emit("before-close", {
-      reason,
-      cancel: () => {
-        if (frozen) {
-          console.warn(
-            "[BottomSheet] before-close.cancel() called asynchronously \u2014 ignored. cancel() must be invoked synchronously inside the listener."
-          );
-          return;
-        }
-        cancelled = true;
-      }
-    });
-    frozen = true;
-    return cancelled;
+    return emitCancelable(
+      (payload) => this.emit("before-close", payload),
+      { reason },
+      "before-close"
+    );
   }
   applyAutoAriaLabelledBy() {
     if (typeof document === "undefined") return;
@@ -3233,16 +3362,16 @@ var BottomSheetEngine = class {
     this.element.setAttribute("aria-labelledby", titled.id);
   }
   recomputeSnaps() {
-    this.resolveMaxHeightCap();
+    this.maxHeight.resolveCap();
     this.snaps.setRaw(this.snapPointsRaw);
-    this.clampToMaxHeight();
+    this.maxHeight.clampTo();
     this.scrim.invalidateOpacityCache();
   }
   auditDuplicateSnapIds(points) {
     const seen = /* @__PURE__ */ new Set();
     for (const p of points) {
       if (seen.has(p.id)) {
-        console.warn(
+        devWarn(
           `[BottomSheet] duplicate snap id "${p.id}" \u2014 only the first occurrence is reachable.`
         );
       }
@@ -3409,7 +3538,15 @@ var BottomSheetEngine = class {
         setSize: (size) => {
           this.size = size;
         },
-        applySize: (size) => this.applySize(size)
+        applySize: (size) => this.applySize(size),
+        cancelInFlight: () => {
+          this.animation.cancel();
+        },
+        newCycle: () => {
+          this.newCycle();
+        },
+        isAnimating: () => this.animation.isAnimating,
+        resyncAfterCancel: () => this.resyncAfterResize()
       }));
     }
     this.teardowns.add(installSliderKeyboard({
@@ -3445,9 +3582,9 @@ var BottomSheetEngine = class {
       return;
     }
     if (this.emitBeforeSnap(target, previousId)) {
-      const restore = this.snaps.findById(previousId);
-      if (restore) {
-        void this.animation.animateTo(restore.size, 0);
+      const restore2 = this.snaps.findById(previousId);
+      if (restore2) {
+        void this.animation.animateTo(restore2.size, 0);
       }
       return;
     }
@@ -3670,8 +3807,23 @@ var BottomSheet = (props) => {
       props.onSnap?.(payload.id);
     });
     engine.on("before-snap", (payload) => props.onBeforeSnap?.(payload));
-    engine.on("dragstart", sync);
-    engine.on("dragend", sync);
+    engine.on("before-close", (payload) => props.onBeforeClose?.(payload));
+    engine.on("open", (payload) => props.onOpen?.(payload.id));
+    engine.on("close", () => props.onClose?.());
+    engine.on("opened", (payload) => props.onOpened?.(payload.id));
+    engine.on("closed", () => props.onClosed?.());
+    engine.on("dragstart", (payload) => {
+      sync();
+      props.onDragStart?.(payload);
+    });
+    engine.on("dragend", (payload) => {
+      sync();
+      props.onDragEnd?.(payload);
+    });
+    if (props.onDrag) engine.on("drag", (payload) => props.onDrag?.(payload));
+    if (props.onProgress) {
+      engine.on("progress", (payload) => props.onProgress?.(payload));
+    }
     if (props.backdrop !== false && props.closeOnBackdrop !== false && backdropEl) {
       const onBackdropClick = () => {
         if (engine?.canDismiss()) void engine.close("backdrop");