@surdeddd/bottom-sheet 0.9.0 → 0.10.0

package/dist/solid.cjs

@@ -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) {
@@ -400,7 +427,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);
       }
@@ -617,11 +646,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());
       }
@@ -762,6 +795,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) {
@@ -893,13 +974,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})`;
@@ -2545,8 +2619,7 @@ var BottomSheetEngine = class {
     __publicField(this, "disableCloseFlag");
     __publicField(this, "disableDragFlag");
     __publicField(this, "closeOnRouteChange");
-    __publicField(this, "maxHeightCap");
-    __publicField(this, "maxHeightRaw");
+    __publicField(this, "maxHeight");
     __publicField(this, "snapPointsRaw");
     __publicField(this, "snaps");
     __publicField(this, "activeId");
@@ -2657,11 +2730,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,
@@ -2772,7 +2854,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 +2896,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 +2907,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 +3043,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 +3135,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 +3185,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 +3237,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 +3263,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 +3439,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({
@@ -3675,8 +3713,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");

package/dist/solid.d.cts

@@ -202,8 +202,7 @@ declare class BottomSheetEngine {
     private disableCloseFlag;
     private disableDragFlag;
     private closeOnRouteChange;
-    private maxHeightCap;
-    private maxHeightRaw;
+    private maxHeight;
     private snapPointsRaw;
     private snaps;
     private activeId;
@@ -239,6 +238,10 @@ declare class BottomSheetEngine {
     use(plugin: Plugin): this;
     setLinkedSheets(sheets: BottomSheetEngine[]): void;
     getAllowedIds(): string[];
+    getResolvedSnaps(): readonly {
+        id: string;
+        size: number;
+    }[];
     snapTo(id: string, velocityOrOpts?: number | {
         velocity?: number;
         signal?: AbortSignal;
@@ -262,8 +265,6 @@ declare class BottomSheetEngine {
     collapse(): Promise<void>;
     setRadius(r: string | number): void;
     setMaxHeight(h: string | number): void;
-    private resolveMaxHeightCap;
-    private clampToMaxHeight;
     setAllowed(ids: string[], snap?: string): void;
     setBackdropRange(range: [number, number]): void;
     setScreenRange(range: [number, number]): void;
@@ -344,6 +345,15 @@ type BottomSheetProps<TId extends string = string> = {
     ariaLabel?: string;
     onSnap?: (id: TId) => void;
     onBeforeSnap?: (payload: SheetEventMap["before-snap"]) => void;
+    onBeforeClose?: (payload: SheetEventMap["before-close"]) => void;
+    onOpen?: (id: TId) => void;
+    onClose?: () => void;
+    onOpened?: (id: TId) => void;
+    onClosed?: () => void;
+    onDragStart?: (payload: SheetEventMap["dragstart"]) => void;
+    onDragEnd?: (payload: SheetEventMap["dragend"]) => void;
+    onDrag?: (payload: SheetEventMap["drag"]) => void;
+    onProgress?: (payload: SheetEventMap["progress"]) => void;
     onChange?: (state: EngineState & {
         activeId: TId;
     }) => void;

package/dist/solid.d.ts

@@ -202,8 +202,7 @@ declare class BottomSheetEngine {
     private disableCloseFlag;
     private disableDragFlag;
     private closeOnRouteChange;
-    private maxHeightCap;
-    private maxHeightRaw;
+    private maxHeight;
     private snapPointsRaw;
     private snaps;
     private activeId;
@@ -239,6 +238,10 @@ declare class BottomSheetEngine {
     use(plugin: Plugin): this;
     setLinkedSheets(sheets: BottomSheetEngine[]): void;
     getAllowedIds(): string[];
+    getResolvedSnaps(): readonly {
+        id: string;
+        size: number;
+    }[];
     snapTo(id: string, velocityOrOpts?: number | {
         velocity?: number;
         signal?: AbortSignal;
@@ -262,8 +265,6 @@ declare class BottomSheetEngine {
     collapse(): Promise<void>;
     setRadius(r: string | number): void;
     setMaxHeight(h: string | number): void;
-    private resolveMaxHeightCap;
-    private clampToMaxHeight;
     setAllowed(ids: string[], snap?: string): void;
     setBackdropRange(range: [number, number]): void;
     setScreenRange(range: [number, number]): void;
@@ -344,6 +345,15 @@ type BottomSheetProps<TId extends string = string> = {
     ariaLabel?: string;
     onSnap?: (id: TId) => void;
     onBeforeSnap?: (payload: SheetEventMap["before-snap"]) => void;
+    onBeforeClose?: (payload: SheetEventMap["before-close"]) => void;
+    onOpen?: (id: TId) => void;
+    onClose?: () => void;
+    onOpened?: (id: TId) => void;
+    onClosed?: () => void;
+    onDragStart?: (payload: SheetEventMap["dragstart"]) => void;
+    onDragEnd?: (payload: SheetEventMap["dragend"]) => void;
+    onDrag?: (payload: SheetEventMap["drag"]) => void;
+    onProgress?: (payload: SheetEventMap["progress"]) => void;
     onChange?: (state: EngineState & {
         activeId: TId;
     }) => void;