@surdeddd/bottom-sheet 0.3.0 → 0.4.0

package/dist/react.js

@@ -39,6 +39,15 @@ var SheetStack = class {
   size() {
     return this.entries.length;
   }
+  depthOf(id) {
+    const open = [];
+    for (const entry of this.entries) {
+      if (!entry.isOpen || entry.isOpen()) open.push(entry);
+    }
+    const idx = open.findIndex((e) => e.id === id);
+    if (idx === -1) return 0;
+    return open.length - 1 - idx;
+  }
   clear() {
     this.entries = [];
   }
@@ -163,7 +172,9 @@ var PERCENT = /^(-?\d+(?:\.\d+)?)%$/;
 var resolveSnap = (point, mode, measureFit) => {
   if (typeof point === "number") return Math.max(0, point);
   if (point === "full") return viewportSize(mode);
-  if (point === "fit") return Math.max(0, measureFit?.() ?? 0);
+  if (point === "fit" || point === "content") {
+    return Math.max(0, measureFit?.() ?? 0);
+  }
   const pctMatch = point.match(PERCENT);
   if (pctMatch) {
     const pct = parseFloat(pctMatch[1]) / 100;
@@ -400,6 +411,42 @@ function notifyLinkedSheets(sheets, self) {
 }
 
 // src/core/features/route.ts
+var closers = [];
+var handlerInstalled = false;
+var suppress = 0;
+var ensureHandler = () => {
+  if (handlerInstalled || typeof window === "undefined") return;
+  handlerInstalled = true;
+  window.addEventListener("popstate", () => {
+    if (suppress > 0) {
+      suppress -= 1;
+      return;
+    }
+    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 (!target) return;
+    target.consumed = true;
+    const idx = closers.indexOf(target);
+    if (idx !== -1) closers.splice(idx, 1);
+    target.close();
+  });
+};
+var programmaticBack = () => {
+  suppress += 1;
+  try {
+    history.back();
+  } catch {
+    suppress = Math.max(0, suppress - 1);
+  }
+};
 function installRoute(deps) {
   if (typeof window === "undefined") {
     return () => {
@@ -409,82 +456,81 @@ function installRoute(deps) {
     return () => {
     };
   }
-  let routePushed = false;
-  let closeOnBackPushed = false;
-  let detachPopstate = null;
-  const popOurMarker = (key, expected) => {
-    const state = history.state;
-    if (state && state[key] === expected) {
-      try {
-        history.back();
-      } catch {
-      }
+  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 onOpen = () => {
-    if (deps.routedTo && !detachPopstate) {
-      const target = deps.routedTo;
-      try {
-        history.pushState({ __bsRouted: target }, "", target);
-        routePushed = true;
-      } catch {
-      }
-      const onPop = (event) => {
-        if (deps.isDestroyed()) return;
-        const state = event.state;
-        if ((!state || state.__bsRouted !== target) && deps.getSize() > 0) {
-          routePushed = false;
-          void deps.close();
-        }
-      };
-      window.addEventListener("popstate", onPop);
-      detachPopstate = () => window.removeEventListener("popstate", onPop);
-    } else if (deps.closeOnBack && !detachPopstate) {
-      try {
+    if (closer) return;
+    closer = {
+      isOpen: () => !deps.isDestroyed() && deps.getSize() > 0,
+      isTop: () => deps.isTopSheet(),
+      close: () => void deps.close(),
+      consumed: false
+    };
+    ensureHandler();
+    closers.push(closer);
+    try {
+      if (deps.routedTo !== void 0) {
+        history.pushState({ __bsRouted: deps.sheetId }, "", deps.routedTo);
+      } else {
         history.pushState({ __bsSheet: deps.sheetId }, "");
-        closeOnBackPushed = true;
-      } catch {
       }
-      const onPop = () => {
-        if (deps.isDestroyed()) return;
-        if (deps.getSize() > 0 && deps.isTopSheet()) {
-          const state = history.state;
-          if (state?.__bsSheet !== deps.sheetId) closeOnBackPushed = false;
-          void deps.close();
-        }
-      };
-      window.addEventListener("popstate", onPop);
-      detachPopstate = () => window.removeEventListener("popstate", onPop);
-    }
-  };
-  const onClose = () => {
-    detachPopstate?.();
-    detachPopstate = null;
-    if (routePushed) {
-      routePushed = false;
-      if (deps.routedTo !== void 0) popOurMarker("__bsRouted", deps.routedTo);
-    }
-    if (closeOnBackPushed) {
-      closeOnBackPushed = false;
-      popOurMarker("__bsSheet", deps.sheetId);
+      pushed = true;
+    } catch {
+      pushed = false;
     }
   };
   const unsubscribeOpen = deps.on("open", onOpen);
-  const unsubscribeClose = deps.on("close", onClose);
+  const unsubscribeClose = deps.on("close", teardownEntry);
   if (deps.getSize() > 0) onOpen();
   return () => {
     unsubscribeOpen();
     unsubscribeClose();
-    detachPopstate?.();
-    detachPopstate = null;
-    if (routePushed) {
-      routePushed = false;
-      if (deps.routedTo !== void 0) popOurMarker("__bsRouted", deps.routedTo);
-    }
-    if (closeOnBackPushed) {
-      closeOnBackPushed = false;
-      popOurMarker("__bsSheet", deps.sheetId);
-    }
+    teardownEntry();
+  };
+}
+function installRouteChange(deps) {
+  if (typeof window === "undefined" || typeof history === "undefined") {
+    return () => {
+    };
+  }
+  const onChange = () => {
+    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();
   };
 }
 
@@ -792,6 +838,7 @@ function applyOverlayPosition(ws, mode, position, inset) {
 
 // src/core/controllers/scrim-controller.ts
 var VALID_CSS_LENGTH = /^-?\d+(?:\.\d+)?(?:px|em|rem|%)$/;
+var DEFAULT_SCRIM_DIM = "rgba(0, 0, 0, 0.4)";
 var ScrimController = class {
   constructor(deps, opts) {
     __publicField(this, "screenComponent");
@@ -830,9 +877,11 @@ var ScrimController = class {
     this.backdropRange = opts.backdropRange ?? preset?.range ?? [0, 1];
     this.screenRange = opts.screenRange ?? preset?.range ?? [0, 1];
     this.scrimTapToCloseEnabled = opts.scrimTapToClose ?? false;
+    const explicitColor = opts.scrimColor ?? preset?.color;
+    const effectiveColor = explicitColor ?? (this.scrimMode !== "off" && !this.backdrop ? DEFAULT_SCRIM_DIM : void 0);
     if (this.screenComponent) {
       this.applyScrimStyles({
-        color: opts.scrimColor ?? preset?.color,
+        color: effectiveColor,
         blur: opts.scrimBlur ?? preset?.blur,
         interactive: opts.scrimInteractive ?? preset?.interactive ?? false
       });
@@ -1606,7 +1655,7 @@ var LifecycleController = class {
     this.releaseScrollLock = null;
     this.inertSiblings.remove();
     if (this.returnFocus) {
-      const target = typeof this.returnFocus === "function" ? this.returnFocus() : this.returnFocus;
+      const target = typeof this.returnFocus === "function" ? this.returnFocus() : typeof this.returnFocus === "string" ? typeof document !== "undefined" ? document.querySelector(this.returnFocus) : null : this.returnFocus;
       target?.focus?.();
     }
   }
@@ -1773,6 +1822,7 @@ var GestureController = class {
     __publicField(this, "dragStartSize", 0);
     __publicField(this, "currentPointerKind", "touch");
     __publicField(this, "keyboardDismissed", false);
+    __publicField(this, "dragSuppressed", false);
     __publicField(this, "dragPayload", { size: 0, delta: 0 });
     this.deps = deps;
   }
@@ -1783,6 +1833,11 @@ var GestureController = class {
     if (this.detach) return this.detach;
     this.detach = installGestures(this.deps.handle, this.deps.mode, {
       onStart: (_coord, kind) => {
+        if (this.deps.getDisableDrag?.()) {
+          this.dragSuppressed = true;
+          return;
+        }
+        this.dragSuppressed = false;
         this.deps.cancelAnimation();
         this.isDragging_ = true;
         this.dragStartSize = this.deps.getDragContext().size;
@@ -1793,6 +1848,7 @@ var GestureController = class {
         this.deps.emit("dragstart", { size: this.dragStartSize });
       },
       onMove: (delta) => {
+        if (this.dragSuppressed) return;
         const ctx = this.deps.getDragContext();
         const { min, max } = ctx.range;
         const maxAxis = ctx.maxAxisSize;
@@ -1816,6 +1872,10 @@ var GestureController = class {
         }
       },
       onEnd: (delta, velocity, kind) => {
+        if (this.dragSuppressed) {
+          this.dragSuppressed = false;
+          return;
+        }
         this.isDragging_ = false;
         this.keyboardDismissed = false;
         this.deps.getRoot()?.removeAttribute("data-dragging");
@@ -1826,6 +1886,10 @@ var GestureController = class {
         this.deps.settleAfterDrag(delta, velocity, kind);
       },
       onCancel: () => {
+        if (this.dragSuppressed) {
+          this.dragSuppressed = false;
+          return;
+        }
         this.isDragging_ = false;
         this.keyboardDismissed = false;
         this.deps.getRoot()?.removeAttribute("data-dragging");
@@ -2205,6 +2269,12 @@ function resolveEngineOptions(opts, extras) {
     dragThreshold: opts.dragThreshold ?? DEFAULT_DRAG_THRESHOLD,
     rubberBandEnabled: opts.rubberBand ?? true,
     closeOnBack: opts.closeOnBack ?? false,
+    persistent: opts.persistent ?? false,
+    disableClose: opts.disableClose ?? false,
+    disableDrag: opts.disableDrag ?? false,
+    closeOnRouteChange: opts.closeOnRouteChange ?? false,
+    radius: opts.radius,
+    maxHeight: opts.maxHeight,
     initialAllowed,
     initialId,
     scrim: {
@@ -2231,7 +2301,8 @@ function resolveEngineOptions(opts, extras) {
       closeOnEscape: opts.closeOnEscape,
       lockBodyScroll: opts.lockBodyScroll,
       inertSiblings: opts.inertSiblings,
-      shouldApplyInertSiblings: extras?.shouldApplyInertSiblings
+      shouldApplyInertSiblings: extras?.shouldApplyInertSiblings,
+      returnFocus: opts.returnFocusTo
     }
   };
 }
@@ -2276,6 +2347,11 @@ var BottomSheetEngine = class {
     __publicField(this, "lifecycle");
     __publicField(this, "closeOnBack");
     __publicField(this, "routedTo");
+    __publicField(this, "persistent");
+    __publicField(this, "disableCloseFlag");
+    __publicField(this, "disableDragFlag");
+    __publicField(this, "closeOnRouteChange");
+    __publicField(this, "maxHeightCap");
     __publicField(this, "snapPointsRaw");
     __publicField(this, "snaps");
     __publicField(this, "activeId");
@@ -2288,6 +2364,7 @@ var BottomSheetEngine = class {
     __publicField(this, "sizeWriteSentinel", new WriteSentinel());
     __publicField(this, "progressWriteSentinel", new WriteSentinel());
     __publicField(this, "isTopSheet", true);
+    __publicField(this, "opening", false);
     __publicField(this, "progressPayload", {
       value: 0,
       size: 0
@@ -2344,7 +2421,8 @@ var BottomSheetEngine = class {
           void this.snapTo(id);
         },
         close: () => {
-          void this.close();
+          if (!this.canDismiss()) return;
+          void this.close("backdrop");
         }
       },
       resolved.scrim
@@ -2368,6 +2446,10 @@ var BottomSheetEngine = class {
     );
     this.closeOnBack = resolved.closeOnBack;
     this.routedTo = opts.routedTo;
+    this.persistent = resolved.persistent;
+    this.disableCloseFlag = resolved.disableClose;
+    this.disableDragFlag = resolved.disableDrag;
+    this.closeOnRouteChange = resolved.closeOnRouteChange;
     this.stackEffectEnabled = opts.stackEffect ?? false;
     this.snapPointsRaw = opts.snapPoints;
     this.persistKey = opts.persistKey;
@@ -2381,7 +2463,7 @@ var BottomSheetEngine = class {
       this.snapPointsRaw,
       resolved.initialAllowed,
       this.mode,
-      () => layoutAxis(this.mode) === "width" ? this.handle.offsetWidth : this.handle.offsetHeight,
+      () => this.measureFitSize(),
       (maxAxisSize) => {
         this.element.style[layoutAxis(this.mode)] = `${maxAxisSize}px`;
       }
@@ -2415,6 +2497,19 @@ var BottomSheetEngine = class {
       io.observe(this.element);
       this.teardowns.add(() => io.disconnect());
     }
+    this.installFitObserver();
+    if (resolved.radius !== void 0) this.setRadius(resolved.radius);
+    if (resolved.maxHeight !== void 0) this.setMaxHeight(resolved.maxHeight);
+    this.applyAutoAriaLabelledBy();
+    if (this.closeOnRouteChange) {
+      this.teardowns.add(
+        installRouteChange({
+          isDestroyed: () => this.destroyed,
+          getSize: () => this.size,
+          close: () => this.close()
+        })
+      );
+    }
     if (this.persistKey) {
       this.teardowns.add(installPersist(this, this.persistKey));
     }
@@ -2439,7 +2534,7 @@ var BottomSheetEngine = class {
         isTopSheet: () => this.isTopSheet,
         getSize: () => this.size,
         isDestroyed: () => this.destroyed,
-        close: () => this.close(),
+        close: () => this.close("back"),
         on: (event, fn) => this.on(event, fn),
         sheetId: this.id
       })
@@ -2533,6 +2628,10 @@ var BottomSheetEngine = class {
     const previousSize = this.size;
     this.scrollCache.cache(previousId, previousSize, target.size);
     this.activeId = id;
+    if (wasClosed && target.size > 0) {
+      this.opening = true;
+      sheetStack.promote(this.id);
+    }
     if (this.animation.viewTransitionsAvailable) {
       this.currentViewTransition?.skipTransition?.();
       const vt = document.startViewTransition(() => {
@@ -2547,19 +2646,26 @@ var BottomSheetEngine = class {
     } else {
       await this.animation.animateTo(target.size, velocityPxPerMs);
     }
+    this.opening = false;
     externalSignal?.removeEventListener("abort", onExternalAbort);
     if (signal.aborted) return;
     this.scrollCache.restore(id, previousSize, target.size);
     this.updateAriaSlider();
-    this.emit("snap", { id, size: target.size });
+    this.emit("snap", {
+      id,
+      size: target.size,
+      progress: this.computeProgress(target.size)
+    });
     if (wasClosed && target.size > 0) {
       this.emit("open", { id });
       this.handleOpen();
       notifyLinkedSheets(this.linkedSheets, this);
+      this.emit("opened", { id });
     }
     if (target.size === 0) {
       this.emit("close", void 0);
       this.handleClose();
+      this.emit("closed", void 0);
     }
   }
   async dragTo(targetSize, velocityOrOpts = 0) {
@@ -2584,11 +2690,74 @@ var BottomSheetEngine = class {
     const target = id ?? this.snaps.getAllowedIds().find((a) => a !== "closed") ?? this.activeId;
     return this.snapTo(target);
   }
-  close() {
+  close(reason = "programmatic") {
     if (this.destroyed) return Promise.resolve();
+    if (this.disableCloseFlag) return Promise.resolve();
+    if (this.size > 0 && this.emitBeforeClose(reason)) return Promise.resolve();
     const closedId = this.snapPointsRaw.find((p) => p.id === "closed")?.id ?? this.snaps.getAllowedIds()[0];
     return this.snapTo(closedId ?? this.activeId);
   }
+  canDismiss() {
+    return !this.persistent && !this.disableCloseFlag && !this.destroyed;
+  }
+  isTop() {
+    return this.isTopSheet;
+  }
+  depth() {
+    return sheetStack.depthOf(this.id);
+  }
+  expand() {
+    if (this.destroyed) return Promise.resolve();
+    const ids = this.allowedIdsBySize();
+    const target = ids[ids.length - 1];
+    if (!target) return Promise.resolve();
+    return this.snapTo(target);
+  }
+  collapse() {
+    if (this.destroyed) return Promise.resolve();
+    const ids = this.allowedIdsBySize();
+    const nonZero = ids.find((id) => (this.snaps.findById(id)?.size ?? 0) > 0);
+    const target = nonZero ?? ids[0];
+    if (!target) return Promise.resolve();
+    return this.snapTo(target);
+  }
+  setRadius(r) {
+    if (this.destroyed) return;
+    this.element.style.setProperty(
+      "--bs-radius",
+      typeof r === "number" ? `${r}px` : 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" ? "maxHeight" : "maxWidth",
+      value
+    );
+    if (typeof h === "number") {
+      this.maxHeightCap = h;
+      this.clampToMaxHeight();
+    } else if (typeof window !== "undefined") {
+      const probe2 = document.createElement("div");
+      probe2.style.cssText = `position:absolute;visibility:hidden;pointer-events:none;${axis === "height" ? "height" : "width"}:${value};`;
+      document.body.appendChild(probe2);
+      const measured = axis === "height" ? probe2.offsetHeight : probe2.offsetWidth;
+      probe2.remove();
+      this.maxHeightCap = measured > 0 ? measured : void 0;
+      this.clampToMaxHeight();
+    }
+  }
+  clampToMaxHeight() {
+    if (this.maxHeightCap === void 0) return;
+    if (this.snaps.getMaxAxisSize() > this.maxHeightCap) {
+      this.snaps.setMaxAxisSize(this.maxHeightCap);
+    }
+    if (this.size > this.maxHeightCap && !this.gesture?.isDragging) {
+      this.applySize(this.maxHeightCap);
+    }
+  }
   setAllowed(ids, snap) {
     if (this.destroyed) return;
     this.snaps.setAllowedIds(ids);
@@ -2722,8 +2891,53 @@ var BottomSheetEngine = class {
     }
     this.updateAriaSlider();
   }
+  recompute() {
+    if (this.destroyed) return;
+    this.snaps.recompute();
+    this.scrim.invalidateOpacityCache();
+    if (this.gesture?.isDragging) return;
+    const current = this.snaps.findById(this.activeId);
+    if (current) {
+      this.size = current.size;
+      this.applySize(this.size);
+      this.updateAriaSlider();
+    }
+  }
+  measureFitSize() {
+    const vertical = layoutAxis(this.mode) === "height";
+    const handleSize = vertical ? this.handle.offsetHeight : this.handle.offsetWidth;
+    const content = this.scrollContainer;
+    const natural = content ? handleSize + (vertical ? content.scrollHeight : content.scrollWidth) : handleSize;
+    if (typeof window === "undefined") return natural;
+    const viewport = vertical ? window.innerHeight : window.innerWidth;
+    return viewport > 0 ? Math.min(natural, viewport) : natural;
+  }
+  installFitObserver() {
+    if (typeof ResizeObserver === "undefined") return;
+    if (!this.snapPointsRaw.some((p) => p.size === "fit" || p.size === "content"))
+      return;
+    const targets = [this.handle];
+    if (this.scrollContainer && this.scrollContainer !== this.handle) {
+      targets.push(this.scrollContainer);
+    }
+    let raf = 0;
+    const ro = new ResizeObserver(() => {
+      if (raf) return;
+      raf = requestAnimationFrame(() => {
+        raf = 0;
+        if (this.destroyed || this.gesture?.isDragging) return;
+        this.recompute();
+      });
+    });
+    for (const t of targets) ro.observe(t);
+    this.teardowns.add(() => {
+      ro.disconnect();
+      if (raf) cancelAnimationFrame(raf);
+    });
+  }
   destroy() {
     this.destroyed = true;
+    this.opening = false;
     this.currentAbort.abort();
     this.currentViewTransition?.skipTransition?.();
     this.currentViewTransition = null;
@@ -2773,6 +2987,36 @@ var BottomSheetEngine = class {
     frozen = true;
     return cancelled;
   }
+  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;
+  }
+  applyAutoAriaLabelledBy() {
+    if (typeof document === "undefined") return;
+    if (!this.lifecycle.focusTrapEnabled) return;
+    if (this.element.getAttribute("aria-labelledby")) return;
+    const scope = this.handle ?? this.element;
+    const titled = scope.querySelector("[data-bs-title]") ?? scope.querySelector("h1,h2,h3,h4,h5,h6");
+    if (!titled) return;
+    if (!titled.id) {
+      titled.id = nextInstanceId("bs-title");
+    }
+    this.element.setAttribute("aria-labelledby", titled.id);
+  }
   recomputeSnaps() {
     const seen = /* @__PURE__ */ new Set();
     for (const p of this.snapPointsRaw) {
@@ -2808,11 +3052,8 @@ var BottomSheetEngine = class {
       },
       setIsTop: (isTop) => {
         this.isTopSheet = isTop;
-        if (this.backdrop) {
-          this.backdrop.style.display = isTop ? "" : "none";
-        }
       },
-      isOpen: () => this.size > 0,
+      isOpen: () => this.size > 0 || this.opening,
       setDepth: (depth) => this.applyStackDepth(depth)
     }));
   }
@@ -2844,6 +3085,7 @@ var BottomSheetEngine = class {
         buf.rubberBandEnabled = this.rubberBandEnabled;
         return buf;
       },
+      getDisableDrag: () => this.disableDragFlag,
       cancelAnimation: () => this.animation.cancel(),
       applySize: (size) => this.applySize(size),
       animateTo: (size, velocity) => this.animation.animateTo(size, velocity),
@@ -2923,8 +3165,9 @@ var BottomSheetEngine = class {
       if (this.lifecycle.closeOnEscape) {
         const onKey = (e) => {
           if (this.destroyed || e.defaultPrevented) return;
+          if (!this.canDismiss()) return;
           if (e.key === "Escape" && this.isTopSheet && this.size > 0) {
-            void this.close();
+            void this.close("escape");
           }
         };
         document.addEventListener("keydown", onKey);
@@ -2987,20 +3230,31 @@ var BottomSheetEngine = class {
     const previousSnapSize = this.snaps.findById(previousId)?.size;
     this.scrollCache.cache(previousId, previousSize, target.size);
     this.activeId = target.id;
+    if (previousSnapSize === 0 && target.size > 0) {
+      this.opening = true;
+      sheetStack.promote(this.id);
+    }
     void this.animation.animateTo(target.size, velocity).then(() => {
+      this.opening = false;
       if (signal.aborted) return;
       this.scrollCache.restore(target.id, previousSize, target.size);
       this.updateAriaSlider();
-      this.emit("snap", { id: target.id, size: target.size });
+      this.emit("snap", {
+        id: target.id,
+        size: target.size,
+        progress: this.computeProgress(target.size)
+      });
       this.haptic();
       if (previousSnapSize === 0 && target.size > 0) {
         this.emit("open", { id: target.id });
         this.handleOpen();
         notifyLinkedSheets(this.linkedSheets, this);
+        this.emit("opened", { id: target.id });
       }
       if (target.size === 0) {
         this.emit("close", void 0);
         this.handleClose();
+        this.emit("closed", void 0);
       }
     });
   }
@@ -3069,17 +3323,24 @@ var BottomSheetEngine = class {
     const target = this.snaps.findById(this.activeId);
     if (!target) return;
     this.updateAriaSlider();
-    this.emit("snap", { id: target.id, size: target.size });
+    this.emit("snap", {
+      id: target.id,
+      size: target.size,
+      progress: this.computeProgress(target.size)
+    });
     if (target.size > 0 && !this.lifecycle.isInstalled) {
       this.emit("open", { id: target.id });
       this.handleOpen();
       notifyLinkedSheets(this.linkedSheets, this);
+      this.emit("opened", { id: target.id });
     } else if (target.size === 0 && this.lifecycle.isInstalled) {
       this.emit("close", void 0);
       this.handleClose();
+      this.emit("closed", void 0);
     }
   }
   handleClose() {
+    this.opening = false;
     this.lifecycle.release();
     sheetStack.update();
   }
@@ -3129,8 +3390,23 @@ function useBottomSheet(opts) {
         refresh();
         optsRef.current.onSnap?.(payload.id);
       }),
-      engine.on("dragstart", refresh),
-      engine.on("dragend", refresh)
+      engine.on("before-close", (payload) => {
+        optsRef.current.onBeforeClose?.(payload);
+      }),
+      engine.on("opened", (payload) => {
+        optsRef.current.onOpened?.(payload.id);
+      }),
+      engine.on("closed", () => {
+        optsRef.current.onClosed?.();
+      }),
+      engine.on("dragstart", (payload) => {
+        refresh();
+        optsRef.current.onDragStart?.(payload);
+      }),
+      engine.on("dragend", (payload) => {
+        refresh();
+        optsRef.current.onDragEnd?.(payload);
+      })
     ];
     return () => {
       offs.forEach((off) => off());
@@ -3168,9 +3444,19 @@ function useBottomSheet(opts) {
     []
   );
   const close = useCallback(
-    () => engineRef.current?.close() ?? Promise.resolve(),
+    (reason) => engineRef.current?.close(reason) ?? Promise.resolve(),
     []
   );
+  const expand = useCallback(
+    () => engineRef.current?.expand() ?? Promise.resolve(),
+    []
+  );
+  const collapse = useCallback(
+    () => engineRef.current?.collapse() ?? Promise.resolve(),
+    []
+  );
+  const isTop = useCallback(() => engineRef.current?.isTop() ?? false, []);
+  const depth = useCallback(() => engineRef.current?.depth() ?? 0, []);
   const setAllowed = useCallback((ids, snap) => {
     engineRef.current?.setAllowed(ids, snap);
   }, []);
@@ -3185,6 +3471,7 @@ function useBottomSheet(opts) {
     }),
     []
   );
+  const recompute = useCallback(() => engineRef.current?.recompute(), []);
   return useMemo(
     () => ({
       sheetRef,
@@ -3196,13 +3483,32 @@ function useBottomSheet(opts) {
       snapTo,
       open,
       close,
+      expand,
+      collapse,
+      isTop,
+      depth,
       setAllowed,
       addAnchor,
       setScrimStages,
+      recompute,
       engine: engineRef.current,
       getEngine
     }),
-    [state, snapTo, open, close, setAllowed, addAnchor, setScrimStages, getEngine]
+    [
+      state,
+      snapTo,
+      open,
+      close,
+      expand,
+      collapse,
+      isTop,
+      depth,
+      setAllowed,
+      addAnchor,
+      setScrimStages,
+      recompute,
+      getEngine
+    ]
   );
 }
 var useHasMounted = () => {
@@ -3225,6 +3531,11 @@ var BottomSheet = forwardRef(
       anchors,
       scrimStages,
       onChange,
+      onBeforeClose,
+      onOpened,
+      onClosed,
+      onDragStart,
+      onDragEnd,
       ariaLabel = "Bottom sheet",
       ariaLabelledBy,
       noSSR = false,
@@ -3241,9 +3552,20 @@ var BottomSheet = forwardRef(
       snapTo,
       open,
       close,
+      expand,
+      collapse,
+      isTop,
+      depth,
       setAllowed,
       getEngine
-    } = useBottomSheet(engineOpts);
+    } = useBottomSheet({
+      ...engineOpts,
+      onBeforeClose,
+      onOpened,
+      onClosed,
+      onDragStart,
+      onDragEnd
+    });
     const ariaModal = engineOpts.focusTrap === true;
     const lastAnnouncedRef = useRef("");
     const [announce, setAnnounce] = useState("");
@@ -3259,6 +3581,10 @@ var BottomSheet = forwardRef(
         snapTo,
         open,
         close,
+        expand,
+        collapse,
+        isTop,
+        depth,
         setAllowed,
         setSnapPoints: (points, allowed) => getEngine()?.setSnapPoints(points, allowed),
         setScrim: (opts) => getEngine()?.setScrim(opts),
@@ -3268,12 +3594,24 @@ var BottomSheet = forwardRef(
         }),
         setScrimStages: (opts) => getEngine()?.setScrimStages(opts) ?? (() => {
         }),
+        recompute: () => getEngine()?.recompute(),
         getEngine,
         get state() {
           return getEngine()?.state ?? state;
         }
       }),
-      [snapTo, open, close, setAllowed, getEngine, state]
+      [
+        snapTo,
+        open,
+        close,
+        expand,
+        collapse,
+        isTop,
+        depth,
+        setAllowed,
+        getEngine,
+        state
+      ]
     );
     useEffect(() => {
       onChange?.(state);
@@ -3340,7 +3678,9 @@ var BottomSheet = forwardRef(
         {
           ref: backdropRef,
           className: "bs-backdrop",
-          onClick: closeOnBackdrop ? () => void close() : void 0
+          onClick: closeOnBackdrop ? () => {
+            if (getEngine()?.canDismiss()) void close("backdrop");
+          } : void 0
         }
       ),
       /* @__PURE__ */ jsx(