@surdeddd/bottom-sheet 0.7.0 → 0.8.0

package/dist/svelte.cjs

@@ -2381,6 +2381,7 @@ var BottomSheetEngine = class {
     __publicField(this, "progressWriteSentinel", new WriteSentinel());
     __publicField(this, "isTopSheet", true);
     __publicField(this, "opening", false);
+    __publicField(this, "allowOvershoot", false);
     __publicField(this, "progressPayload", {
       value: 0,
       size: 0
@@ -2933,40 +2934,32 @@ var BottomSheetEngine = class {
     }
     return out;
   }
-  measureContentExtent(vertical) {
+  measureSheetNatural(vertical) {
+    const el = this.element;
     const content = this.scrollContainer;
-    if (!content) return 0;
-    const targets = this.contentTargets();
-    if (targets.length === 0) {
-      return vertical ? content.scrollHeight : content.scrollWidth;
-    }
-    let min = Infinity;
-    let max = -Infinity;
-    for (const el of targets) {
-      const r = el.getBoundingClientRect();
-      if (vertical) {
-        if (r.top < min) min = r.top;
-        if (r.bottom > max) max = r.bottom;
-      } else {
-        if (r.left < min) min = r.left;
-        if (r.right > max) max = r.right;
-      }
-    }
-    if (!isFinite(min) || !isFinite(max) || max <= min) {
-      return vertical ? content.scrollHeight : content.scrollWidth;
-    }
-    let pad = 0;
-    if (typeof getComputedStyle !== "undefined") {
-      const cs = getComputedStyle(content);
-      pad = vertical ? (parseFloat(cs.paddingTop) || 0) + (parseFloat(cs.paddingBottom) || 0) : (parseFloat(cs.paddingLeft) || 0) + (parseFloat(cs.paddingRight) || 0);
-    }
-    return max - min + pad;
+    if (!content) {
+      return vertical ? el.offsetHeight : el.offsetWidth;
+    }
+    const axis = vertical ? "height" : "width";
+    const sheetStyle = el.style;
+    const cs = content.style;
+    const prevSheet = sheetStyle[axis];
+    const prevFlex = cs.flex;
+    const prevContent = vertical ? cs.height : cs.width;
+    sheetStyle[axis] = "auto";
+    cs.flex = "none";
+    if (vertical) cs.height = "auto";
+    else cs.width = "auto";
+    const natural = vertical ? el.offsetHeight : el.offsetWidth;
+    sheetStyle[axis] = prevSheet;
+    cs.flex = prevFlex;
+    if (vertical) cs.height = prevContent;
+    else cs.width = prevContent;
+    return natural;
   }
   measureFitSize() {
     const vertical = layoutAxis(this.mode) === "height";
-    const handleSize = vertical ? this.handle.offsetHeight : this.handle.offsetWidth;
-    const content = this.scrollContainer;
-    const natural = content ? handleSize + this.measureContentExtent(vertical) : handleSize;
+    const natural = this.measureSheetNatural(vertical);
     const capped = this.maxHeightCap !== void 0 ? Math.min(natural, this.maxHeightCap) : natural;
     if (typeof window === "undefined") return capped;
     const viewport = vertical ? window.innerHeight : window.innerWidth;
@@ -3052,6 +3045,10 @@ var BottomSheetEngine = class {
       this.backdrop.style.opacity = "";
       this.backdrop.style.pointerEvents = "";
     }
+    if (this.anchorHost) {
+      this.anchorHost.style.removeProperty("--bs-size");
+      this.anchorHost.style.removeProperty("--bs-progress");
+    }
     if (this.screenComponent) {
       this.screenComponent.style.opacity = "";
       this.screenComponent.style.display = "";
@@ -3063,6 +3060,7 @@ var BottomSheetEngine = class {
     this.bus.emit(event, payload);
   }
   newCycle() {
+    this.allowOvershoot = false;
     this.currentAbort.abort();
     this.currentAbort = new AbortController();
     return this.currentAbort.signal;
@@ -3128,6 +3126,7 @@ var BottomSheetEngine = class {
       seen.add(p.id);
     }
     this.snaps.setRaw(this.snapPointsRaw);
+    this.clampToMaxHeight();
     this.scrim.invalidateOpacityCache();
   }
   getAllowedRange() {
@@ -3334,9 +3333,13 @@ var BottomSheetEngine = class {
       this.opening = true;
       sheetStack.promote(this.id);
     }
-    void this.animation.animateTo(target.size, velocity).then(() => {
-      this.opening = false;
+    const settleCap = this.snaps.getMaxAxisSize();
+    const settleSize = settleCap > 0 ? Math.min(target.size, settleCap) : target.size;
+    this.allowOvershoot = true;
+    void this.animation.animateTo(settleSize, velocity).then(() => {
       if (signal.aborted) return;
+      this.allowOvershoot = false;
+      this.opening = false;
       this.scrollCache.restore(target.id, previousSize, target.size);
       this.updateAriaSlider();
       this.emit("snap", {
@@ -3368,7 +3371,7 @@ var BottomSheetEngine = class {
   }
   applySize(size) {
     const cap = this.snaps.getMaxAxisSize();
-    const clamped = cap > 0 && size > cap && !this.gesture?.isDragging ? cap : size;
+    const clamped = cap > 0 && size > cap && !this.gesture?.isDragging && !this.allowOvershoot ? cap : size;
     this.size = clamped;
     const offset = cap - clamped;
     const style = this.element.style;
@@ -3699,8 +3702,6 @@ function BottomSheet($$anchor, $$props) {
     if (next && !isOpen) void engine.open();
     else if (!next && isOpen) void engine.close();
   });
-  let allowedIds = $2__namespace.derived(() => $$props.allowed && $$props.allowed.length > 0 ? $$props.allowed : $$props.snapPoints.map((s) => s.id));
-  let activeIdx = $2__namespace.derived(() => $2__namespace.get(allowedIds).indexOf($2__namespace.get(viewState).activeId));
   let isVerticalAxis = $2__namespace.derived(() => mode() === "bottom" || mode() === "top");
   var $$exports = {
     snapTo,
@@ -3754,7 +3755,6 @@ function BottomSheet($$anchor, $$props) {
   $2__namespace.bind_this(div_2, ($$value) => $2__namespace.set(screenEl, $$value), () => $2__namespace.get(screenEl));
   var section = $2__namespace.sibling(div_2, 2);
   var div_3 = $2__namespace.child(section);
-  $2__namespace.set_attribute(div_3, "aria-valuemin", 0);
   $2__namespace.bind_this(div_3, ($$value) => $2__namespace.set(handleEl, $$value), () => $2__namespace.get(handleEl));
   var node_3 = $2__namespace.sibling(div_3, 2);
   {
@@ -3831,23 +3831,14 @@ function BottomSheet($$anchor, $$props) {
     });
   }
   $2__namespace.reset(div);
-  $2__namespace.template_effect(
-    ($0, $1) => {
-      $2__namespace.set_attribute(section, "data-mode", mode());
-      $2__namespace.set_attribute(section, "data-active", $2__namespace.get(viewState).activeId);
-      $2__namespace.set_attribute(section, "aria-modal", focusTrap() ? "true" : void 0);
-      $2__namespace.set_attribute(section, "aria-label", ariaLabel());
-      $2__namespace.set_attribute(div_3, "aria-orientation", $2__namespace.get(isVerticalAxis) ? "vertical" : "horizontal");
-      $2__namespace.set_attribute(div_3, "aria-valuemax", $0);
-      $2__namespace.set_attribute(div_3, "aria-valuenow", $1);
-      $2__namespace.set_attribute(div_3, "aria-valuetext", $2__namespace.get(viewState).activeId);
-      $2__namespace.set_text(text, $2__namespace.get(viewState).activeId);
-    },
-    [
-      () => Math.max(0, $2__namespace.get(allowedIds).length - 1),
-      () => Math.max(0, $2__namespace.get(activeIdx))
-    ]
-  );
+  $2__namespace.template_effect(() => {
+    $2__namespace.set_attribute(section, "data-mode", mode());
+    $2__namespace.set_attribute(section, "data-active", $2__namespace.get(viewState).activeId);
+    $2__namespace.set_attribute(section, "aria-modal", focusTrap() ? "true" : void 0);
+    $2__namespace.set_attribute(section, "aria-label", ariaLabel());
+    $2__namespace.set_attribute(div_3, "aria-orientation", $2__namespace.get(isVerticalAxis) ? "vertical" : "horizontal");
+    $2__namespace.set_text(text, $2__namespace.get(viewState).activeId);
+  });
   $2__namespace.append($$anchor, div);
   return $2__namespace.pop($$exports);
 }

package/dist/svelte.js

@@ -2359,6 +2359,7 @@ var BottomSheetEngine = class {
     __publicField(this, "progressWriteSentinel", new WriteSentinel());
     __publicField(this, "isTopSheet", true);
     __publicField(this, "opening", false);
+    __publicField(this, "allowOvershoot", false);
     __publicField(this, "progressPayload", {
       value: 0,
       size: 0
@@ -2911,40 +2912,32 @@ var BottomSheetEngine = class {
     }
     return out;
   }
-  measureContentExtent(vertical) {
+  measureSheetNatural(vertical) {
+    const el = this.element;
     const content = this.scrollContainer;
-    if (!content) return 0;
-    const targets = this.contentTargets();
-    if (targets.length === 0) {
-      return vertical ? content.scrollHeight : content.scrollWidth;
-    }
-    let min = Infinity;
-    let max = -Infinity;
-    for (const el of targets) {
-      const r = el.getBoundingClientRect();
-      if (vertical) {
-        if (r.top < min) min = r.top;
-        if (r.bottom > max) max = r.bottom;
-      } else {
-        if (r.left < min) min = r.left;
-        if (r.right > max) max = r.right;
-      }
-    }
-    if (!isFinite(min) || !isFinite(max) || max <= min) {
-      return vertical ? content.scrollHeight : content.scrollWidth;
-    }
-    let pad = 0;
-    if (typeof getComputedStyle !== "undefined") {
-      const cs = getComputedStyle(content);
-      pad = vertical ? (parseFloat(cs.paddingTop) || 0) + (parseFloat(cs.paddingBottom) || 0) : (parseFloat(cs.paddingLeft) || 0) + (parseFloat(cs.paddingRight) || 0);
-    }
-    return max - min + pad;
+    if (!content) {
+      return vertical ? el.offsetHeight : el.offsetWidth;
+    }
+    const axis = vertical ? "height" : "width";
+    const sheetStyle = el.style;
+    const cs = content.style;
+    const prevSheet = sheetStyle[axis];
+    const prevFlex = cs.flex;
+    const prevContent = vertical ? cs.height : cs.width;
+    sheetStyle[axis] = "auto";
+    cs.flex = "none";
+    if (vertical) cs.height = "auto";
+    else cs.width = "auto";
+    const natural = vertical ? el.offsetHeight : el.offsetWidth;
+    sheetStyle[axis] = prevSheet;
+    cs.flex = prevFlex;
+    if (vertical) cs.height = prevContent;
+    else cs.width = prevContent;
+    return natural;
   }
   measureFitSize() {
     const vertical = layoutAxis(this.mode) === "height";
-    const handleSize = vertical ? this.handle.offsetHeight : this.handle.offsetWidth;
-    const content = this.scrollContainer;
-    const natural = content ? handleSize + this.measureContentExtent(vertical) : handleSize;
+    const natural = this.measureSheetNatural(vertical);
     const capped = this.maxHeightCap !== void 0 ? Math.min(natural, this.maxHeightCap) : natural;
     if (typeof window === "undefined") return capped;
     const viewport = vertical ? window.innerHeight : window.innerWidth;
@@ -3030,6 +3023,10 @@ var BottomSheetEngine = class {
       this.backdrop.style.opacity = "";
       this.backdrop.style.pointerEvents = "";
     }
+    if (this.anchorHost) {
+      this.anchorHost.style.removeProperty("--bs-size");
+      this.anchorHost.style.removeProperty("--bs-progress");
+    }
     if (this.screenComponent) {
       this.screenComponent.style.opacity = "";
       this.screenComponent.style.display = "";
@@ -3041,6 +3038,7 @@ var BottomSheetEngine = class {
     this.bus.emit(event, payload);
   }
   newCycle() {
+    this.allowOvershoot = false;
     this.currentAbort.abort();
     this.currentAbort = new AbortController();
     return this.currentAbort.signal;
@@ -3106,6 +3104,7 @@ var BottomSheetEngine = class {
       seen.add(p.id);
     }
     this.snaps.setRaw(this.snapPointsRaw);
+    this.clampToMaxHeight();
     this.scrim.invalidateOpacityCache();
   }
   getAllowedRange() {
@@ -3312,9 +3311,13 @@ var BottomSheetEngine = class {
       this.opening = true;
       sheetStack.promote(this.id);
     }
-    void this.animation.animateTo(target.size, velocity).then(() => {
-      this.opening = false;
+    const settleCap = this.snaps.getMaxAxisSize();
+    const settleSize = settleCap > 0 ? Math.min(target.size, settleCap) : target.size;
+    this.allowOvershoot = true;
+    void this.animation.animateTo(settleSize, velocity).then(() => {
       if (signal.aborted) return;
+      this.allowOvershoot = false;
+      this.opening = false;
       this.scrollCache.restore(target.id, previousSize, target.size);
       this.updateAriaSlider();
       this.emit("snap", {
@@ -3346,7 +3349,7 @@ var BottomSheetEngine = class {
   }
   applySize(size) {
     const cap = this.snaps.getMaxAxisSize();
-    const clamped = cap > 0 && size > cap && !this.gesture?.isDragging ? cap : size;
+    const clamped = cap > 0 && size > cap && !this.gesture?.isDragging && !this.allowOvershoot ? cap : size;
     this.size = clamped;
     const offset = cap - clamped;
     const style = this.element.style;
@@ -3677,8 +3680,6 @@ function BottomSheet($$anchor, $$props) {
     if (next && !isOpen) void engine.open();
     else if (!next && isOpen) void engine.close();
   });
-  let allowedIds = $2.derived(() => $$props.allowed && $$props.allowed.length > 0 ? $$props.allowed : $$props.snapPoints.map((s) => s.id));
-  let activeIdx = $2.derived(() => $2.get(allowedIds).indexOf($2.get(viewState).activeId));
   let isVerticalAxis = $2.derived(() => mode() === "bottom" || mode() === "top");
   var $$exports = {
     snapTo,
@@ -3732,7 +3733,6 @@ function BottomSheet($$anchor, $$props) {
   $2.bind_this(div_2, ($$value) => $2.set(screenEl, $$value), () => $2.get(screenEl));
   var section = $2.sibling(div_2, 2);
   var div_3 = $2.child(section);
-  $2.set_attribute(div_3, "aria-valuemin", 0);
   $2.bind_this(div_3, ($$value) => $2.set(handleEl, $$value), () => $2.get(handleEl));
   var node_3 = $2.sibling(div_3, 2);
   {
@@ -3809,23 +3809,14 @@ function BottomSheet($$anchor, $$props) {
     });
   }
   $2.reset(div);
-  $2.template_effect(
-    ($0, $1) => {
-      $2.set_attribute(section, "data-mode", mode());
-      $2.set_attribute(section, "data-active", $2.get(viewState).activeId);
-      $2.set_attribute(section, "aria-modal", focusTrap() ? "true" : void 0);
-      $2.set_attribute(section, "aria-label", ariaLabel());
-      $2.set_attribute(div_3, "aria-orientation", $2.get(isVerticalAxis) ? "vertical" : "horizontal");
-      $2.set_attribute(div_3, "aria-valuemax", $0);
-      $2.set_attribute(div_3, "aria-valuenow", $1);
-      $2.set_attribute(div_3, "aria-valuetext", $2.get(viewState).activeId);
-      $2.set_text(text, $2.get(viewState).activeId);
-    },
-    [
-      () => Math.max(0, $2.get(allowedIds).length - 1),
-      () => Math.max(0, $2.get(activeIdx))
-    ]
-  );
+  $2.template_effect(() => {
+    $2.set_attribute(section, "data-mode", mode());
+    $2.set_attribute(section, "data-active", $2.get(viewState).activeId);
+    $2.set_attribute(section, "aria-modal", focusTrap() ? "true" : void 0);
+    $2.set_attribute(section, "aria-label", ariaLabel());
+    $2.set_attribute(div_3, "aria-orientation", $2.get(isVerticalAxis) ? "vertical" : "horizontal");
+    $2.set_text(text, $2.get(viewState).activeId);
+  });
   $2.append($$anchor, div);
   return $2.pop($$exports);
 }

package/dist/vue.cjs

@@ -2359,6 +2359,7 @@ var BottomSheetEngine = class {
     __publicField(this, "progressWriteSentinel", new WriteSentinel());
     __publicField(this, "isTopSheet", true);
     __publicField(this, "opening", false);
+    __publicField(this, "allowOvershoot", false);
     __publicField(this, "progressPayload", {
       value: 0,
       size: 0
@@ -2911,40 +2912,32 @@ var BottomSheetEngine = class {
     }
     return out;
   }
-  measureContentExtent(vertical) {
+  measureSheetNatural(vertical) {
+    const el = this.element;
     const content = this.scrollContainer;
-    if (!content) return 0;
-    const targets = this.contentTargets();
-    if (targets.length === 0) {
-      return vertical ? content.scrollHeight : content.scrollWidth;
+    if (!content) {
+      return vertical ? el.offsetHeight : el.offsetWidth;
     }
-    let min = Infinity;
-    let max = -Infinity;
-    for (const el of targets) {
-      const r = el.getBoundingClientRect();
-      if (vertical) {
-        if (r.top < min) min = r.top;
-        if (r.bottom > max) max = r.bottom;
-      } else {
-        if (r.left < min) min = r.left;
-        if (r.right > max) max = r.right;
-      }
-    }
-    if (!isFinite(min) || !isFinite(max) || max <= min) {
-      return vertical ? content.scrollHeight : content.scrollWidth;
-    }
-    let pad = 0;
-    if (typeof getComputedStyle !== "undefined") {
-      const cs = getComputedStyle(content);
-      pad = vertical ? (parseFloat(cs.paddingTop) || 0) + (parseFloat(cs.paddingBottom) || 0) : (parseFloat(cs.paddingLeft) || 0) + (parseFloat(cs.paddingRight) || 0);
-    }
-    return max - min + pad;
+    const axis = vertical ? "height" : "width";
+    const sheetStyle = el.style;
+    const cs = content.style;
+    const prevSheet = sheetStyle[axis];
+    const prevFlex = cs.flex;
+    const prevContent = vertical ? cs.height : cs.width;
+    sheetStyle[axis] = "auto";
+    cs.flex = "none";
+    if (vertical) cs.height = "auto";
+    else cs.width = "auto";
+    const natural = vertical ? el.offsetHeight : el.offsetWidth;
+    sheetStyle[axis] = prevSheet;
+    cs.flex = prevFlex;
+    if (vertical) cs.height = prevContent;
+    else cs.width = prevContent;
+    return natural;
   }
   measureFitSize() {
     const vertical = layoutAxis(this.mode) === "height";
-    const handleSize = vertical ? this.handle.offsetHeight : this.handle.offsetWidth;
-    const content = this.scrollContainer;
-    const natural = content ? handleSize + this.measureContentExtent(vertical) : handleSize;
+    const natural = this.measureSheetNatural(vertical);
     const capped = this.maxHeightCap !== void 0 ? Math.min(natural, this.maxHeightCap) : natural;
     if (typeof window === "undefined") return capped;
     const viewport = vertical ? window.innerHeight : window.innerWidth;
@@ -3030,6 +3023,10 @@ var BottomSheetEngine = class {
       this.backdrop.style.opacity = "";
       this.backdrop.style.pointerEvents = "";
     }
+    if (this.anchorHost) {
+      this.anchorHost.style.removeProperty("--bs-size");
+      this.anchorHost.style.removeProperty("--bs-progress");
+    }
     if (this.screenComponent) {
       this.screenComponent.style.opacity = "";
       this.screenComponent.style.display = "";
@@ -3041,6 +3038,7 @@ var BottomSheetEngine = class {
     this.bus.emit(event, payload);
   }
   newCycle() {
+    this.allowOvershoot = false;
     this.currentAbort.abort();
     this.currentAbort = new AbortController();
     return this.currentAbort.signal;
@@ -3106,6 +3104,7 @@ var BottomSheetEngine = class {
       seen.add(p.id);
     }
     this.snaps.setRaw(this.snapPointsRaw);
+    this.clampToMaxHeight();
     this.scrim.invalidateOpacityCache();
   }
   getAllowedRange() {
@@ -3312,9 +3311,13 @@ var BottomSheetEngine = class {
       this.opening = true;
       sheetStack.promote(this.id);
     }
-    void this.animation.animateTo(target.size, velocity).then(() => {
-      this.opening = false;
+    const settleCap = this.snaps.getMaxAxisSize();
+    const settleSize = settleCap > 0 ? Math.min(target.size, settleCap) : target.size;
+    this.allowOvershoot = true;
+    void this.animation.animateTo(settleSize, velocity).then(() => {
       if (signal.aborted) return;
+      this.allowOvershoot = false;
+      this.opening = false;
       this.scrollCache.restore(target.id, previousSize, target.size);
       this.updateAriaSlider();
       this.emit("snap", {
@@ -3346,7 +3349,7 @@ var BottomSheetEngine = class {
   }
   applySize(size) {
     const cap = this.snaps.getMaxAxisSize();
-    const clamped = cap > 0 && size > cap && !this.gesture?.isDragging ? cap : size;
+    const clamped = cap > 0 && size > cap && !this.gesture?.isDragging && !this.allowOvershoot ? cap : size;
     this.size = clamped;
     const offset = cap - clamped;
     const style = this.element.style;
@@ -3939,11 +3942,6 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       const mode = props.mode ?? "bottom";
       return mode === "bottom" || mode === "top";
     });
-    const allowedIds = vue.computed(() => props.allowed ?? props.snapPoints.map((p) => p.id));
-    const activeIdx = vue.computed(() => {
-      const idx = allowedIds.value.indexOf(state.activeId);
-      return idx === -1 ? 0 : idx;
-    });
     const ariaModal = vue.computed(() => props.focusTrap === true);
     __expose({
       snapTo,
@@ -4013,8 +4011,6 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       anchorsKey,
       applyStages,
       isVerticalAxis,
-      allowedIds,
-      activeIdx,
       ariaModal
     };
     Object.defineProperty(__returned__, "__isScriptSetup", {
@@ -4036,12 +4032,7 @@ var _hoisted_3 = [
   "aria-modal",
   "aria-label"
 ];
-var _hoisted_4 = [
-  "aria-orientation",
-  "aria-valuemax",
-  "aria-valuenow",
-  "aria-valuetext"
-];
+var _hoisted_4 = ["aria-orientation"];
 var _hoisted_5 = {
   key: 0,
   class: "bs-header"
@@ -4104,10 +4095,6 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         role: "slider",
         tabindex: "0",
         "aria-orientation": $setup.isVerticalAxis ? "vertical" : "horizontal",
-        "aria-valuemin": "0",
-        "aria-valuemax": Math.max(0, $setup.allowedIds.length - 1),
-        "aria-valuenow": $setup.activeIdx,
-        "aria-valuetext": $setup.state.activeId,
         "aria-label": "Resize sheet"
       }, null, 8, _hoisted_4),
       _ctx.$slots.header ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_5, [vue.renderSlot(_ctx.$slots, "header", { state: $setup.state })])) : vue.createCommentVNode("v-if", true),