@surdeddd/bottom-sheet 0.13.0 → 0.14.0

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

@@ -1832,30 +1832,44 @@ class SampleRing {
     this.size = 0;
   }
 }
-const installGestures = (handle, mode, callbacks) => {
+const installGestures = (handle, mode, callbacks, options = {}) => {
   let activePointerId = null;
   let activePointerType = "touch";
   let startCoord = 0;
   let lastCoord = 0;
+  let pendingStart = false;
   const VELOCITY_WINDOW_MS = (kind) => kind === "mouse" ? 160 : 120;
   const MAX_SAMPLES = 32;
   const samples = new SampleRing(MAX_SAMPLES);
   const axis = isAxisVertical(mode) ? "Y" : "X";
   const sign = mode === "bottom" || mode === "right" ? -1 : 1;
   const coordOf = (e) => axis === "Y" ? e.clientY : e.clientX;
+  const capture = (pointerId) => {
+    try {
+      handle.setPointerCapture(pointerId);
+    } catch {
+    }
+  };
+  const releaseTracking = () => {
+    activePointerId = null;
+    pendingStart = false;
+    samples.reset();
+  };
   const onPointerDown = (e) => {
     if (activePointerId !== null) return;
     if (e.button !== void 0 && e.button !== 0) return;
+    if (options.shouldStart && !options.shouldStart(e)) return;
     activePointerId = e.pointerId;
     activePointerType = e.pointerType || "touch";
     startCoord = coordOf(e);
     lastCoord = startCoord;
     samples.reset();
     samples.push(e.timeStamp, startCoord);
-    try {
-      handle.setPointerCapture(e.pointerId);
-    } catch {
+    if (options.deferStart) {
+      pendingStart = true;
+      return;
     }
+    capture(e.pointerId);
     callbacks.onStart(startCoord, activePointerType);
   };
   const onPointerMove = (e) => {
@@ -1863,6 +1877,22 @@ const installGestures = (handle, mode, callbacks) => {
     const coord = coordOf(e);
     const rawDelta = coord - startCoord;
     const delta = rawDelta * sign;
+    if (pendingStart) {
+      const verdict = options.deferStart(e, delta);
+      if (verdict === false) {
+        releaseTracking();
+        return;
+      }
+      if (verdict !== true) return;
+      pendingStart = false;
+      startCoord = coord;
+      lastCoord = coord;
+      samples.reset();
+      samples.push(e.timeStamp, coord);
+      capture(e.pointerId);
+      callbacks.onStart(startCoord, activePointerType);
+      return;
+    }
     lastCoord = coord;
     samples.push(e.timeStamp, coord);
     const cutoff = e.timeStamp - VELOCITY_WINDOW_MS(activePointerType);
@@ -1871,6 +1901,10 @@ const installGestures = (handle, mode, callbacks) => {
   };
   const finishGesture = (e) => {
     if (e.pointerId !== activePointerId) return;
+    if (pendingStart) {
+      releaseTracking();
+      return;
+    }
     const rawDelta = lastCoord - startCoord;
     const delta = rawDelta * sign;
     let velocity = 0;
@@ -1893,22 +1927,26 @@ const installGestures = (handle, mode, callbacks) => {
   };
   const onPointerCancel = (e) => {
     if (e.pointerId !== activePointerId) return;
-    activePointerId = null;
-    samples.reset();
+    const wasPending = pendingStart;
+    releaseTracking();
+    if (wasPending) return;
     callbacks.onCancel?.();
   };
   handle.addEventListener("pointerdown", onPointerDown);
   handle.addEventListener("pointermove", onPointerMove);
   handle.addEventListener("pointerup", finishGesture);
   handle.addEventListener("pointercancel", onPointerCancel);
+  const managesTouchAction = options.manageTouchAction !== false;
   const prevTouchAction = handle.style.touchAction;
-  handle.style.touchAction = isAxisVertical(mode) ? "pan-x" : "pan-y";
+  if (managesTouchAction) {
+    handle.style.touchAction = isAxisVertical(mode) ? "pan-x" : "pan-y";
+  }
   return () => {
     handle.removeEventListener("pointerdown", onPointerDown);
     handle.removeEventListener("pointermove", onPointerMove);
     handle.removeEventListener("pointerup", finishGesture);
     handle.removeEventListener("pointercancel", onPointerCancel);
-    handle.style.touchAction = prevTouchAction;
+    if (managesTouchAction) handle.style.touchAction = prevTouchAction;
     if (activePointerId !== null && handle.hasPointerCapture(activePointerId)) {
       handle.releasePointerCapture(activePointerId);
     }
@@ -2026,7 +2064,7 @@ class GestureController {
         const restoreTo = this.dragStartSize;
         void this.deps.animateTo(restoreTo, 0);
       }
-    });
+    }, this.deps.gestureOptions);
     return this.detach;
   }
   forceClearDragState() {
@@ -2037,6 +2075,37 @@ class GestureController {
     this.deps.element.style.willChange = "";
   }
 }
+const DRAG_ZONE_SELECTOR = "[data-bs-drag]";
+const NO_DRAG_SELECTOR = "[data-bs-no-drag]";
+const asElement = (target) => {
+  const candidate = target;
+  return candidate && typeof candidate.closest === "function" ? candidate : null;
+};
+function isDragAllowedFrom(target, mode) {
+  const el = asElement(target);
+  if (!el) return mode !== "zones";
+  if (el.closest(NO_DRAG_SELECTOR)) return false;
+  if (mode === "zones") return el.closest(DRAG_ZONE_SELECTOR) !== null;
+  return true;
+}
+const CONTENT_DRAG_SLOP = 6;
+function decideContentGesture(input) {
+  const slop = input.slop ?? CONTENT_DRAG_SLOP;
+  if (Math.abs(input.delta) < slop) return "pending";
+  if (input.scrollTop > 0) return "scroll";
+  if (input.delta > 0 && input.atMaxSnap) return "scroll";
+  return "drag";
+}
+function installTouchScrollGuard(surface, isDragging) {
+  const onTouchMove = (e) => {
+    if (!isDragging()) return;
+    if (e.cancelable) e.preventDefault();
+  };
+  surface.addEventListener("touchmove", onTouchMove, {
+    passive: false
+  });
+  return () => surface.removeEventListener("touchmove", onTouchMove);
+}
 class AriaSliderWriter {
   constructor(handle, mode) {
     __publicField(this, "handle");
@@ -2430,6 +2499,8 @@ function resolveEngineOptions(opts, extras) {
     mode: opts.mode ?? "bottom",
     flickVelocity: opts.flickVelocity ?? DEFAULT_FLICK_VELOCITY,
     dragThreshold: opts.dragThreshold ?? DEFAULT_DRAG_THRESHOLD,
+    dragFrom: opts.dragFrom ?? (opts.handle ? "handle" : "sheet"),
+    dragFromContent: opts.dragFromContent ?? true,
     rubberBandEnabled: opts.rubberBand ?? true,
     closeOnBack: opts.closeOnBack ?? false,
     persistent: opts.persistent ?? false,
@@ -2511,6 +2582,8 @@ class BottomSheetCore {
     __publicField(this, "mode");
     __publicField(this, "flickVelocity");
     __publicField(this, "dragThreshold");
+    __publicField(this, "dragFromMode");
+    __publicField(this, "dragFromContentDefault");
     __publicField(this, "rubberBandEnabled");
     __publicField(this, "scrim");
     __publicField(this, "aria");
@@ -2528,8 +2601,11 @@ class BottomSheetCore {
     __publicField(this, "activeId");
     __publicField(this, "size", 0);
     __publicField(this, "gesture");
+    __publicField(this, "contentGesture");
+    __publicField(this, "detachSheetGesture", null);
     __publicField(this, "rootEl", null);
     __publicField(this, "destroyed", false);
+    __publicField(this, "restClosed", false);
     __publicField(this, "currentViewTransition", null);
     __publicField(this, "currentAbort", new AbortController());
     __publicField(this, "sizeWriteSentinel", new WriteSentinel());
@@ -2583,6 +2659,8 @@ class BottomSheetCore {
     this.aria = new AriaSliderWriter(this.handle, this.mode);
     this.flickVelocity = resolved.flickVelocity;
     this.dragThreshold = resolved.dragThreshold;
+    this.dragFromMode = resolved.dragFrom;
+    this.dragFromContentDefault = resolved.dragFromContent;
     this.rubberBandEnabled = resolved.rubberBandEnabled;
     this.scrim = new ScrimController({
       mode: this.mode,
@@ -2605,7 +2683,7 @@ class BottomSheetCore {
       getRootEl: () => this.rootEl,
       applySize: (size) => this.applySize(size),
       getSize: () => this.size,
-      isDragging: () => this.gesture?.isDragging ?? false,
+      isDragging: () => this.isDraggingAny(),
       applyAux: (size) => this.applySize(size, true),
       getTransformFor: (size) => this.transformTemplate(this.snaps.getMaxAxisSize() - size)
     }, resolved.animation);
@@ -2655,6 +2733,7 @@ class BottomSheetCore {
     const initial = this.snaps.findById(this.activeId);
     if (initial) this.size = initial.size;
     this.applySize(this.size);
+    this.setRestClosed(this.size === 0);
     this.updateAriaSlider();
     this.scrollCache = createScrollCache({
       scrollContainer: this.scrollContainer,
@@ -2682,7 +2761,7 @@ class BottomSheetCore {
       scrollContainer: this.scrollContainer,
       hasFitSnap: () => this.snapPointsRaw.some((p) => p.size === "fit" || p.size === "content"),
       isDestroyed: () => this.destroyed,
-      isDragging: () => this.gesture?.isDragging ?? false,
+      isDragging: () => this.isDraggingAny(),
       recompute: () => this.recompute()
     }));
     if (resolved.radius !== void 0) this.setRadius(resolved.radius);
@@ -2707,7 +2786,7 @@ class BottomSheetCore {
         autoCollapseAfter
       },
       isDestroyed: () => this.destroyed,
-      isDragging: () => this.gesture?.isDragging ?? false,
+      isDragging: () => this.isDraggingAny(),
       isAnimating: () => this.animation.isAnimating,
       isTopSheet: () => this.isTopSheet,
       isVerticalAxis: () => this.mode === "bottom" || this.mode === "top",
@@ -2737,6 +2816,7 @@ class BottomSheetCore {
         void this.snapTo(id);
       },
       close: (reason) => this.close(reason),
+      attachDragSurface: (surface, kind) => this.attachDragSurface(surface, kind),
       on: (event, fn) => this.on(event, fn),
       addTeardown: (fn) => this.teardowns.add(fn)
     };
@@ -2761,7 +2841,7 @@ class BottomSheetCore {
     return {
       size: this.size,
       activeId: this.activeId,
-      isDragging: this.gesture?.isDragging ?? false,
+      isDragging: this.isDraggingAny(),
       isAnimating: this.animation.isAnimating,
       progress: this.computeProgress(this.size)
     };
@@ -2883,9 +2963,16 @@ class BottomSheetCore {
       progress: this.computeProgress(this.size)
     });
     if (withHaptic) this.haptic();
+    this.setRestClosed(targetSize === 0);
     if (wasClosed && targetSize > 0) this.emitOpenSequence(id);
     if (targetSize === 0) this.emitCloseSequence();
   }
+  setRestClosed(closed) {
+    if (closed === this.restClosed) return;
+    this.restClosed = closed;
+    if (closed) this.element.setAttribute("data-bs-rest", "closed");
+    else this.element.removeAttribute("data-bs-rest");
+  }
   emitOpenSequence(id) {
     this.emit("open", {
       id
@@ -2949,6 +3036,20 @@ class BottomSheetCore {
     if (this.destroyed) return;
     this.disableDragFlag = value;
   }
+  setDragFromContent(value) {
+    if (this.destroyed) return;
+    this.dragFromContentDefault = value;
+  }
+  setDragFrom(mode) {
+    if (this.destroyed || mode === this.dragFromMode) return;
+    this.gesture?.forceClearDragState();
+    this.detachSheetGesture?.();
+    this.dragFromMode = mode;
+    this.mountSheetGesture();
+  }
+  getDragFrom() {
+    return this.dragFromMode;
+  }
   isTop() {
     return this.isTopSheet;
   }
@@ -3095,12 +3196,24 @@ class BottomSheetCore {
     auditVhUsage(points);
     this.auditDuplicateSnapIds(points);
     this.snaps.setRaw(points);
-    if (allowed) this.snaps.setAllowedIds(allowed);
+    if (allowed) {
+      this.snaps.setAllowedIds(allowed);
+    } else {
+      const present = this.snaps.getResolvedSnaps().map((s) => s.id);
+      const kept = this.snaps.getAllowedIds().filter((id) => present.includes(id));
+      this.snaps.setAllowedIds(kept.length ? kept : present);
+    }
     this.scrollCache.clear();
     this.scrim.invalidateOpacityCache();
     const current = this.snaps.findById(this.activeId);
     if (current) {
       this.applySize(current.size);
+    } else {
+      const fallback = this.snaps.getResolvedSnaps().find((s) => this.snaps.getAllowedIds().includes(s.id)) ?? this.snaps.getResolvedSnaps()[0];
+      if (fallback) {
+        this.activeId = fallback.id;
+        this.applySize(fallback.size);
+      }
     }
     this.updateAriaSlider();
   }
@@ -3110,7 +3223,7 @@ class BottomSheetCore {
     this.snaps.recompute();
     this.maxHeight.clampTo();
     this.scrim.invalidateOpacityCache();
-    if (this.gesture?.isDragging) return;
+    if (this.isDraggingAny()) return;
     this.healActiveSnap();
   }
   healActiveSnap() {
@@ -3132,6 +3245,8 @@ class BottomSheetCore {
     this.bus.clear();
     this.animation.cancel();
     this.gesture?.forceClearDragState();
+    this.contentGesture?.forceClearDragState();
+    this.setRestClosed(false);
     this.teardowns.drain();
     this.scrim.destroy();
     this.animation.destroy();
@@ -3242,11 +3357,12 @@ class BottomSheetCore {
     const scale = Math.max(1 - depth * 0.04, 0.86);
     this.element.style.scale = scale === 1 ? "" : String(scale);
   }
-  attach() {
-    this.gesture = new GestureController({
-      handle: this.handle,
+  buildGestureDeps(surface, gestureOptions) {
+    return {
+      handle: surface,
       element: this.element,
       mode: this.mode,
+      gestureOptions,
       getRoot: () => this.rootEl,
       getDragContext: () => {
         const buf = this.dragContextBuf;
@@ -3265,8 +3381,81 @@ class BottomSheetCore {
       settleAfterDrag: (delta, velocity, kind) => this.settleAfterDrag(delta, velocity, kind),
       emit: (event, payload) => this.emit(event, payload),
       listenerCount: (event) => this.bus.listenerCount(event)
+    };
+  }
+  isContentDragAllowed() {
+    if (this.disableDragFlag) return false;
+    const point = this.snapPointsRaw.find((p) => p.id === this.activeId);
+    return point?.dragFromContent ?? this.dragFromContentDefault;
+  }
+  decideContentDrag(surface, e, delta) {
+    if (this.destroyed) return false;
+    if (e.pointerType === "mouse") return false;
+    if (this.gesture?.isDragging) return false;
+    if (!this.isContentDragAllowed()) return false;
+    if (!isDragAllowedFrom(e.target, "sheet")) return false;
+    const decision = decideContentGesture({
+      delta,
+      scrollTop: surface.scrollTop,
+      atMaxSnap: this.size >= this.getAllowedRange().max - 0.5
+    });
+    if (decision === "pending") return null;
+    return decision === "drag";
+  }
+  attachDragSurface(surface, kind) {
+    if (this.destroyed || kind !== "content") return;
+    if (this.contentGesture) return;
+    const controller = new GestureController(this.buildGestureDeps(surface, {
+      manageTouchAction: false,
+      deferStart: (e, delta) => this.decideContentDrag(surface, e, delta)
+    }));
+    this.contentGesture = controller;
+    const detachGestures = controller.install();
+    const detachGuard = installTouchScrollGuard(surface, () => controller.isDragging);
+    return () => {
+      detachGuard();
+      detachGestures();
+      if (this.contentGesture === controller) this.contentGesture = void 0;
+    };
+  }
+  sheetDragSurface() {
+    return this.dragFromMode === "handle" ? this.handle : this.element;
+  }
+  canStartSheetDrag(e) {
+    if (this.contentGesture?.isDragging) return false;
+    const target = e.target;
+    const scoped = typeof target?.closest === "function";
+    if (scoped && target.closest(NO_DRAG_SELECTOR)) return false;
+    if (this.handle !== this.element && scoped && this.handle.contains(target)) {
+      return true;
+    }
+    if (!isDragAllowedFrom(e.target, this.dragFromMode)) return false;
+    if (this.dragFromMode === "handle") return true;
+    if (this.scrollContainer && scoped && this.scrollContainer.contains(target) && !target.closest(DRAG_ZONE_SELECTOR)) {
+      return false;
+    }
+    return true;
+  }
+  mountSheetGesture() {
+    const surface = this.sheetDragSurface();
+    const controller = new GestureController(this.buildGestureDeps(surface, {
+      shouldStart: (e) => this.canStartSheetDrag(e),
+      manageTouchAction: this.dragFromMode === "handle"
+    }));
+    this.gesture = controller;
+    const detachGestures = controller.install();
+    const detachGuard = this.dragFromMode === "handle" ? null : installTouchScrollGuard(surface, () => controller.isDragging);
+    this.detachSheetGesture = () => {
+      detachGuard?.();
+      detachGestures();
+    };
+  }
+  attach() {
+    this.mountSheetGesture();
+    this.teardowns.add(() => {
+      this.detachSheetGesture?.();
+      this.detachSheetGesture = null;
     });
-    this.teardowns.add(this.gesture.install());
     try {
       this.attachFeatures();
     } catch (err) {
@@ -3303,7 +3492,7 @@ class BottomSheetCore {
         element: this.element,
         getMode: () => this.mode,
         isDestroyed: () => this.destroyed,
-        isDragging: () => this.gesture?.isDragging ?? false,
+        isDragging: () => this.isDraggingAny(),
         resolveActiveSnap: () => this.snaps.findById(this.activeId),
         getMaxAxisSize: () => this.snaps.getMaxAxisSize(),
         getSize: () => this.size,
@@ -3393,8 +3582,11 @@ class BottomSheetCore {
       this.completeSnap(target.id, target.size, previousSize, previousSnapSize === 0, true);
     });
   }
+  isDraggingAny() {
+    return (this.gesture?.isDragging ?? false) || (this.contentGesture?.isDragging ?? false);
+  }
   clearWillChangeIfIdle() {
-    if (this.animation.isAnimating || this.gesture?.isDragging) return;
+    if (this.animation.isAnimating || this.isDraggingAny()) return;
     this.element.style.willChange = "";
   }
   haptic() {
@@ -3407,8 +3599,9 @@ class BottomSheetCore {
   }
   applySize(size, skipTransform = false) {
     const cap = this.snaps.getMaxAxisSize();
-    const clamped = cap > 0 && size > cap && !this.gesture?.isDragging && !this.allowOvershoot ? cap : size;
+    const clamped = cap > 0 && size > cap && !this.isDraggingAny() && !this.allowOvershoot ? cap : size;
     this.size = clamped;
+    if (clamped > 0) this.setRestClosed(false);
     const offset = cap - clamped;
     const style = this.element.style;
     if (!skipTransform) style.transform = this.transformTemplate(offset);
@@ -3780,55 +3973,9 @@ function installAutoCollapse(deps) {
     unsubscribe();
   };
 }
-const CONTENT_PULL_THRESHOLD = 60;
-function installContentSwipe(deps) {
-  const { container } = deps;
-  let startY = 0;
-  let startScrollTop = 0;
-  let moved = false;
-  const onTouchStart = (e) => {
-    const t = e.touches[0];
-    if (!t) return;
-    startY = t.clientY;
-    startScrollTop = container.scrollTop;
-    moved = false;
-  };
-  const onTouchMove = (e) => {
-    const t = e.touches[0];
-    if (!t) return;
-    if (Math.abs(t.clientY - startY) > CONTENT_PULL_THRESHOLD) moved = true;
-  };
-  const onTouchEnd = (e) => {
-    if (!moved) return;
-    if (deps.isDragging() || deps.isAnimating()) return;
-    if (container.scrollTop !== startScrollTop) return;
-    const t = e.changedTouches[0];
-    if (!t) return;
-    const deltaY = t.clientY - startY;
-    const atTop = container.scrollTop <= 0;
-    const allowed = deps.getAllowedIds();
-    const idx = allowed.indexOf(deps.getActiveId());
-    if (idx === -1) return;
-    if (atTop && deltaY > CONTENT_PULL_THRESHOLD && idx > 0) {
-      deps.snapTo(allowed[idx - 1]);
-    } else if (deltaY < -CONTENT_PULL_THRESHOLD && idx < allowed.length - 1) {
-      deps.snapTo(allowed[idx + 1]);
-    }
-  };
-  container.addEventListener("touchstart", onTouchStart, {
-    passive: true
-  });
-  container.addEventListener("touchmove", onTouchMove, {
-    passive: true
-  });
-  container.addEventListener("touchend", onTouchEnd, {
-    passive: true
-  });
-  return () => {
-    container.removeEventListener("touchstart", onTouchStart);
-    container.removeEventListener("touchmove", onTouchMove);
-    container.removeEventListener("touchend", onTouchEnd);
-  };
+function installContentDrag(deps) {
+  const detach = deps.attachDragSurface(deps.container, "content");
+  return () => detach?.();
 }
 const SAFETY_PAD = 8;
 function installVisualViewport(deps) {
@@ -3930,13 +4077,9 @@ function contentSwipeFeature() {
     stage: "attach",
     install: (ctx) => {
       if (!ctx.scrollContainer) return;
-      return installContentSwipe({
+      return installContentDrag({
         container: ctx.scrollContainer,
-        isDragging: ctx.isDragging,
-        isAnimating: ctx.isAnimating,
-        getAllowedIds: ctx.allowedIdsBySize,
-        getActiveId: ctx.getActiveId,
-        snapTo: ctx.snapTo
+        attachDragSurface: ctx.attachDragSurface
       });
     }
   };
@@ -4067,6 +4210,8 @@ const BottomSheet = component$((props) => {
       persistent: props.persistent,
       disableClose: props.disableClose,
       disableDrag: props.disableDrag,
+      dragFrom: props.dragFrom,
+      dragFromContent: props.dragFromContent,
       closeOnRouteChange: props.closeOnRouteChange,
       stackEffect: props.stackEffect,
       returnFocusTo: props.returnFocusTo,
@@ -4174,11 +4319,17 @@ const BottomSheet = component$((props) => {
     const persistent = track(() => props.persistent);
     const disableClose = track(() => props.disableClose);
     const disableDrag = track(() => props.disableDrag);
+    const dragFromContent = track(() => props.dragFromContent);
+    const dragFrom = track(() => props.dragFrom);
     const engine = engineStore.engine;
     if (!engine) return;
     if (persistent !== void 0) engine.setPersistent(persistent);
     if (disableClose !== void 0) engine.setDisableClose(disableClose);
     if (disableDrag !== void 0) engine.setDisableDrag(disableDrag);
+    if (dragFromContent !== void 0) {
+      engine.setDragFromContent(dragFromContent);
+    }
+    if (dragFrom !== void 0) engine.setDragFrom(dragFrom);
   });
   const showBackdrop = props.backdrop !== false;
   const mode = props.mode ?? "bottom";