@surdeddd/bottom-sheet 0.14.0 → 0.20.0

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

@@ -300,6 +300,11 @@ class SnapResolver {
     this.raw = raw;
     this.recompute();
   }
+  setMode(mode) {
+    if (mode === this.mode) return;
+    this.mode = mode;
+    this.recompute();
+  }
   setAllowedIds(ids) {
     this.allowedIds = ids;
     this.rangeCache = null;
@@ -902,6 +907,11 @@ class ScrimController {
       interactive
     });
   }
+  setSheetMode(mode) {
+    if (this.isDestroyed() || mode === this.mode) return;
+    this.mode = mode;
+    this.invalidateOpacityCache();
+  }
   setScrimMode(mode, applySize) {
     if (this.isDestroyed()) return;
     if (mode === this.scrimMode) return;
@@ -1836,6 +1846,7 @@ const installGestures = (handle, mode, callbacks, options = {}) => {
   let activePointerId = null;
   let activePointerType = "touch";
   let startCoord = 0;
+  let startCross = 0;
   let lastCoord = 0;
   let pendingStart = false;
   const VELOCITY_WINDOW_MS = (kind) => kind === "mouse" ? 160 : 120;
@@ -1844,6 +1855,7 @@ const installGestures = (handle, mode, callbacks, options = {}) => {
   const axis = isAxisVertical(mode) ? "Y" : "X";
   const sign = mode === "bottom" || mode === "right" ? -1 : 1;
   const coordOf = (e) => axis === "Y" ? e.clientY : e.clientX;
+  const crossOf = (e) => axis === "Y" ? e.clientX : e.clientY;
   const capture = (pointerId) => {
     try {
       handle.setPointerCapture(pointerId);
@@ -1862,6 +1874,7 @@ const installGestures = (handle, mode, callbacks, options = {}) => {
     activePointerId = e.pointerId;
     activePointerType = e.pointerType || "touch";
     startCoord = coordOf(e);
+    startCross = crossOf(e);
     lastCoord = startCoord;
     samples.reset();
     samples.push(e.timeStamp, startCoord);
@@ -1878,7 +1891,7 @@ const installGestures = (handle, mode, callbacks, options = {}) => {
     const rawDelta = coord - startCoord;
     const delta = rawDelta * sign;
     if (pendingStart) {
-      const verdict = options.deferStart(e, delta);
+      const verdict = options.deferStart(e, delta, crossOf(e) - startCross);
       if (verdict === false) {
         releaseTracking();
         return;
@@ -2091,11 +2104,42 @@ function isDragAllowedFrom(target, mode) {
 const CONTENT_DRAG_SLOP = 6;
 function decideContentGesture(input) {
   const slop = input.slop ?? CONTENT_DRAG_SLOP;
+  const cross = input.crossDelta ?? 0;
+  const sharesScrollAxis = input.sharesScrollAxis ?? true;
+  if (!sharesScrollAxis) {
+    if (Math.abs(input.delta) < slop && Math.abs(cross) < slop) return "pending";
+    if (Math.abs(input.delta) <= Math.abs(cross)) return "scroll";
+    return "drag";
+  }
   if (Math.abs(input.delta) < slop) return "pending";
   if (input.scrollTop > 0) return "scroll";
   if (input.delta > 0 && input.atMaxSnap) return "scroll";
   return "drag";
 }
+const isLogicalMode = (mode) => mode === "start" || mode === "end";
+const readDirection = (el) => {
+  if (!el) return "ltr";
+  if (typeof getComputedStyle === "function") {
+    try {
+      if (getComputedStyle(el).direction === "rtl") return "rtl";
+    } catch {
+    }
+  }
+  try {
+    const marked = el.closest?.("[dir]");
+    if (marked) {
+      return marked.getAttribute("dir")?.toLowerCase() === "rtl" ? "rtl" : "ltr";
+    }
+  } catch {
+  }
+  return "ltr";
+};
+const resolveMode = (mode, el) => {
+  if (!isLogicalMode(mode)) return mode;
+  const rtl = readDirection(el) === "rtl";
+  if (mode === "start") return rtl ? "right" : "left";
+  return rtl ? "left" : "right";
+};
 function installTouchScrollGuard(surface, isDragging) {
   const onTouchMove = (e) => {
     if (!isDragging()) return;
@@ -2496,7 +2540,7 @@ function resolveEngineOptions(opts, extras) {
     }
   }
   return {
-    mode: opts.mode ?? "bottom",
+    mode: resolveMode(opts.mode ?? "bottom", opts.element),
     flickVelocity: opts.flickVelocity ?? DEFAULT_FLICK_VELOCITY,
     dragThreshold: opts.dragThreshold ?? DEFAULT_DRAG_THRESHOLD,
     dragFrom: opts.dragFrom ?? (opts.handle ? "handle" : "sheet"),
@@ -2596,6 +2640,7 @@ class BottomSheetCore {
     __publicField(this, "disableDragFlag");
     __publicField(this, "closeOnRouteChange");
     __publicField(this, "maxHeight");
+    __publicField(this, "maxHeightDeps");
     __publicField(this, "snapPointsRaw");
     __publicField(this, "snaps");
     __publicField(this, "activeId");
@@ -2603,6 +2648,7 @@ class BottomSheetCore {
     __publicField(this, "gesture");
     __publicField(this, "contentGesture");
     __publicField(this, "detachSheetGesture", null);
+    __publicField(this, "detachSliderKeyboard", null);
     __publicField(this, "rootEl", null);
     __publicField(this, "destroyed", false);
     __publicField(this, "restClosed", false);
@@ -2655,6 +2701,7 @@ class BottomSheetCore {
     this.screenComponent = opts.scrim ?? opts.screenComponent;
     this.scrimParent = this.screenComponent?.parentElement ?? null;
     this.mode = resolved.mode;
+    this.element.dataset.mode = this.mode;
     this.transformTemplate = buildTransformTemplate(this.mode);
     this.aria = new AriaSliderWriter(this.handle, this.mode);
     this.flickVelocity = resolved.flickVelocity;
@@ -2712,7 +2759,7 @@ class BottomSheetCore {
     auditVhUsage(this.snapPointsRaw);
     this.auditDuplicateSnapIds(this.snapPointsRaw);
     this.rootEl = this.element.closest(".bs-root");
-    this.maxHeight = createMaxHeightController({
+    this.maxHeightDeps = {
       element: this.element,
       mode: this.mode,
       getMaxAxisSize: () => this.snaps.getMaxAxisSize(),
@@ -2720,7 +2767,8 @@ class BottomSheetCore {
         this.snaps.setMaxAxisSize(size);
       },
       recompute: () => this.recompute()
-    });
+    };
+    this.maxHeight = createMaxHeightController(this.maxHeightDeps);
     this.fitDeps = {
       element: this.element,
       scrollContainer: this.scrollContainer,
@@ -3050,6 +3098,37 @@ class BottomSheetCore {
   getDragFrom() {
     return this.dragFromMode;
   }
+  setMode(mode) {
+    if (this.destroyed) return;
+    const next = resolveMode(mode, this.element);
+    if (next === this.mode) return;
+    const wasVertical = this.mode === "bottom" || this.mode === "top";
+    const nowVertical = next === "bottom" || next === "top";
+    this.gesture?.forceClearDragState();
+    this.detachSheetGesture?.();
+    this.animation.cancel();
+    this.element.style.removeProperty(layoutAxis(this.mode));
+    this.mode = next;
+    this.element.dataset.mode = next;
+    this.transformTemplate = buildTransformTemplate(next);
+    this.maxHeightDeps.mode = next;
+    this.fitDeps.mode = next;
+    this.snaps.setMode(next);
+    this.scrim.setSheetMode(next);
+    if (wasVertical !== nowVertical) {
+      this.aria = new AriaSliderWriter(this.handle, next);
+    }
+    this.detachSliderKeyboard?.();
+    this.mountSliderKeyboard();
+    this.mountSheetGesture();
+    this.recompute();
+    const active = this.snaps.findById(this.activeId);
+    if (active) this.applySize(active.size);
+    this.updateAriaSlider();
+  }
+  getMode() {
+    return this.mode;
+  }
   isTop() {
     return this.isTopSheet;
   }
@@ -3388,7 +3467,7 @@ class BottomSheetCore {
     const point = this.snapPointsRaw.find((p) => p.id === this.activeId);
     return point?.dragFromContent ?? this.dragFromContentDefault;
   }
-  decideContentDrag(surface, e, delta) {
+  decideContentDrag(surface, e, delta, crossDelta) {
     if (this.destroyed) return false;
     if (e.pointerType === "mouse") return false;
     if (this.gesture?.isDragging) return false;
@@ -3396,6 +3475,8 @@ class BottomSheetCore {
     if (!isDragAllowedFrom(e.target, "sheet")) return false;
     const decision = decideContentGesture({
       delta,
+      crossDelta,
+      sharesScrollAxis: this.mode === "bottom" || this.mode === "top",
       scrollTop: surface.scrollTop,
       atMaxSnap: this.size >= this.getAllowedRange().max - 0.5
     });
@@ -3407,7 +3488,7 @@ class BottomSheetCore {
     if (this.contentGesture) return;
     const controller = new GestureController(this.buildGestureDeps(surface, {
       manageTouchAction: false,
-      deferStart: (e, delta) => this.decideContentDrag(surface, e, delta)
+      deferStart: (e, delta, crossDelta) => this.decideContentDrag(surface, e, delta, crossDelta)
     }));
     this.contentGesture = controller;
     const detachGestures = controller.install();
@@ -3525,7 +3606,11 @@ class BottomSheetCore {
         this.teardowns.add(() => document.removeEventListener("keydown", onKey));
       }
     }
-    this.teardowns.add(installSliderKeyboard({
+    this.mountSliderKeyboard();
+    this.scrim.attach();
+  }
+  mountSliderKeyboard() {
+    const detach = installSliderKeyboard({
       handle: this.handle,
       mode: this.mode,
       isDestroyed: () => this.destroyed,
@@ -3534,8 +3619,12 @@ class BottomSheetCore {
       snapTo: (id) => {
         void this.snapTo(id);
       }
-    }));
-    this.scrim.attach();
+    });
+    this.detachSliderKeyboard = detach;
+    this.teardowns.add(() => {
+      this.detachSliderKeyboard?.();
+      this.detachSliderKeyboard = null;
+    });
   }
   settleAfterDrag(delta, velocity, kind = "touch") {
     const signal = this.newCycle();

package/dist/qwik.cjs

@@ -318,6 +318,11 @@ var SnapResolver = class {
     this.raw = raw;
     this.recompute();
   }
+  setMode(mode) {
+    if (mode === this.mode) return;
+    this.mode = mode;
+    this.recompute();
+  }
   setAllowedIds(ids) {
     this.allowedIds = ids;
     this.rangeCache = null;
@@ -901,6 +906,11 @@ var ScrimController = class {
     if (this.isDestroyed()) return;
     this.applyScrimStyles({ interactive });
   }
+  setSheetMode(mode) {
+    if (this.isDestroyed() || mode === this.mode) return;
+    this.mode = mode;
+    this.invalidateOpacityCache();
+  }
   setScrimMode(mode, applySize) {
     if (this.isDestroyed()) return;
     if (mode === this.scrimMode) return;
@@ -1823,6 +1833,7 @@ var installGestures = (handle, mode, callbacks, options = {}) => {
   let activePointerId = null;
   let activePointerType = "touch";
   let startCoord = 0;
+  let startCross = 0;
   let lastCoord = 0;
   let pendingStart = false;
   const VELOCITY_WINDOW_MS = (kind) => kind === "mouse" ? 160 : 120;
@@ -1831,6 +1842,7 @@ var installGestures = (handle, mode, callbacks, options = {}) => {
   const axis = isAxisVertical(mode) ? "Y" : "X";
   const sign = mode === "bottom" || mode === "right" ? -1 : 1;
   const coordOf = (e) => axis === "Y" ? e.clientY : e.clientX;
+  const crossOf = (e) => axis === "Y" ? e.clientX : e.clientY;
   const capture = (pointerId) => {
     try {
       handle.setPointerCapture(pointerId);
@@ -1849,6 +1861,7 @@ var installGestures = (handle, mode, callbacks, options = {}) => {
     activePointerId = e.pointerId;
     activePointerType = e.pointerType || "touch";
     startCoord = coordOf(e);
+    startCross = crossOf(e);
     lastCoord = startCoord;
     samples.reset();
     samples.push(e.timeStamp, startCoord);
@@ -1865,7 +1878,7 @@ var installGestures = (handle, mode, callbacks, options = {}) => {
     const rawDelta = coord - startCoord;
     const delta = rawDelta * sign;
     if (pendingStart) {
-      const verdict = options.deferStart(e, delta);
+      const verdict = options.deferStart(e, delta, crossOf(e) - startCross);
       if (verdict === false) {
         releaseTracking();
         return;
@@ -2083,12 +2096,45 @@ function isDragAllowedFrom(target, mode) {
 var CONTENT_DRAG_SLOP = 6;
 function decideContentGesture(input) {
   const slop = input.slop ?? CONTENT_DRAG_SLOP;
+  const cross = input.crossDelta ?? 0;
+  const sharesScrollAxis = input.sharesScrollAxis ?? true;
+  if (!sharesScrollAxis) {
+    if (Math.abs(input.delta) < slop && Math.abs(cross) < slop) return "pending";
+    if (Math.abs(input.delta) <= Math.abs(cross)) return "scroll";
+    return "drag";
+  }
   if (Math.abs(input.delta) < slop) return "pending";
   if (input.scrollTop > 0) return "scroll";
   if (input.delta > 0 && input.atMaxSnap) return "scroll";
   return "drag";
 }
 
+// src/core/primitives/logical-mode.ts
+var isLogicalMode = (mode) => mode === "start" || mode === "end";
+var readDirection = (el) => {
+  if (!el) return "ltr";
+  if (typeof getComputedStyle === "function") {
+    try {
+      if (getComputedStyle(el).direction === "rtl") return "rtl";
+    } catch {
+    }
+  }
+  try {
+    const marked = el.closest?.("[dir]");
+    if (marked) {
+      return marked.getAttribute("dir")?.toLowerCase() === "rtl" ? "rtl" : "ltr";
+    }
+  } catch {
+  }
+  return "ltr";
+};
+var resolveMode = (mode, el) => {
+  if (!isLogicalMode(mode)) return mode;
+  const rtl = readDirection(el) === "rtl";
+  if (mode === "start") return rtl ? "right" : "left";
+  return rtl ? "left" : "right";
+};
+
 // src/core/primitives/touch-scroll-guard.ts
 function installTouchScrollGuard(surface, isDragging) {
   const onTouchMove = (e) => {
@@ -2451,7 +2497,7 @@ function resolveEngineOptions(opts, extras) {
     }
   }
   return {
-    mode: opts.mode ?? "bottom",
+    mode: resolveMode(opts.mode ?? "bottom", opts.element),
     flickVelocity: opts.flickVelocity ?? DEFAULT_FLICK_VELOCITY,
     dragThreshold: opts.dragThreshold ?? DEFAULT_DRAG_THRESHOLD,
     dragFrom: opts.dragFrom ?? (opts.handle ? "handle" : "sheet"),
@@ -2555,6 +2601,7 @@ var BottomSheetCore = class {
     __publicField(this, "disableDragFlag");
     __publicField(this, "closeOnRouteChange");
     __publicField(this, "maxHeight");
+    __publicField(this, "maxHeightDeps");
     __publicField(this, "snapPointsRaw");
     __publicField(this, "snaps");
     __publicField(this, "activeId");
@@ -2562,6 +2609,7 @@ var BottomSheetCore = class {
     __publicField(this, "gesture");
     __publicField(this, "contentGesture");
     __publicField(this, "detachSheetGesture", null);
+    __publicField(this, "detachSliderKeyboard", null);
     __publicField(this, "rootEl", null);
     __publicField(this, "destroyed", false);
     __publicField(this, "restClosed", false);
@@ -2613,6 +2661,7 @@ var BottomSheetCore = class {
     this.screenComponent = opts.scrim ?? opts.screenComponent;
     this.scrimParent = this.screenComponent?.parentElement ?? null;
     this.mode = resolved.mode;
+    this.element.dataset.mode = this.mode;
     this.transformTemplate = buildTransformTemplate(this.mode);
     this.aria = new AriaSliderWriter(this.handle, this.mode);
     this.flickVelocity = resolved.flickVelocity;
@@ -2679,7 +2728,7 @@ var BottomSheetCore = class {
     auditVhUsage(this.snapPointsRaw);
     this.auditDuplicateSnapIds(this.snapPointsRaw);
     this.rootEl = this.element.closest(".bs-root");
-    this.maxHeight = createMaxHeightController({
+    this.maxHeightDeps = {
       element: this.element,
       mode: this.mode,
       getMaxAxisSize: () => this.snaps.getMaxAxisSize(),
@@ -2687,7 +2736,8 @@ var BottomSheetCore = class {
         this.snaps.setMaxAxisSize(size);
       },
       recompute: () => this.recompute()
-    });
+    };
+    this.maxHeight = createMaxHeightController(this.maxHeightDeps);
     this.fitDeps = {
       element: this.element,
       scrollContainer: this.scrollContainer,
@@ -3021,6 +3071,37 @@ var BottomSheetCore = class {
   getDragFrom() {
     return this.dragFromMode;
   }
+  setMode(mode) {
+    if (this.destroyed) return;
+    const next = resolveMode(mode, this.element);
+    if (next === this.mode) return;
+    const wasVertical = this.mode === "bottom" || this.mode === "top";
+    const nowVertical = next === "bottom" || next === "top";
+    this.gesture?.forceClearDragState();
+    this.detachSheetGesture?.();
+    this.animation.cancel();
+    this.element.style.removeProperty(layoutAxis(this.mode));
+    this.mode = next;
+    this.element.dataset.mode = next;
+    this.transformTemplate = buildTransformTemplate(next);
+    this.maxHeightDeps.mode = next;
+    this.fitDeps.mode = next;
+    this.snaps.setMode(next);
+    this.scrim.setSheetMode(next);
+    if (wasVertical !== nowVertical) {
+      this.aria = new AriaSliderWriter(this.handle, next);
+    }
+    this.detachSliderKeyboard?.();
+    this.mountSliderKeyboard();
+    this.mountSheetGesture();
+    this.recompute();
+    const active = this.snaps.findById(this.activeId);
+    if (active) this.applySize(active.size);
+    this.updateAriaSlider();
+  }
+  getMode() {
+    return this.mode;
+  }
   isTop() {
     return this.isTopSheet;
   }
@@ -3369,7 +3450,7 @@ var BottomSheetCore = class {
     const point = this.snapPointsRaw.find((p) => p.id === this.activeId);
     return point?.dragFromContent ?? this.dragFromContentDefault;
   }
-  decideContentDrag(surface, e, delta) {
+  decideContentDrag(surface, e, delta, crossDelta) {
     if (this.destroyed) return false;
     if (e.pointerType === "mouse") return false;
     if (this.gesture?.isDragging) return false;
@@ -3377,6 +3458,8 @@ var BottomSheetCore = class {
     if (!isDragAllowedFrom(e.target, "sheet")) return false;
     const decision = decideContentGesture({
       delta,
+      crossDelta,
+      sharesScrollAxis: this.mode === "bottom" || this.mode === "top",
       scrollTop: surface.scrollTop,
       atMaxSnap: this.size >= this.getAllowedRange().max - 0.5
     });
@@ -3389,7 +3472,7 @@ var BottomSheetCore = class {
     const controller = new GestureController(
       this.buildGestureDeps(surface, {
         manageTouchAction: false,
-        deferStart: (e, delta) => this.decideContentDrag(surface, e, delta)
+        deferStart: (e, delta, crossDelta) => this.decideContentDrag(surface, e, delta, crossDelta)
       })
     );
     this.contentGesture = controller;
@@ -3515,7 +3598,11 @@ var BottomSheetCore = class {
         );
       }
     }
-    this.teardowns.add(installSliderKeyboard({
+    this.mountSliderKeyboard();
+    this.scrim.attach();
+  }
+  mountSliderKeyboard() {
+    const detach = installSliderKeyboard({
       handle: this.handle,
       mode: this.mode,
       isDestroyed: () => this.destroyed,
@@ -3524,8 +3611,12 @@ var BottomSheetCore = class {
       snapTo: (id) => {
         void this.snapTo(id);
       }
-    }));
-    this.scrim.attach();
+    });
+    this.detachSliderKeyboard = detach;
+    this.teardowns.add(() => {
+      this.detachSliderKeyboard?.();
+      this.detachSliderKeyboard = null;
+    });
   }
   settleAfterDrag(delta, velocity, kind = "touch") {
     const signal = this.newCycle();

package/dist/qwik.d.cts

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

package/dist/qwik.d.ts

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