@orioncactuscorp/ui 1.6.0 → 1.7.0

package/dist/components/Modal/useModalDrag.js

@@ -1,10 +1,10 @@
-import { useRef as S, useLayoutEffect as ot, useCallback as p, useEffect as kt } from "react";
-import { ocSpring as Ee } from "../../utils/spring.js";
-import { resolveOcMotion as Ct } from "../../utils/motion.js";
-import { resolveModalPopupSnapPositions as Le } from "./snapPoints.js";
-import { setModalBodyTouchScrollLock as It, shouldLockModalBodyTouchScroll as be, shouldIgnoreDragTarget as Ot, getScrollableAncestor as Fe, getBottomTouchDragDecision as Ae, getPopupTouchDragDecision as Be } from "./modalScrollArbitration.js";
-import { createSpringAnimator as Vt } from "../../utils/spring/animator.js";
-const L = {
+import { useRef as S, useLayoutEffect as Z, useCallback as d, useEffect as Mt } from "react";
+import { ocSpring as Ce } from "../../utils/spring.js";
+import { resolveOcMotion as Nt } from "../../utils/motion.js";
+import { resolveModalPopupSnapPositions as Be } from "./snapPoints.js";
+import { setModalBodyTouchScrollLock as Ot, shouldLockModalBodyTouchScroll as Ie, shouldIgnoreDragTarget as Vt, getScrollableAncestor as Ae, getBottomTouchDragDecision as Ne, getPopupTouchDragDecision as Oe } from "./modalScrollArbitration.js";
+import { createSpringAnimator as Ht } from "../../utils/spring/animator.js";
+const M = {
   dragStartThresholdPx: {
     touch: 10,
     mouse: 2
@@ -35,31 +35,31 @@ const L = {
   popupDragFollower: {
     settleDurationFactor: 1 / 6
   }
-}, ke = Ee.snappy({
-  duration: L.settleSpring.durationSeconds * L.popupDragFollower.settleDurationFactor
-}), Ce = [], Ie = [];
-function oe(r) {
+}, Ve = Ce.snappy({
+  duration: M.settleSpring.durationSeconds * M.popupDragFollower.settleDurationFactor
+}), He = [], je = [];
+function le(r) {
   r.cancelable !== !1 && r.preventDefault();
 }
 function b(r, n, i) {
   return Math.min(Math.max(r, n), i);
 }
-function se(r) {
+function ce(r) {
   return [...new Set(r)].sort((n, i) => n - i);
 }
-function Oe(r, n) {
+function ze(r, n) {
   return r.reduce(
     (i, a) => Math.abs(a - n) < Math.abs(i - n) ? a : i
   );
 }
-function ie({
+function ue({
   deltaX: r,
   deltaY: n,
   placement: i
 }) {
   return i === "bottom" ? Math.abs(n) : Math.hypot(r, n);
 }
-function Ve(r, n, i) {
+function _e(r, n, i) {
   if (i === "down")
     return r.find((l) => l > n + 1) ?? r[r.length - 1] ?? 0;
   for (let l = r.length - 1; l >= 0; l -= 1) {
@@ -69,44 +69,55 @@ function Ve(r, n, i) {
   }
   return r[0] ?? 0;
 }
-function Ne(r, n, i, a, l = i) {
-  const y = Ve(r, n, a), T = a === "down" ? Math.max(i, l) : Math.min(i, l);
+function Re(r, n, i, a, l = i) {
+  const y = _e(r, n, a), T = a === "down" ? Math.max(i, l) : Math.min(i, l);
   if (a === "down") {
     if (r.filter(
-      (F) => F > n + 1 && F <= i + 1
+      (k) => k > n + 1 && k <= i + 1
     ).length === 0) return y;
-    const lt = r.filter(
-      (F) => F > n + 1 && F <= T + 1
+    const dt = r.filter(
+      (k) => k > n + 1 && k <= T + 1
     );
-    return lt[lt.length - 1] ?? y;
+    return dt[dt.length - 1] ?? y;
   }
   return r.filter(
-    (E) => E < n - 1 && E >= i - 1
+    (L) => L < n - 1 && L >= i - 1
   ).length === 0 ? y : r.filter(
-    (E) => E < n - 1 && E >= T - 1
+    (L) => L < n - 1 && L >= T - 1
   )[0] ?? y;
 }
-function le(r, n) {
+function pe(r, n) {
   if (n <= 0) return 0;
-  const i = n, { resistance: a } = L.rubberBand;
+  const i = n, { resistance: a } = M.rubberBand;
   return r * a * i / (i + a * r);
 }
-function Nt({
+function jt({
   targetTranslate: r,
   minTranslate: n,
   maxTranslate: i,
   minBoundaryLimit: a,
   maxBoundaryLimit: l
 }) {
-  return r < n ? n - le(n - r, a) : r > i ? i + le(r - i, l) : r;
+  return r < n ? n - pe(n - r, a) : r > i ? i + pe(r - i, l) : r;
 }
-function ce(r) {
+function de(r) {
   return typeof Element > "u" || !(r instanceof Element) ? !1 : !!r.closest('[data-oc-part="handle"], [data-oc-part="header"]');
 }
-function He(r, n) {
+function fe(r) {
+  return typeof Element > "u" || !(r instanceof Element) ? !1 : !!r.closest(
+    '[data-oc-part="handle"], [data-oc-component="modal-navigation"]'
+  );
+}
+function Ue(r) {
+  return typeof Element > "u" || !(r instanceof Element) ? !1 : !!r.closest('[data-oc-component="modal-navigation"]');
+}
+function We(r) {
+  return typeof Element > "u" || !(r instanceof Element) ? null : r.closest('[data-oc-component="modal-navigation"]');
+}
+function $e(r, n) {
   return n ? !0 : r.pointerType ? r.pointerType === "touch" : typeof window > "u" ? !1 : window.matchMedia?.("(pointer: coarse)").matches ?? !1;
 }
-function ue(r, n) {
+function ge(r, n) {
   if (!r.length)
     return {
       minTranslate: 0,
@@ -125,14 +136,14 @@ function ue(r, n) {
     maxTranslate: l
   };
 }
-function pe(r, n) {
+function me(r, n) {
   for (let i = 0; i < r.length; i += 1) {
     const a = "item" in r && typeof r.item == "function" ? r.item(i) : r[i];
     if (a?.identifier === n) return a;
   }
   return null;
 }
-function xe(r) {
+function De(r) {
   if (!r) return { x: 0, y: 0 };
   const n = window.getComputedStyle(r).transform;
   if (!n || n === "none") return { x: 0, y: 0 };
@@ -154,62 +165,62 @@ function xe(r) {
   }
   return { x: 0, y: 0 };
 }
-function Ht(r) {
-  return xe(r).y;
+function zt(r) {
+  return De(r).y;
 }
-function de(r) {
-  return xe(r);
+function he(r) {
+  return De(r);
 }
-function st(r) {
-  if (!r) return;
+function pt(r) {
+  if (!r || !/^-?\d*\.?\d+(?:px)?$/.test(r.trim())) return;
   const n = Number.parseFloat(r);
   return Number.isFinite(n) ? n : void 0;
 }
-function ut() {
+function $() {
   return Date.now();
 }
-function je(r, n) {
-  const i = n - L.releaseVelocity.sampleWindowMs;
+function Ge(r, n) {
+  const i = n - M.releaseVelocity.sampleWindowMs;
   for (; r.length > 2 && (r[1]?.time ?? n) < i; )
     r.shift();
 }
-function pt(r, n) {
-  const i = n.time ?? ut();
+function mt(r, n) {
+  const i = n.time ?? $();
   r.samples.push({
     time: i,
     pageX: n.pageX,
     pageY: n.pageY,
     translateX: n.translateX,
     translateY: n.translateY
-  }), je(r.samples, i);
+  }), Ge(r.samples, i);
 }
-function Yt(r, n) {
+function Lt(r, n) {
   return {
     x: r.startTranslateX + n.pageX - r.startX,
     y: r.startTranslate + n.pageY - r.startY
   };
 }
-function fe(r, n) {
-  const i = Yt(r, n);
-  pt(r, {
+function ye(r, n) {
+  const i = Lt(r, n);
+  mt(r, {
     pageX: n.pageX,
     pageY: n.pageY,
     translateX: i.x,
     translateY: i.y
   });
 }
-function ge({
+function Te({
   session: r,
   fallbackDeltaY: n,
   fallbackElapsed: i
 }) {
-  const a = r.samples[r.samples.length - 1], { maxPxPerSecond: l, sampleWindowMs: f } = L.releaseVelocity;
+  const a = r.samples[r.samples.length - 1], { maxPxPerSecond: l, sampleWindowMs: f } = M.releaseVelocity;
   if (a) {
-    const y = a.time - f, T = r.samples.find((w) => w.time >= y) ?? r.samples[0];
+    const y = a.time - f, T = r.samples.find((D) => D.time >= y) ?? r.samples[0];
     if (T && T !== a) {
-      const w = Math.max(a.time - T.time, 1), D = (a.translateY - T.translateY) / w * 1e3;
-      if (Number.isFinite(D))
-        return b(D, -l, l);
+      const D = Math.max(a.time - T.time, 1), Y = (a.translateY - T.translateY) / D * 1e3;
+      if (Number.isFinite(Y))
+        return b(Y, -l, l);
     }
   }
   return b(
@@ -218,23 +229,23 @@ function ge({
     l
   );
 }
-function me({
+function xe({
   session: r,
   fallbackDelta: n,
   fallbackElapsed: i
 }) {
-  const a = r.samples[r.samples.length - 1], { maxPxPerSecond: l, sampleWindowMs: f } = L.releaseVelocity;
+  const a = r.samples[r.samples.length - 1], { maxPxPerSecond: l, sampleWindowMs: f } = M.releaseVelocity;
   if (a) {
-    const y = a.time - f, T = r.samples.find((w) => w.time >= y) ?? r.samples[0];
+    const y = a.time - f, T = r.samples.find((D) => D.time >= y) ?? r.samples[0];
     if (T && T !== a) {
-      const w = Math.max(a.time - T.time, 1), D = {
-        x: (a.translateX - T.translateX) / w * 1e3,
-        y: (a.translateY - T.translateY) / w * 1e3
+      const D = Math.max(a.time - T.time, 1), Y = {
+        x: (a.translateX - T.translateX) / D * 1e3,
+        y: (a.translateY - T.translateY) / D * 1e3
       };
-      if (Number.isFinite(D.x) && Number.isFinite(D.y))
+      if (Number.isFinite(Y.x) && Number.isFinite(Y.y))
         return {
-          x: b(D.x, -l, l),
-          y: b(D.y, -l, l)
+          x: b(Y.x, -l, l),
+          y: b(Y.y, -l, l)
         };
     }
   }
@@ -251,18 +262,18 @@ function me({
     )
   };
 }
-function ze({
+function Ke({
   currentTranslate: r,
   releaseVelocity: n
 }) {
-  const { lookaheadSeconds: i, maxDistancePx: a } = L.snapProjection;
+  const { lookaheadSeconds: i, maxDistancePx: a } = M.snapProjection;
   return r + b(n * i, -a, a);
 }
-function Re({
+function Je({
   currentTranslate: r,
   releaseVelocity: n
 }) {
-  const { lookaheadSeconds: i, maxDistancePx: a } = L.snapProjection;
+  const { lookaheadSeconds: i, maxDistancePx: a } = M.snapProjection;
   return {
     x: r.x + b(
       n.x * i,
@@ -276,55 +287,119 @@ function Re({
     )
   };
 }
-function _e(r) {
-  return Math.abs(r) / 1e3 > L.releaseVelocity.flickThresholdPxPerMs;
+function Qe(r) {
+  return Math.abs(r) / 1e3 > M.releaseVelocity.flickThresholdPxPerMs;
 }
-function Ue(r) {
-  return Math.hypot(r.x, r.y) / 1e3 > L.releaseVelocity.flickThresholdPxPerMs;
+function Ze(r) {
+  return Math.hypot(r.x, r.y) / 1e3 > M.releaseVelocity.flickThresholdPxPerMs;
 }
-function it(r, n) {
+function G(r, n) {
   return Math.hypot(r.x - n.x, r.y - n.y);
 }
-function he(r, n) {
+function Pe(r, n) {
   return r.reduce(
-    (i, a) => it(a, n) < it(i, n) ? a : i
+    (i, a) => G(a, n) < G(i, n) ? a : i
   );
 }
-function We({
+function qe({
   currentTranslate: r,
   releaseVelocity: n,
   targets: i
 }) {
-  const a = Re({
+  const a = Je({
     currentTranslate: r,
     releaseVelocity: n
   });
-  if (!Ue(n))
-    return he(i, r);
+  if (!Ze(n))
+    return Pe(i, r);
   const l = i.filter((f) => {
     const y = f.x - r.x, T = f.y - r.y;
     return y * n.x + T * n.y > 0;
   });
-  return he(
+  return Pe(
     l.length ? l : i,
     a
   );
 }
-function $e({
+function Xe(r) {
+  return r === "top" || r.startsWith("top-") ? "top" : r === "bottom" || r.startsWith("bottom-") ? "bottom" : "center";
+}
+function tr({
+  target: r,
+  targets: n
+}) {
+  const i = n.filter((a) => a !== r);
+  if (i.length)
+    return i.reduce(
+      (a, l) => Math.min(a, G(r, l)),
+      Number.POSITIVE_INFINITY
+    );
+}
+function er({
+  closeThreshold: r,
+  currentTarget: n,
+  surfaceSize: i,
+  targets: a
+}) {
+  const l = Xe(n.key), f = l === "center" ? Math.min(i.width, i.height) : i.height, y = Math.max(
+    M.dismissal.minDistancePx,
+    f * r
+  );
+  if (l !== "center") return y;
+  const T = tr({
+    target: n,
+    targets: a
+  });
+  return !T || !Number.isFinite(T) ? y : Math.max(y, T * 0.75);
+}
+function rr({
+  currentTarget: r,
+  currentTranslate: n
+}) {
+  switch (Xe(r.key)) {
+    case "top":
+      return r.y - n.y;
+    case "bottom":
+      return n.y - r.y;
+    case "center":
+      return G(r, n);
+  }
+}
+function nr({
+  closeThreshold: r,
+  currentTarget: n,
+  currentTranslate: i,
+  releaseTarget: a,
+  surfaceSize: l,
+  targets: f
+}) {
+  if (a.key !== n.key) return !1;
+  const y = rr({
+    currentTarget: n,
+    currentTranslate: i
+  });
+  return y <= 0 ? !1 : y >= er({
+    closeThreshold: r,
+    currentTarget: n,
+    surfaceSize: l,
+    targets: f
+  });
+}
+function ar({
   presentationState: r,
   releaseTranslate: n,
   visibleTranslate: i
 }) {
   return r !== "visible" || Math.abs(n - i) > 1;
 }
-function Ge({
+function or({
   drag: r,
   placement: n,
   snapPositionCount: i
 }) {
-  return n === "popup" && r === "content" && i > 0;
+  return n === "popup" && (r === "content" || r === "handle") && i > 0;
 }
-function Ke({
+function sr({
   dismissible: r,
   peekTranslate: n,
   sheetHeight: i,
@@ -335,11 +410,11 @@ function Ke({
     minTranslate: 0
   };
 }
-function ye(r, n = 1) {
+function we(r, n = 1) {
   const i = Math.max(n, 1);
   return r && Math.abs(r.maxTranslate - r.minTranslate) || i;
 }
-function Te({
+function ve({
   limit: r,
   viewportSize: n,
   viewportLimitRatio: i
@@ -347,26 +422,26 @@ function Te({
   const a = Math.max(r, 0);
   return n <= 0 ? a : Math.min(a, n * i);
 }
-function qe({
+function ir({
   minTranslate: r,
   sheetHeight: n,
   surfaceMotion: i
 }) {
-  const a = i.parentElement?.getBoundingClientRect(), l = a?.top ?? 0, f = a && a.height > 0 ? a.height : window.innerHeight, y = i.getBoundingClientRect(), T = Ht(i), w = y.top - T + r, D = Math.max(w - l, 0), { observedViewportLimitRatio: E } = L.rubberBand;
+  const a = i.parentElement?.getBoundingClientRect(), l = a?.top ?? 0, f = a && a.height > 0 ? a.height : window.innerHeight, y = i.getBoundingClientRect(), T = zt(i), D = y.top - T + r, Y = Math.max(D - l, 0), { observedViewportLimitRatio: L } = M.rubberBand;
   return {
-    minBoundaryLimit: Te({
-      limit: D,
+    minBoundaryLimit: ve({
+      limit: Y,
       viewportSize: f,
-      viewportLimitRatio: E.top
+      viewportLimitRatio: L.top
     }),
-    maxBoundaryLimit: Te({
+    maxBoundaryLimit: ve({
       limit: n,
       viewportSize: f,
-      viewportLimitRatio: E.bottom
+      viewportLimitRatio: L.bottom
     })
   };
 }
-function Je({
+function lr({
   rubberBand: r,
   targetTranslate: n,
   sheetHeight: i,
@@ -375,21 +450,21 @@ function Je({
   rubberBandLimits: f
 }) {
   const y = b(
-    r ? Nt({
+    r ? jt({
       targetTranslate: n,
       ...f,
       ...l
     }) : n,
     l.minTranslate - f.minBoundaryLimit,
     l.maxTranslate + f.maxBoundaryLimit
-  ), T = Math.max(-y, 0), w = Math.max(y, 0), D = a > 0 ? a : i, E = D > 0 ? 1 - w / Math.max(D, 1) : 0;
+  ), T = Math.max(-y, 0), D = Math.max(y, 0), Y = a > 0 ? a : i, L = Y > 0 ? 1 - D / Math.max(Y, 1) : 0;
   return {
     translate: y,
     overshootFillHeight: T,
-    backdropOpacity: b(E, 0, 1)
+    backdropOpacity: b(L, 0, 1)
   };
 }
-function ar({
+function mr({
   enabled: r,
   drag: n,
   open: i,
@@ -397,21 +472,22 @@ function ar({
   surfaceMotionRef: l,
   backdropRef: f,
   bodyNode: y,
-  snapHeights: T = Ce,
-  snapPositions: w = Ie,
-  defaultSnapPosition: D,
-  peekHeight: E,
-  peekFallback: lt,
-  presentationState: F,
-  setPresentationState: Mt,
-  requestClose: dt,
-  canCloseAttempt: jt,
-  dismissible: R = !0,
-  visibleTranslate: N = 0,
-  closeThreshold: Et = 0.35,
-  scrollLockTimeout: zt = 500
+  snapHeights: T = He,
+  snapPositions: D = je,
+  defaultSnapPosition: Y,
+  peekHeight: L,
+  peekFallback: dt,
+  presentationState: k,
+  setPresentationState: bt,
+  requestClose: q,
+  canCloseAttempt: _t,
+  dismissible: N = !0,
+  visibleTranslate: H = 0,
+  closeThreshold: ft = 0.35,
+  scrollLockTimeout: Rt = 500,
+  popupSnapLayoutVersion: Ut = 0
 }) {
-  const x = S({
+  const w = S({
     dragging: !1,
     allowed: !1,
     chrome: !1,
@@ -430,71 +506,71 @@ function ar({
     samples: [],
     pointerId: null,
     touchId: null
-  }), U = S(y), Rt = S(!1), _t = S(!1), Pe = S((t) => {
+  }), K = S(y), Wt = S(!1), $t = S(!1), Se = S((t) => {
     t.preventDefault();
-  }), ft = S(0), Lt = S(!1), H = S(null), C = S(
+  }), ht = S(0), kt = S(!1), j = S(null), O = S(
     null
-  ), gt = S(null), $ = S(null), j = S(null), bt = S(!1), Ft = S(!1), At = S(!1), G = S(!1), X = Ge({
+  ), yt = S(null), _ = S(null), gt = S(0), z = S(null), Ft = S(!1), Ct = S(!1), Bt = S(!1), tt = S(!1), v = or({
     drag: n,
     placement: a,
-    snapPositionCount: w.length
-  }), Ut = `${D ?? ""}:${w.join("|")}`, Wt = S(w), mt = S(D);
-  ot(() => {
-    Wt.current = w, mt.current = D;
-  }, [D, Ut, w]), ot(() => {
-    const t = U.current;
-    t && t !== y && It(t, !1), U.current = y, Rt.current && It(y, !0);
+    snapPositionCount: D.length
+  }), Gt = `${Y ?? ""}:${D.join("|")}`, Kt = S(D), Tt = S(Y);
+  Z(() => {
+    Kt.current = D, Tt.current = Y;
+  }, [Y, Gt, D]), Z(() => {
+    const t = K.current;
+    t && t !== y && Ot(t, !1), K.current = y, Wt.current && Ot(y, !0);
   }, [y]);
-  const K = p((t) => {
-    Rt.current = t, It(U.current, t);
-  }, []), q = p((t) => {
-    if (_t.current === t) return;
-    _t.current = t;
-    const e = Pe.current;
+  const et = d((t) => {
+    Wt.current = t, Ot(K.current, t);
+  }, []), rt = d((t) => {
+    if ($t.current === t) return;
+    $t.current = t;
+    const e = Se.current;
     if (t) {
       document.addEventListener("selectstart", e, !0), document.addEventListener("dragstart", e, !0);
       return;
     }
     document.removeEventListener("selectstart", e, !0), document.removeEventListener("dragstart", e, !0);
-  }, []), ht = p(
+  }, []), xt = d(
     ({ chrome: t, target: e }) => {
-      const o = be({
+      const o = Ie({
         target: e,
         chrome: t,
-        bodyNode: U.current
+        bodyNode: K.current
       });
-      return K(o), o;
+      return et(o), o;
     },
-    [K]
-  ), I = p(() => l.current?.getBoundingClientRect().height ?? window.innerHeight, [l]), $t = p(() => {
-    if (E !== void 0) return E;
-    if (lt === "header")
+    [et]
+  ), V = d(() => l.current?.getBoundingClientRect().height ?? window.innerHeight, [l]), Jt = d(() => {
+    if (L !== void 0) return L;
+    if (dt === "header")
       return l.current?.querySelector('[data-oc-part="header"]')?.getBoundingClientRect().height ?? void 0;
-  }, [lt, E, l]), A = p(() => {
-    const t = $t();
+  }, [dt, L, l]), C = d(() => {
+    const t = Jt();
     if (t === void 0 || t <= 0) return 0;
-    const e = I();
+    const e = V();
     return b(e - t, 0, e);
-  }, [$t, I]), Bt = p(
-    () => F === "peeked" ? A() : N,
-    [A, F, N]
-  ), yt = p(() => {
+  }, [Jt, V]), It = d(
+    () => k === "peeked" ? C() : H,
+    [C, k, H]
+  ), Pt = d(() => {
     const t = l.current;
-    if (!t) return Bt();
-    const e = st(
+    if (!t) return It();
+    const e = pt(
       t.style.getPropertyValue("--oc-modal-translate-y")
     );
     if (e !== void 0) return e;
-    const o = st(
+    const o = pt(
       window.getComputedStyle(t).getPropertyValue("--oc-modal-translate-y")
     );
-    return o !== void 0 ? o : Bt();
-  }, [Bt, l]), Tt = p(() => {
+    return o !== void 0 ? o : It();
+  }, [It, l]), wt = d(() => {
     const t = l.current;
     if (!t) return { x: 0, y: 0 };
-    const e = st(
+    const e = pt(
       t.style.getPropertyValue("--oc-modal-translate-x")
-    ), o = st(
+    ), o = pt(
       t.style.getPropertyValue("--oc-modal-translate-y")
     );
     if (e !== void 0 || o !== void 0)
@@ -504,33 +580,33 @@ function ar({
       };
     const c = window.getComputedStyle(t);
     return {
-      x: st(c.getPropertyValue("--oc-modal-translate-x")) ?? 0,
-      y: st(c.getPropertyValue("--oc-modal-translate-y")) ?? 0
+      x: pt(c.getPropertyValue("--oc-modal-translate-x")) ?? 0,
+      y: pt(c.getPropertyValue("--oc-modal-translate-y")) ?? 0
     };
-  }, [l]), xt = p(() => {
-    const t = yt(), e = Ht(l.current);
+  }, [l]), vt = d(() => {
+    const t = Pt(), e = zt(l.current);
     return Math.abs(e - t) > 1 ? e : t;
-  }, [yt, l]), J = p(() => {
-    const t = Tt(), e = de(l.current);
-    return it(e, t) > 1 ? e : t;
-  }, [Tt, l]), B = p(
+  }, [Pt, l]), nt = d(() => {
+    const t = wt(), e = he(l.current);
+    return G(e, t) > 1 ? e : t;
+  }, [wt, l]), B = d(
     (t, {
       active: e,
-      nextDismissible: o = R,
+      nextDismissible: o = N,
       rubberBand: c = !1
     }) => {
       const s = l.current;
       if (!s) return;
-      const u = I(), d = s.parentElement, g = A(), m = Ke({
+      const u = V(), p = s.parentElement, g = C(), m = sr({
         dismissible: o,
         peekTranslate: g,
         sheetHeight: u,
-        visibleTranslate: N
-      }), h = qe({
+        visibleTranslate: H
+      }), h = ir({
         minTranslate: m.minTranslate,
         sheetHeight: u,
         surfaceMotion: s
-      }), M = Je({
+      }), P = lr({
         rubberBand: c,
         targetTranslate: t,
         sheetHeight: u,
@@ -538,107 +614,109 @@ function ar({
         bounds: m,
         rubberBandLimits: h
       });
-      x.current.lastTranslate = M.translate, s.style.setProperty(
+      w.current.lastTranslate = P.translate, s.style.setProperty(
         "--oc-modal-translate-y",
-        `${M.translate}px`
+        `${P.translate}px`
       ), s.style.setProperty(
         "--_-modal-elevation-shadow-opacity",
-        String(1 - M.backdropOpacity)
-      ), s.dataset.ocModalDragging = e ? "true" : "false", d?.style.setProperty(
+        String(1 - P.backdropOpacity)
+      ), s.dataset.ocModalDragging = e ? "true" : "false", p?.style.setProperty(
         "--oc-modal-overshoot-fill-height",
-        `${M.overshootFillHeight}px`
-      ), d && (d.dataset.ocModalDragging = e ? "true" : "false"), e ? s.style.setProperty("transition", "none") : s.style.removeProperty("transition"), f.current && (f.current.style.setProperty(
+        `${P.overshootFillHeight}px`
+      ), p && (p.dataset.ocModalDragging = e ? "true" : "false"), e ? s.style.setProperty("transition", "none") : s.style.removeProperty("transition"), f.current && (f.current.style.setProperty(
         "--oc-modal-backdrop-opacity",
-        String(M.backdropOpacity)
+        String(P.backdropOpacity)
       ), f.current.style.transition = e ? "none" : "");
     },
     [
       f,
-      R,
-      A,
-      I,
+      N,
+      C,
+      V,
       l,
-      N
+      H
     ]
-  ), Q = p(() => {
-    const t = l.current, e = Wt.current;
+  ), at = d(() => {
+    const t = l.current, e = Kt.current;
     if (!(!t || !e.length))
-      return Le({
-        defaultSnapPosition: mt.current,
+      return Be({
+        defaultSnapPosition: Tt.current,
         snapPositions: e,
         surfaceMotion: t
       });
-  }, [l]), Z = p(
+  }, [l]), R = d(
     ({ destroy: t = !0 } = {}) => {
-      t && C.current?.destroy(), C.current = null, gt.current = null;
+      t && O.current?.destroy(), O.current = null, yt.current = null;
     },
     []
-  ), Y = p(
+  ), E = d(
     (t, { active: e }) => {
       const o = l.current;
       if (!o) return;
-      const c = Q(), s = c ? o.getBoundingClientRect() : void 0, u = c ? ue(c.targets, "x") : void 0, d = c ? ue(c.targets, "y") : void 0, g = ye(u, s?.width), m = ye(d, s?.height), h = c ? {
-        x: Nt({
+      const c = at(), s = c ? o.getBoundingClientRect() : void 0, u = c ? ge(c.targets, "x") : void 0, p = c ? ge(c.targets, "y") : void 0, g = we(u, s?.width), m = we(p, s?.height), h = c ? {
+        x: jt({
           targetTranslate: t.x,
           minTranslate: u?.minTranslate ?? 0,
           maxTranslate: u?.maxTranslate ?? 0,
           minBoundaryLimit: g,
           maxBoundaryLimit: g
         }),
-        y: Nt({
+        y: jt({
           targetTranslate: t.y,
-          minTranslate: d?.minTranslate ?? 0,
-          maxTranslate: d?.maxTranslate ?? 0,
+          minTranslate: p?.minTranslate ?? 0,
+          maxTranslate: p?.maxTranslate ?? 0,
           minBoundaryLimit: m,
           maxBoundaryLimit: m
         })
       } : t;
-      x.current.lastTranslateX = h.x, x.current.lastTranslate = h.y, o.style.setProperty(
+      w.current.lastTranslateX = h.x, w.current.lastTranslate = h.y;
+      const P = e ? void 0 : t.settledTranslate;
+      o.style.setProperty(
         "--oc-modal-translate-x",
-        `${h.x}px`
+        P?.x ?? `${h.x}px`
       ), o.style.setProperty(
         "--oc-modal-translate-y",
-        `${h.y}px`
+        P?.y ?? `${h.y}px`
       ), o.dataset.ocModalDragging = e ? "true" : "false", o.parentElement && (o.parentElement.dataset.ocModalDragging = e ? "true" : "false"), o.style.transition = e ? "none" : "";
     },
-    [Q, l]
-  ), v = p(() => {
-    H.current?.destroy(), H.current = null, Z();
-  }, [Z]), tt = p(
-    (t, e = R) => {
-      v(), B(t, {
+    [at, l]
+  ), X = d(() => {
+    j.current?.destroy(), j.current = null, R();
+  }, [R]), ot = d(
+    (t, e = N) => {
+      X(), B(t, {
         active: !0,
         nextDismissible: e,
         rubberBand: !0
       });
     },
-    [B, v, R]
-  ), Gt = p(() => {
-    const t = xt(), e = J();
-    return H.current !== null || C.current !== null ? (v(), a === "popup" && it(e, { x: 0, y: 0 }) > 0.5 ? Y(e, { active: !1 }) : a === "bottom" && Math.abs(t) > 0.5 && B(t, { active: !1 }), { startTranslate: t, startTranslatePoint: e }) : { startTranslate: t, startTranslatePoint: e };
+    [B, X, N]
+  ), Qt = d(() => {
+    const t = vt(), e = nt();
+    return j.current !== null || O.current !== null ? (X(), a === "popup" && G(e, { x: 0, y: 0 }) > 0.5 ? E(e, { active: !1 }) : a === "bottom" && Math.abs(t) > 0.5 && B(t, { active: !1 }), { startTranslate: t, startTranslatePoint: e }) : { startTranslate: t, startTranslatePoint: e };
   }, [
-    Y,
+    E,
     B,
-    v,
-    xt,
-    J,
+    X,
+    vt,
+    nt,
     a
-  ]), P = p(() => {
+  ]), x = d(() => {
     const t = l.current;
     t && (t.dataset.ocModalDragging = "false", t.style.removeProperty("transition"), t.parentElement && (t.parentElement.dataset.ocModalDragging = "false"), f.current?.style.removeProperty("transition"));
-  }, [f, l]), Kt = p(() => {
+  }, [f, l]), Zt = d(() => {
     const t = l.current, e = t?.parentElement;
-    x.current.lastTranslate = 0, t?.style.removeProperty("--oc-modal-translate-y"), t?.style.removeProperty("--_-modal-elevation-shadow-opacity"), e?.style.removeProperty("--oc-modal-overshoot-fill-height"), f.current?.style.removeProperty("--oc-modal-backdrop-opacity"), P();
-  }, [f, P, l]), qt = p(
+    w.current.lastTranslate = 0, t?.style.removeProperty("--oc-modal-translate-y"), t?.style.removeProperty("--_-modal-elevation-shadow-opacity"), e?.style.removeProperty("--oc-modal-overshoot-fill-height"), f.current?.style.removeProperty("--oc-modal-backdrop-opacity"), x();
+  }, [f, x, l]), qt = d(
     ({
       preserveSnapPosition: t = !1,
       resetY: e = !0
     } = {}) => {
       const o = l.current;
-      o && (t || ($.current = null), x.current.lastTranslateX = 0, o.style.removeProperty("--oc-modal-translate-x"), e && (x.current.lastTranslate = 0, o.style.removeProperty("--oc-modal-translate-y")), P());
+      o && (t || (_.current = null), w.current.lastTranslateX = 0, o.style.removeProperty("--oc-modal-translate-x"), e && (w.current.lastTranslate = 0, o.style.removeProperty("--oc-modal-translate-y")), x());
     },
-    [P, l]
-  ), k = p(
+    [x, l]
+  ), I = d(
     (t, {
       initialVelocity: e = 0,
       intent: o = "sheet",
@@ -646,23 +724,23 @@ function ar({
       from: s,
       onComplete: u
     } = {}) => {
-      const d = l.current;
-      if (!d) return;
-      v();
-      const g = s ?? Ht(d);
+      const p = l.current;
+      if (!p) return;
+      X();
+      const g = s ?? zt(p);
       if (Math.abs(g - t) < 0.5) {
-        B(t, { active: !1 }), P(), u?.();
+        B(t, { active: !1 }), x(), u?.();
         return;
       }
       B(g, { active: !0 });
-      const m = Ct({
-        element: d,
+      const m = Nt({
+        element: p,
         intent: o,
         phase: c,
         reduced: "preserve",
         reducedMotion: !1,
         property: "transform"
-      }), h = Vt({
+      }), h = Ht({
         value: g,
         target: t,
         velocity: e,
@@ -670,38 +748,38 @@ function ar({
         epsilon: 0.5,
         velocityEpsilon: 50,
         stabilityWindow: 0.02,
-        onUpdate: (M) => {
-          B(M, { active: !0 });
+        onUpdate: (P) => {
+          B(P, { active: !0 });
         },
         onComplete: () => {
-          H.current === h && (H.current = null), B(t, { active: !1 }), P(), u?.();
+          j.current === h && (j.current = null), B(t, { active: !1 }), x(), u?.();
         }
       });
-      H.current = h;
+      j.current = h;
     },
-    [B, v, P, l]
-  ), _ = p(
+    [B, X, x, l]
+  ), U = d(
     (t, {
       from: e,
       initialVelocity: o = { x: 0, y: 0 }
     } = {}) => {
       const c = l.current;
       if (!c) return;
-      v();
-      const s = e ?? de(c), u = { x: t.x, y: t.y };
-      if (it(s, u) < 0.5) {
-        Y(u, { active: !1 }), P();
+      X();
+      const s = e ?? he(c), u = { x: t.x, y: t.y };
+      if (G(s, u) < 0.5) {
+        E(t, { active: !1 }), x();
         return;
       }
-      Y(s, { active: !0 });
-      const g = Ct({
+      E(s, { active: !0 });
+      const g = Nt({
         element: c,
         intent: "gesture",
         phase: "release",
         reduced: "preserve",
         reducedMotion: !1,
         property: "transform"
-      }), m = Vt({
+      }), m = Ht({
         value: s,
         target: u,
         velocity: o,
@@ -710,79 +788,79 @@ function ar({
         velocityEpsilon: 50,
         stabilityWindow: 0.02,
         onUpdate: (h) => {
-          Y(h, { active: !0 });
+          E(h, { active: !0 });
         },
         onComplete: () => {
-          H.current === m && (H.current = null), Y(u, { active: !1 }), P();
+          j.current === m && (j.current = null), E(t, { active: !1 }), x();
         }
       });
-      H.current = m;
+      j.current = m;
     },
     [
-      Y,
-      v,
-      P,
+      E,
+      X,
+      x,
       l
     ]
-  ), et = p(() => {
-    const t = C.current;
+  ), st = d(() => {
+    const t = O.current;
     if (!t) return null;
     const e = t.sample();
-    return Y(e.value, { active: !0 }), e;
-  }, [Y]), Jt = p(
+    return E(e.value, { active: !0 }), e;
+  }, [E]), te = d(
     (t) => {
       if (!l.current) return null;
-      v(), Y(t, { active: !0 });
-      const o = Vt({
+      X(), E(t, { active: !0 });
+      const o = Ht({
         value: t,
         target: t,
-        spring: ke,
+        spring: Ve,
         autoplay: !1,
         epsilon: 0.5,
         velocityEpsilon: 50,
         stabilityWindow: 0.02,
         onUpdate: (c) => {
-          Y(c, { active: !0 });
+          E(c, { active: !0 });
         },
         onComplete: () => {
-          const c = gt.current;
-          !c || C.current !== o || (Z({ destroy: !1 }), Y(c, { active: !1 }), P());
+          const c = yt.current;
+          !c || O.current !== o || (R({ destroy: !1 }), E(c, { active: !1 }), x());
         }
       });
-      return C.current = o, o;
+      return O.current = o, o;
     },
     [
-      Y,
-      v,
-      Z,
-      P,
+      E,
+      X,
+      R,
+      x,
       l
     ]
-  ), Qt = p(
+  ), ee = d(
     (t) => {
-      const e = C.current ?? Jt(J());
-      e && (gt.current = null, e.setTarget(t));
+      const e = O.current ?? te(nt());
+      e && (yt.current = null, e.setTarget(t));
     },
-    [J, Jt]
-  ), rt = p(
+    [nt, te]
+  ), it = d(
     (t, e) => {
-      const o = Yt(t, e);
-      return Qt(o), et(), o;
+      const o = Lt(t, e);
+      return ee(o), st(), o;
     },
-    [et, Qt]
-  ), Pt = p(
+    [st, ee]
+  ), Dt = d(
     (t) => {
-      const e = l.current, o = C.current;
+      const e = l.current, o = O.current;
       if (!e || !o) {
-        _(t);
+        U(t);
         return;
       }
-      const s = et() ? Tt() : o.value, u = { x: t.x, y: t.y };
-      if (it(s, u) < 0.5) {
-        Z(), Y(u, { active: !1 }), P();
+      const s = st() ? wt() : o.value, u = { x: t.x, y: t.y };
+      if (G(s, u) < 0.5) {
+        R(), E(t, { active: !1 }), x();
         return;
       }
-      const d = Ct({
+      const p = Nt({
         element: e,
         intent: "gesture",
         phase: "release",
@@ -790,160 +868,196 @@ function ar({
         reducedMotion: !1,
         property: "transform"
       });
-      gt.current = u, o.setTarget(u, { spring: d.spring });
+      yt.current = t, o.setTarget(u, { spring: p.spring });
     },
     [
-      Y,
-      Z,
-      P,
-      Tt,
-      et,
-      _,
+      E,
+      R,
+      x,
+      wt,
+      st,
+      U,
       l
     ]
-  ), wt = p(
+  ), lt = d(
     ({
       key: t,
       settle: e
     }) => {
-      if (x.current.dragging) return !1;
-      const o = Q();
+      if (w.current.dragging) return !1;
+      const o = at();
       if (!o) return !1;
       const c = (t ? o.targets.find((s) => s.key === t) : void 0) ?? o.defaultTarget;
-      return $.current = c.key, e ? _(c) : (v(), Y(c, { active: !1 }), P()), !0;
+      return _.current = c.key, e ? U(c) : (X(), E(c, { active: !1 }), x()), !0;
     },
     [
-      Y,
-      v,
-      P,
-      Q,
-      _
+      E,
+      X,
+      x,
+      at,
+      U
     ]
-  ), Zt = p(
+  ), re = d(
     (t, { from: e, initialVelocity: o = 0 }) => {
-      k(t, {
+      I(t, {
         from: e,
         initialVelocity: o,
         onComplete: () => {
-          dt({ reason: "drag-dismiss" }, { skipAttempt: !0 });
+          q({ reason: "drag-dismiss" }, { skipAttempt: !0 });
         }
       });
     },
-    [dt, k]
+    [q, I]
   );
-  kt(
+  Mt(
     () => () => {
-      v(), q(!1), l.current && P();
+      X(), rt(!1), l.current && x();
     },
     [
-      v,
-      P,
-      q,
+      X,
+      x,
+      rt,
       l
     ]
-  ), ot(() => {
+  ), Z(() => {
     if (!i || !r || a !== "bottom") {
-      bt.current = i;
+      Ft.current = i;
       return;
     }
+    Ct.current = !0;
+    const t = Ft.current;
     Ft.current = !0;
-    const t = bt.current;
-    bt.current = !0;
-    const e = F === "peeked" ? A() : N;
+    const e = k === "peeked" ? C() : H;
     if (!t) {
-      const o = I();
-      B(o, { active: !0 }), k(e, {
+      const o = V();
+      B(o, { active: !0 }), I(e, {
         from: o,
         intent: "sheet",
         phase: "enter"
       });
       return;
     }
-    if (F === "peeked") {
-      k(A());
+    if (k === "peeked") {
+      I(C());
       return;
     }
-    if (Lt.current) {
-      Lt.current = !1;
+    if (kt.current) {
+      kt.current = !1;
       return;
     }
-    k(N);
+    I(H);
   }, [
     r,
-    A,
-    I,
+    C,
+    V,
     i,
     a,
-    F,
-    B,
     k,
-    N
-  ]), ot(() => {
-    a !== "bottom" && Ft.current && (Ft.current = !1, v(), Kt());
-  }, [v, a, Kt]), ot(() => {
-    if (!i || !r || !X) {
-      const c = !i && a === "popup" && G.current, s = i && a !== "popup" && G.current;
-      G.current && !c && (j.current !== null && (window.cancelAnimationFrame(j.current), j.current = null), v(), qt({
+    B,
+    I,
+    H
+  ]), Z(() => {
+    a !== "bottom" && Ct.current && (Ct.current = !1, X(), Zt());
+  }, [X, a, Zt]), Z(() => {
+    if (!i || !r || !v) {
+      const c = !i && a === "popup" && tt.current, s = i && a !== "popup" && tt.current;
+      tt.current && !c && (z.current !== null && (window.cancelAnimationFrame(z.current), z.current = null), X(), qt({
         preserveSnapPosition: s
-      })), G.current && c && (v(), P()), At.current = i && a === "popup", G.current = !1;
+      })), tt.current && c && (X(), x()), Bt.current = i && a === "popup", tt.current = !1;
       return;
     }
-    const t = At.current;
-    At.current = !0, G.current = !0;
+    const t = Bt.current;
+    Bt.current = !0, tt.current = !0;
     let e = null;
-    const o = (c) => wt({
+    const o = (c) => lt({
       key: c,
       settle: t
     });
     return o(
-      $.current ?? mt.current
+      _.current ?? Tt.current
     ) || (e = window.requestAnimationFrame(() => {
       e = null, o(
-        $.current ?? mt.current
+        _.current ?? Tt.current
       );
     })), () => {
       e !== null && window.cancelAnimationFrame(e);
     };
   }, [
-    v,
+    X,
     r,
-    P,
+    x,
     i,
     a,
-    Ut,
-    X,
+    Gt,
+    v,
     qt,
-    wt
-  ]), ot(() => {
-    if (!i || !r || !X) return;
+    lt
+  ]), Z(() => {
+    if (!i || !r || !v) return;
     const t = () => {
-      x.current.dragging || j.current === null && (j.current = window.requestAnimationFrame(() => {
-        j.current = null, !x.current.dragging && wt({
-          key: $.current,
+      w.current.dragging || z.current === null && (z.current = window.requestAnimationFrame(() => {
+        z.current = null, !w.current.dragging && lt({
+          key: _.current,
           settle: !1
         });
       }));
     };
     window.addEventListener("resize", t), window.visualViewport?.addEventListener("resize", t);
-    const e = l.current, o = e?.parentElement, c = typeof ResizeObserver > "u" ? null : new ResizeObserver(t);
-    return c && (e && c.observe(e), o && c.observe(o)), () => {
-      window.removeEventListener("resize", t), window.visualViewport?.removeEventListener("resize", t), c?.disconnect(), j.current !== null && (window.cancelAnimationFrame(j.current), j.current = null);
+    const e = l.current, o = e?.parentElement, c = typeof ResizeObserver > "u" ? null : new ResizeObserver(t), s = (u) => {
+      e && u.target instanceof Element && e.contains(u.target) && t();
+    };
+    return c && (e && c.observe(e), o && c.observe(o)), e?.addEventListener(
+      "transitionend",
+      s,
+      !0
+    ), e?.addEventListener(
+      "transitioncancel",
+      s,
+      !0
+    ), () => {
+      window.removeEventListener("resize", t), window.visualViewport?.removeEventListener("resize", t), e?.removeEventListener(
+        "transitionend",
+        s,
+        !0
+      ), e?.removeEventListener(
+        "transitioncancel",
+        s,
+        !0
+      ), c?.disconnect(), z.current !== null && (window.cancelAnimationFrame(z.current), z.current = null);
     };
   }, [
     r,
     i,
-    X,
+    v,
     l,
-    wt
+    lt
+  ]), Z(() => {
+    if (Ut <= 0 || !i || !r || !v)
+      return;
+    let t = window.requestAnimationFrame(() => {
+      t = null, lt({
+        key: _.current,
+        settle: !1
+      });
+    });
+    return () => {
+      t !== null && window.cancelAnimationFrame(t);
+    };
+  }, [
+    r,
+    i,
+    v,
+    Ut,
+    lt
   ]);
-  const te = p(
+  const ne = d(
     (t, e, o) => {
-      if (typeof Element > "u" || !(t instanceof Element) || Ot(t)) return !1;
-      const c = Date.now(), s = e > 0, u = Fe(t, U.current);
-      return !o && u && s && u.scrollTop > 0 || !o && ft.current && c - ft.current < zt && Math.abs(yt()) <= 1 ? (ft.current = c, !1) : !0;
+      if (typeof Element > "u" || !(t instanceof Element) || Vt(t)) return !1;
+      const c = Date.now(), s = e > 0, u = Ae(t, K.current);
+      return !o && u && s && u.scrollTop > 0 || !o && ht.current && c - ht.current < Rt && Math.abs(Pt()) <= 1 ? (ht.current = c, !1) : !0;
     },
-    [yt, zt]
-  ), vt = p(
+    [Pt, Rt]
+  ), Xt = d(
     ({
       chrome: t,
       pointerId: e = null,
@@ -952,8 +1066,8 @@ function ar({
       startY: s,
       touchId: u = null
     }) => {
-      const { startTranslate: d, startTranslatePoint: g } = Gt(), m = ut();
-      x.current = {
+      const { startTranslate: p, startTranslatePoint: g } = Qt(), m = $();
+      w.current = {
         dragging: !0,
         allowed: !1,
         chrome: t,
@@ -965,9 +1079,9 @@ function ar({
         lastX: c,
         lastY: s,
         startTranslateX: g.x,
-        startTranslate: d,
+        startTranslate: p,
         lastTranslateX: g.x,
-        lastTranslate: d,
+        lastTranslate: p,
         startTime: m,
         samples: [
           {
@@ -975,23 +1089,23 @@ function ar({
             pageX: c,
             pageY: s,
             translateX: g.x,
-            translateY: d
+            translateY: p
           }
         ],
         pointerId: e,
         touchId: u
       };
     },
-    [Gt]
-  ), nt = p(
+    [Qt]
+  ), ct = d(
     (t) => {
-      t.source === "touch" ? K(!1) : t.source === "pointer" && q(!1), t.dragging = !1, t.allowed = !1, t.closeAllowed = null, t.started = !1, t.source = null, t.startX = 0, t.startY = 0, t.lastX = 0, t.lastY = 0, t.startTranslateX = 0, t.startTranslate = 0, t.lastTranslateX = 0, t.lastTranslate = 0, t.pointerId = null, t.touchId = null;
+      t.source === "touch" ? et(!1) : t.source === "pointer" && rt(!1), t.dragging = !1, t.allowed = !1, t.closeAllowed = null, t.started = !1, t.source = null, t.startX = 0, t.startY = 0, t.lastX = 0, t.lastY = 0, t.startTranslateX = 0, t.startTranslate = 0, t.lastTranslateX = 0, t.lastTranslate = 0, t.pointerId = null, t.touchId = null;
     },
-    [q, K]
-  ), ee = p(
+    [rt, et]
+  ), ae = d(
     (t, e) => {
-      const o = xt(), c = J();
-      t.startX = e.x, t.startY = e.y, t.lastX = e.x, t.lastY = e.y, t.startTranslateX = c.x, t.startTranslate = o, t.lastTranslateX = c.x, t.lastTranslate = o, t.startTime = ut(), t.samples = [
+      const o = vt(), c = nt();
+      t.startX = e.x, t.startY = e.y, t.lastX = e.x, t.lastY = e.y, t.startTranslateX = c.x, t.startTranslate = o, t.lastTranslateX = c.x, t.lastTranslate = o, t.startTime = $(), t.samples = [
         {
           time: t.startTime,
           pageX: e.x,
@@ -1001,8 +1115,8 @@ function ar({
         }
       ];
     },
-    [xt, J]
-  ), re = p(
+    [vt, nt]
+  ), oe = d(
     ({
       currentTranslate: t,
       dismissible: e,
@@ -1010,62 +1124,65 @@ function ar({
       deltaY: c,
       startTranslate: s
     }) => {
-      const u = I(), d = A(), g = d > 0, m = u, h = Math.max(
-        L.dismissal.minDistancePx,
-        (u - d) * Et
-      ), M = T.map(
-        (V) => b(u - V, 0, u)
-      ), z = se(
-        M.length ? M : [0]
-      ), O = ze({
+      const u = V(), p = C(), g = p > 0, m = u, h = Math.max(
+        M.dismissal.minDistancePx,
+        (u - p) * ft
+      ), P = T.map(
+        (At) => b(u - At, 0, u)
+      ), A = ce(
+        P.length ? P : [0]
+      ), Q = Ke({
         currentTranslate: t,
         releaseVelocity: o
       });
-      g && z.push(d);
-      const ct = se(z);
-      return e && !g && c > 0 && t >= d + h ? m : _e(o) ? ct.length > 1 ? Ne(
-        ct,
+      g && A.push(p);
+      const F = ce(A);
+      return e && !g && c > 0 && t >= p + h ? m : Qe(o) ? F.length > 1 ? Re(
+        F,
         s,
         t,
         c > 0 ? "down" : "up",
-        O
-      ) : 0 : e && t > u * Et && !g ? m : Oe(ct, t);
+        Q
+      ) : 0 : e && t > u * ft && !g ? m : ze(F, t);
     },
-    [Et, A, I, T]
-  ), we = p(
+    [ft, C, V, T]
+  ), Ye = d(
     (t) => {
-      if (!r || a !== "bottom" && !X || n === !1 || t.pointerType === "touch" || Ot(t.target)) return;
+      if (!r || a !== "bottom" && !v || n === !1 || t.pointerType === "touch") return;
       let e = !1;
-      if (n === "handle" && t.target instanceof Element && t.target.closest('[data-oc-part="handle"]'))
+      if (n === "handle" && fe(t.target))
         e = !0;
       else if (n === "handle")
         return;
-      n === "content" && (e = ce(t.target), !He(t, e)) || (vt({
+      if (!e && Vt(t.target) || n === "content" && (e = de(t.target), !$e(t, e)))
+        return;
+      const o = We(t.target);
+      Xt({
         chrome: e,
         pointerId: t.pointerId,
         source: "pointer",
         startX: t.pageX,
         startY: t.pageY
-      }), t.preventDefault(), q(!0), t.currentTarget.setPointerCapture(t.pointerId));
+      }), Ue(t.target) || t.preventDefault(), rt(!0), !o && typeof t.currentTarget.setPointerCapture == "function" && t.currentTarget.setPointerCapture(t.pointerId);
     },
     [
-      vt,
+      Xt,
       n,
       r,
       a,
-      X,
-      q
+      v,
+      rt
     ]
-  ), at = p(
+  ), ut = d(
     (t, e) => {
-      if (!R) return !1;
+      if (!N) return !1;
       if (e <= 0) return !0;
       if (t.closeAllowed !== null) return t.closeAllowed;
-      const o = jt({ reason: "drag-dismiss" });
+      const o = _t({ reason: "drag-dismiss" });
       return t.closeAllowed = o, o;
     },
-    [jt, R]
-  ), Dt = p(
+    [_t, N]
+  ), St = d(
     ({
       closeAllowed: t,
       currentTranslate: e,
@@ -1073,80 +1190,116 @@ function ar({
       releaseVelocity: c,
       startTranslate: s
     }) => {
-      const d = re({
+      const p = oe({
         currentTranslate: e,
-        dismissible: R && t !== !1,
+        dismissible: N && t !== !1,
         releaseVelocity: c,
         deltaY: o,
         startTranslate: s
-      }), g = I(), m = A();
-      if (d >= g - 1) {
-        dt({ reason: "drag-dismiss" }, { commit: !1 }) ? Zt(d, {
+      }), g = V(), m = C();
+      if (p >= g - 1) {
+        q({ reason: "drag-dismiss" }, { commit: !1 }) ? re(p, {
           from: e,
           initialVelocity: c
-        }) : k(s, {
+        }) : I(s, {
           from: e,
           initialVelocity: c
         });
         return;
       }
-      m > 0 && d >= m - 1 ? Mt("peeked") : ($e({
-        presentationState: F,
-        releaseTranslate: d,
-        visibleTranslate: N
-      }) && (Lt.current = !0), Mt("visible")), k(d, {
+      m > 0 && p >= m - 1 ? bt("peeked") : (ar({
+        presentationState: k,
+        releaseTranslate: p,
+        visibleTranslate: H
+      }) && (kt.current = !0), bt("visible")), I(p, {
         from: e,
         initialVelocity: c
       });
     },
     [
-      Zt,
-      R,
-      A,
       re,
-      I,
-      F,
-      dt,
-      Mt,
+      N,
+      C,
+      oe,
+      V,
       k,
-      N
+      q,
+      bt,
+      I,
+      H
     ]
-  ), Xt = p(
-    ({ currentTranslate: t, releaseVelocity: e }) => {
-      const o = Q();
-      if (!o) return;
-      const c = We({
-        currentTranslate: t,
-        releaseVelocity: e,
-        targets: o.targets
-      });
-      if ($.current = c.key, C.current) {
-        Pt(c);
+  ), Yt = d(
+    ({
+      currentTranslate: t,
+      releaseDelta: e,
+      releaseTranslate: o,
+      releaseVelocity: c
+    }) => {
+      const s = at();
+      if (!s) return;
+      const u = qe({
+        currentTranslate: o,
+        releaseVelocity: c,
+        targets: s.targets
+      }), p = s.targets.find(
+        (P) => P.key === _.current
+      ) ?? s.defaultTarget, m = l.current?.getBoundingClientRect(), h = {
+        x: p.x + e.x,
+        y: p.y + e.y
+      };
+      if (N && m && nr({
+        closeThreshold: ft,
+        currentTarget: p,
+        currentTranslate: h,
+        releaseTarget: u,
+        surfaceSize: {
+          height: m.height,
+          width: m.width
+        },
+        targets: s.targets
+      }) && q({ reason: "drag-dismiss" })) {
+        R(), x();
+        return;
+      }
+      if (_.current = u.key, O.current) {
+        Dt(u);
         return;
       }
-      _(c, {
+      U(u, {
         from: t,
-        initialVelocity: e
+        initialVelocity: c
       });
     },
-    [Q, Pt, _]
-  ), ve = p(
+    [
+      R,
+      ft,
+      N,
+      x,
+      at,
+      q,
+      Dt,
+      U,
+      l
+    ]
+  ), Ee = d(
     (t) => {
-      const e = x.current;
-      if (!e.dragging || e.source !== "pointer" || !r || a !== "bottom" && !X)
+      const e = w.current;
+      if (!e.dragging || e.source !== "pointer" || !r || a !== "bottom" && !v)
         return;
-      const o = t.pageX - e.startX, c = t.pageY - e.startY, s = t.pointerType === "touch" ? L.dragStartThresholdPx.touch : L.dragStartThresholdPx.mouse;
-      if (!(!e.started && ie({ deltaX: o, deltaY: c, placement: a }) < s)) {
+      const o = t.pageX - e.startX, c = t.pageY - e.startY, s = t.pointerType === "touch" ? M.dragStartThresholdPx.touch : M.dragStartThresholdPx.mouse;
+      if (!(!e.started && ue({ deltaX: o, deltaY: c, placement: a }) < s)) {
         if (!e.allowed) {
-          if (a === "bottom" && !te(t.target, c, e.chrome))
+          if (a === "bottom" && !ne(t.target, c, e.chrome))
             return;
           e.allowed = !0, e.started = !0;
+          const u = t.currentTarget;
+          e.pointerId !== null && typeof u.hasPointerCapture == "function" && typeof u.setPointerCapture == "function" && !u.hasPointerCapture(e.pointerId) && u.setPointerCapture(e.pointerId);
         }
         if (t.preventDefault(), e.lastX = t.pageX, e.lastY = t.pageY, a === "popup")
-          rt(e, t), fe(e, t);
+          it(e, t), ye(e, t);
         else {
-          const u = e.startTranslate + c, d = at(e, c);
-          tt(u, d), pt(e, {
+          const u = e.startTranslate + c, p = ut(e, c);
+          ot(u, p), mt(e, {
             pageX: t.pageX,
             pageY: t.pageY,
             translateX: e.lastTranslateX,
@@ -1157,139 +1310,141 @@ function ar({
     },
     [
       r,
-      rt,
-      at,
+      it,
+      ut,
       a,
-      X,
-      tt,
-      te
+      v,
+      ot,
+      ne
     ]
-  ), W = p(
+  ), J = d(
     ({
       currentTarget: t,
       pageX: e,
       pageY: o,
       releaseCapture: c = !0
     }) => {
-      const s = x.current;
-      if (!s.dragging || s.source !== "pointer" || !r || a !== "bottom" && !X)
+      const s = w.current;
+      if (!s.dragging || s.source !== "pointer" || !r || a !== "bottom" && !v)
         return;
-      const u = s.started, d = Number.isFinite(e) ? e : s.lastX, g = Number.isFinite(o) ? o : s.lastY, m = d - s.startX, h = g - s.startY, M = Math.max(ut() - s.startTime, 1);
-      let z = {
+      const u = s.started, p = Number.isFinite(e) ? e : s.lastX, g = Number.isFinite(o) ? o : s.lastY, m = p - s.startX, h = g - s.startY, P = Math.max($() - s.startTime, 1);
+      let A = {
         x: s.lastTranslateX,
         y: s.lastTranslate
-      };
-      const O = s.startTranslate;
+      }, Q = A;
+      const F = s.startTranslate;
       if (u)
         if (a === "popup")
-          rt(s, {
-            pageX: d,
+          it(s, {
+            pageX: p,
             pageY: g
-          }), z = {
+          }), A = {
             x: s.lastTranslateX,
             y: s.lastTranslate
-          };
+          }, Q = Lt(s, {
+            pageX: p,
+            pageY: g
+          });
         else {
-          const V = s.startTranslate + h, Me = at(s, h);
-          tt(V, Me), z = {
+          const W = s.startTranslate + h, Fe = ut(s, h);
+          ot(W, Fe), A = {
             x: s.lastTranslateX,
             y: s.lastTranslate
           };
         }
-      const ct = s.closeAllowed;
+      const At = s.closeAllowed;
       if (c && t && s.pointerId !== null && t.hasPointerCapture(s.pointerId) && t.releasePointerCapture(s.pointerId), u) {
-        const V = a === "popup" ? Yt(s, {
-          pageX: d,
-          pageY: g
-        }) : {
+        const W = a === "popup" ? Q : {
           x: s.lastTranslateX,
           y: s.lastTranslate
         };
-        pt(s, {
-          pageX: d,
+        mt(s, {
+          pageX: p,
           pageY: g,
-          translateX: V.x,
-          translateY: V.y
+          translateX: W.x,
+          translateY: W.y
         });
       }
-      if (nt(s), !!u)
-        if (a === "popup") {
-          const V = me({
+      if (ct(s), !!u)
+        if (gt.current = $() + 500, a === "popup") {
+          const W = xe({
             session: s,
             fallbackDelta: { x: m, y: h },
-            fallbackElapsed: M
+            fallbackElapsed: P
           });
-          Xt({
-            currentTranslate: z,
-            releaseVelocity: V
+          Yt({
+            currentTranslate: A,
+            releaseDelta: { x: m, y: h },
+            releaseTranslate: Q,
+            releaseVelocity: W
           });
         } else {
-          const V = ge({
+          const W = Te({
             session: s,
             fallbackDeltaY: h,
-            fallbackElapsed: M
+            fallbackElapsed: P
           });
-          Dt({
-            closeAllowed: ct,
-            currentTranslate: z.y,
+          St({
+            closeAllowed: At,
+            currentTranslate: A.y,
             deltaY: h,
-            releaseVelocity: V,
-            startTranslate: O
+            releaseVelocity: W,
+            startTranslate: F
           });
         }
     },
     [
-      Dt,
-      Xt,
+      St,
+      Yt,
       r,
-      rt,
-      at,
+      it,
+      ut,
       a,
-      X,
-      nt,
-      tt
+      v,
+      ct,
+      ot
     ]
-  ), ne = p(
+  ), se = d(
     (t) => {
-      W({
+      J({
         currentTarget: t.currentTarget,
         pageX: t.pageX,
         pageY: t.pageY
       });
     },
-    [W]
-  ), De = p(
+    [J]
+  ), Me = d(
     (t) => {
-      const e = x.current;
-      e.pointerId !== null && t.pointerId !== e.pointerId || W({
+      const e = w.current;
+      e.pointerId !== null && t.pointerId !== e.pointerId || J({
         pageX: t.pageX,
         pageY: t.pageY,
         releaseCapture: !1
       });
     },
-    [W]
+    [J]
   );
-  kt(() => {
+  Mt(() => {
     if (!r) return;
     const t = (s) => {
-      const u = x.current;
-      !u.dragging || u.source !== "pointer" || "pointerId" in s && u.pointerId !== null && s.pointerId !== u.pointerId || W({
+      const u = w.current;
+      !u.dragging || u.source !== "pointer" || "pointerId" in s && u.pointerId !== null && s.pointerId !== u.pointerId || J({
         pageX: s.pageX,
         pageY: s.pageY,
         releaseCapture: !1
       });
     }, e = () => {
-      const s = x.current;
-      !s.dragging || s.source !== "pointer" || W({
+      const s = w.current;
+      !s.dragging || s.source !== "pointer" || J({
         pageX: s.lastX,
         pageY: s.lastY,
         releaseCapture: !1
       });
     }, o = (s) => {
-      const u = x.current;
+      const u = w.current;
       !u.dragging || u.source !== "pointer" || s.relatedTarget === null && t(s);
     }, c = (s) => {
-      const u = x.current;
+      const u = w.current;
       !u.dragging || u.source !== "pointer" || s.relatedTarget === null && t(s);
     };
     return document.addEventListener("pointerout", o, !0), document.addEventListener("mouseout", c, !0), window.addEventListener("pointerup", t, !0), window.addEventListener(
@@ -1311,24 +1466,40 @@ function ar({
         !0
       ), window.removeEventListener("blur", e);
     };
-  }, [W, r]);
-  const St = p((t) => {
-    const e = x.current;
-    return e.touchId !== null ? pe(t.changedTouches, e.touchId) ?? pe(t.touches, e.touchId) : t.touches[0] ?? t.changedTouches[0] ?? null;
-  }, []), Xe = p(
+  }, [J, r]), Mt(() => {
+    if (!r) return;
+    const t = (e) => {
+      const o = gt.current;
+      if (o <= 0) return;
+      if ($() > o) {
+        gt.current = 0;
+        return;
+      }
+      const c = l.current;
+      c && e.target instanceof Node && c.contains(e.target) && (gt.current = 0, e.preventDefault(), e.stopPropagation());
+    };
+    return document.addEventListener("click", t, !0), () => {
+      document.removeEventListener("click", t, !0);
+    };
+  }, [r, l]);
+  const Et = d((t) => {
+    const e = w.current;
+    return e.touchId !== null ? me(t.changedTouches, e.touchId) ?? me(t.touches, e.touchId) : t.touches[0] ?? t.changedTouches[0] ?? null;
+  }, []), Le = d(
     (t) => {
-      if (!r || a !== "bottom" && !X || n === !1 || t.touches.length !== 1 || Ot(t.target)) return;
+      if (!r || a !== "bottom" && !v || n === !1 || t.touches.length !== 1) return;
       let e = !1;
-      if (n === "handle" && t.target instanceof Element && t.target.closest('[data-oc-part="handle"]'))
+      if (n === "handle" && fe(t.target))
         e = !0;
       else if (n === "handle")
         return;
-      n === "content" && (e = ce(t.target));
+      if (!e && Vt(t.target)) return;
+      n === "content" && (e = de(t.target));
       const o = t.touches[0];
-      a === "bottom" && ht({
+      a === "bottom" && xt({
         target: t.target,
         chrome: e
-      }), vt({
+      }), Xt({
         chrome: e,
         source: "touch",
         startX: o.pageX,
@@ -1337,50 +1508,50 @@ function ar({
       });
     },
     [
-      vt,
+      Xt,
       n,
       r,
       a,
-      X,
-      ht
+      v,
+      xt
     ]
-  ), ae = p(
+  ), ie = d(
     (t) => {
-      const e = x.current;
-      if (!e.dragging || e.source !== "touch" || !r || a !== "bottom" && !X)
+      const e = w.current;
+      if (!e.dragging || e.source !== "touch" || !r || a !== "bottom" && !v)
         return;
-      const o = St(t);
+      const o = Et(t);
       if (!o) return;
-      const c = o.pageX - e.startX, s = o.pageY - e.startY, u = ie({
+      const c = o.pageX - e.startX, s = o.pageY - e.startY, u = ue({
         deltaX: c,
         deltaY: s,
         placement: a
-      }), d = L.dragStartThresholdPx.touch, g = a === "bottom" ? Ae({
+      }), p = M.dragStartThresholdPx.touch, g = a === "bottom" ? Ne({
         target: t.target,
         deltaY: s,
         chrome: e.chrome,
-        bodyNode: U.current
-      }) : Be({
+        bodyNode: K.current
+      }) : Oe({
         target: t.target,
-        bodyNode: U.current
+        bodyNode: K.current
       });
       if (g.preventDefault) {
-        const h = a === "bottom" && Math.abs(c) > Math.abs(s) && Math.abs(s) < d && !e.started && u < d;
-        !h && a === "bottom" && ht({
+        const h = a === "bottom" && Math.abs(c) > Math.abs(s) && Math.abs(s) < p && !e.started && u < p;
+        !h && a === "bottom" && xt({
           target: t.target,
           chrome: e.chrome
-        }), h || oe(t);
+        }), h || le(t);
       }
       if (g.resetAnchor) {
-        K(!1), ee(e, { x: o.pageX, y: o.pageY });
+        et(!1), ae(e, { x: o.pageX, y: o.pageY });
         return;
       }
-      if (g.allowDrag && !(!e.started && u < d))
-        if (e.allowed || (e.allowed = !0, e.started = !0), g.preventDefault || oe(t), e.lastX = o.pageX, e.lastY = o.pageY, a === "popup")
-          rt(e, o), fe(e, o);
+      if (g.allowDrag && !(!e.started && u < p))
+        if (e.allowed || (e.allowed = !0, e.started = !0), g.preventDefault || le(t), e.lastX = o.pageX, e.lastY = o.pageY, a === "popup")
+          it(e, o), ye(e, o);
         else {
-          const m = e.startTranslate + s, h = at(e, s);
-          tt(m, h), pt(e, {
+          const m = e.startTranslate + s, h = ut(e, s);
+          ot(m, h), mt(e, {
             pageX: o.pageX,
             pageY: o.pageY,
             translateX: e.lastTranslateX,
@@ -1390,21 +1561,21 @@ function ar({
     },
     [
       r,
-      rt,
-      at,
-      St,
+      it,
+      ut,
+      Et,
       a,
-      X,
-      ee,
-      K,
-      tt,
-      ht
+      v,
+      ae,
+      et,
+      ot,
+      xt
     ]
   );
-  kt(() => {
-    if (!i || !r || a !== "bottom" && !X || n === !1 || typeof window > "u") return;
+  Mt(() => {
+    if (!i || !r || a !== "bottom" && !v || n === !1 || typeof window > "u") return;
     const t = (e) => {
-      ae(e);
+      ie(e);
     };
     return window.addEventListener("touchmove", t, {
       capture: !0,
@@ -1412,71 +1583,75 @@ function ar({
     }), () => {
       window.removeEventListener("touchmove", t, !0);
     };
-  }, [n, r, ae, i, a, X]);
-  const Se = p(
+  }, [n, r, ie, i, a, v]);
+  const be = d(
     (t) => {
-      const e = x.current;
-      if (!e.dragging || e.source !== "touch" || !r || a !== "bottom" && !X)
+      const e = w.current;
+      if (!e.dragging || e.source !== "touch" || !r || a !== "bottom" && !v)
         return;
-      const o = St(t), c = o?.pageX ?? e.lastX, s = o?.pageY ?? e.lastY, u = e.started, d = e.closeAllowed, g = c - e.startX, m = s - e.startY, h = Math.max(ut() - e.startTime, 1);
-      a === "popup" && et();
-      const M = {
+      const o = Et(t), c = o?.pageX ?? e.lastX, s = o?.pageY ?? e.lastY, u = e.started, p = e.closeAllowed, g = c - e.startX, m = s - e.startY, h = Math.max($() - e.startTime, 1);
+      a === "popup" && st();
+      const P = {
         x: e.lastTranslateX,
         y: e.lastTranslate
-      }, z = e.startTranslate;
+      };
+      let A = P;
+      const Q = e.startTranslate;
       if (u) {
-        const O = a === "popup" ? Yt(e, {
+        const F = a === "popup" ? Lt(e, {
           pageX: c,
           pageY: s
         }) : {
           x: e.lastTranslateX,
           y: e.lastTranslate
         };
-        pt(e, {
+        A = F, mt(e, {
           pageX: c,
           pageY: s,
-          translateX: O.x,
-          translateY: O.y
+          translateX: F.x,
+          translateY: F.y
         });
       }
-      if (nt(e), !!u)
-        if (a === "popup") {
-          const O = me({
+      if (ct(e), !!u)
+        if (gt.current = $() + 500, a === "popup") {
+          const F = xe({
             session: e,
             fallbackDelta: { x: g, y: m },
             fallbackElapsed: h
           });
-          Xt({
-            currentTranslate: M,
-            releaseVelocity: O
+          Yt({
+            currentTranslate: P,
+            releaseDelta: { x: g, y: m },
+            releaseTranslate: A,
+            releaseVelocity: F
           });
         } else {
-          const O = ge({
+          const F = Te({
             session: e,
             fallbackDeltaY: m,
             fallbackElapsed: h
           });
-          Dt({
-            closeAllowed: d,
-            currentTranslate: M.y,
+          St({
+            closeAllowed: p,
+            currentTranslate: P.y,
             deltaY: m,
-            releaseVelocity: O,
-            startTranslate: z
+            releaseVelocity: F,
+            startTranslate: Q
           });
         }
     },
     [
-      Dt,
-      Xt,
-      r,
       St,
+      Yt,
+      r,
+      Et,
       a,
-      X,
-      nt,
-      et
+      v,
+      ct,
+      st
     ]
-  ), Ye = p(() => {
-    const t = x.current;
+  ), ke = d(() => {
+    const t = w.current;
     if (!t.dragging || t.source !== "touch") return;
     const e = t.started, o = t.startTranslate, c = t.lastTranslate, s = {
       x: t.startTranslateX,
@@ -1484,32 +1659,32 @@ function ar({
     }, u = {
       x: t.lastTranslateX,
       y: t.lastTranslate
-    }, d = a;
-    if (nt(t), !!e) {
-      if (d === "popup") {
-        C.current ? Pt(s) : _(s, { from: u });
+    }, p = a;
+    if (ct(t), !!e) {
+      if (p === "popup") {
+        O.current ? Dt(s) : U(s, { from: u });
         return;
       }
-      k(o, { from: c });
+      I(o, { from: c });
     }
   }, [
     a,
-    nt,
-    Pt,
-    _,
-    k
+    ct,
+    Dt,
+    U,
+    I
   ]);
   return {
-    onPointerDown: we,
-    onPointerMove: ve,
-    onPointerUp: ne,
-    onPointerCancel: ne,
-    onLostPointerCapture: De,
-    onTouchStart: Xe,
-    onTouchEnd: Se,
-    onTouchCancel: Ye
+    onPointerDown: Ye,
+    onPointerMove: Ee,
+    onPointerUp: se,
+    onPointerCancel: se,
+    onLostPointerCapture: Me,
+    onTouchStart: Le,
+    onTouchEnd: be,
+    onTouchCancel: ke
   };
 }
 export {
-  ar as useModalDrag
+  mr as useModalDrag
 };