@surdeddd/bottom-sheet 0.14.0 → 0.20.1

package/dist/solid.js

@@ -316,6 +316,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;
@@ -899,6 +904,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;
@@ -1821,6 +1831,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;
@@ -1829,6 +1840,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);
@@ -1847,6 +1859,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);
@@ -1863,7 +1876,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;
@@ -2081,12 +2094,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) => {
@@ -2449,7 +2495,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"),
@@ -2553,6 +2599,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");
@@ -2560,6 +2607,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);
@@ -2611,6 +2659,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;
@@ -2677,7 +2726,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(),
@@ -2685,7 +2734,8 @@ var BottomSheetCore = class {
         this.snaps.setMaxAxisSize(size);
       },
       recompute: () => this.recompute()
-    });
+    };
+    this.maxHeight = createMaxHeightController(this.maxHeightDeps);
     this.fitDeps = {
       element: this.element,
       scrollContainer: this.scrollContainer,
@@ -3019,6 +3069,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;
   }
@@ -3367,7 +3448,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;
@@ -3375,6 +3456,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
     });
@@ -3387,7 +3470,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;
@@ -3513,7 +3596,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,
@@ -3522,8 +3609,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/solid.source.jsx

@@ -321,6 +321,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;
@@ -902,6 +907,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;
@@ -1824,6 +1834,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;
@@ -1832,6 +1843,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);
@@ -1850,6 +1862,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);
@@ -1866,7 +1879,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;
@@ -2084,12 +2097,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) => {
@@ -2453,7 +2499,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"),
@@ -2554,6 +2600,7 @@ var BottomSheetCore = class {
   disableDragFlag;
   closeOnRouteChange;
   maxHeight;
+  maxHeightDeps;
   snapPointsRaw;
   snaps;
   activeId;
@@ -2561,6 +2608,7 @@ var BottomSheetCore = class {
   gesture;
   contentGesture;
   detachSheetGesture = null;
+  detachSliderKeyboard = null;
   rootEl = null;
   destroyed = false;
   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();