sibujs 4.5.0 → 4.6.0

package/dist/ui.d.cts

@@ -1,7 +1,8 @@
-export { A as AttributeSource, a as AttributeValue, B as BoundFieldProps, C as CustomElementOptions, F as FieldConfig, b as FocusTrap, c as FormConfig, d as FormField, e as FormReturn, I as IntersectionResult, M as MaskOptions, P as PaginationResult, T as Toast, f as ToastInstance, V as ValidatorFn, g as VirtualList, h as VirtualListProps, _ as __resetDialogStack, i as announce, j as aria, k as bindAttrs, l as bindBoolAttr, m as bindData, n as bindField, o as creditCardMask, p as custom, q as dateMask, r as defineElement, s as dialog, t as email, u as eventBus, v as focus, w as form, x as hotkey, y as infiniteScroll, z as inputMask, D as intersection, E as lazyLoad, G as matchesPattern, H as max, J as maxLength, K as min, L as minLength, N as pagination, O as phoneMask, Q as removeScopedStyle, R as required, S as scopedStyle, U as ssnMask, W as svgElement, X as timeMask, Y as toast, Z as withScopedStyle, $ as zipMask } from './customElement-OB9CIsc5.cjs';
-export { C as ComponentProps, P as PropDef, a as PropSchema, R as RenderProp, V as Validator, b as assertType, c as compose, d as createGuard, e as createSlots, f as defineComponent, g as defineSlottedComponent, h as defineStrictComponent, v as validateProps, i as validators, w as withBoundary, j as withDefaults, k as withProps, l as withWrapper } from './contracts-DBdg9J_a.cjs';
+export { A as AttributeSource, a as AttributeValue, B as BoundFieldProps, C as CustomElementOptions, F as FieldConfig, b as FocusTrap, c as FormConfig, d as FormField, e as FormReturn, I as IntersectionResult, M as MaskOptions, P as PaginationResult, T as Toast, f as ToastInstance, V as ValidatorFn, g as VirtualList, h as VirtualListProps, _ as __resetDialogStack, i as announce, j as aria, k as bindAttrs, l as bindBoolAttr, m as bindData, n as bindField, o as creditCardMask, p as custom, q as dateMask, r as defineElement, s as dialog, t as email, u as eventBus, v as focus, w as form, x as hotkey, y as infiniteScroll, z as inputMask, D as intersection, E as lazyLoad, G as matchesPattern, H as max, J as maxLength, K as min, L as minLength, N as pagination, O as phoneMask, Q as removeScopedStyle, R as required, S as scopedStyle, U as ssnMask, W as svgElement, X as timeMask, Y as toast, Z as withScopedStyle, $ as zipMask } from './customElement-MmInOW1U.cjs';
+export { C as ComponentProps, P as PropDef, a as PropSchema, R as RenderProp, V as Validator, W as WithDefaultsProps, b as assertType, c as compose, d as createGuard, e as createSlots, f as defineComponent, g as defineSlottedComponent, h as defineStrictComponent, v as validateProps, i as validators, w as withBoundary, j as withDefaults, k as withProps, l as withWrapper } from './contracts-DRIuclVT.cjs';
 
-interface FormActionHandle<TArgs extends unknown[], TResult> {
+/** The parts of a form-action handle available for every action signature. */
+interface FormActionState<TArgs extends unknown[], TResult> {
     /** Invoke the action. Rejections become `error()`, resolutions `result()`. */
     run: (...args: TArgs) => Promise<void>;
     /** True while the underlying promise is unresolved. */
@@ -12,13 +13,26 @@ interface FormActionHandle<TArgs extends unknown[], TResult> {
     result: () => TResult | null;
     /** Clear result and error without affecting an in-flight call. */
     reset: () => void;
+}
+/** The submit-handler part of a form-action handle. */
+interface FormActionSubmit {
     /**
      * A ready-to-attach submit handler for `<form>` elements. Calls
      * `e.preventDefault()`, builds a `FormData`, and passes it to the
-     * underlying action. Only available when `TArgs = [FormData]`.
+     * underlying action as its only argument.
      */
     onSubmit: (e: Event) => void;
 }
+/**
+ * Handle returned by {@link formAction}.
+ *
+ * `onSubmit` calls the action with exactly one `FormData`, so it is part of the
+ * type only when that call is valid for the action — `(data: FormData) => …`
+ * or `(data?: FormData) => …`. For any other signature (numeric, zero- or
+ * multi-argument) it is omitted rather than silently handing the action a
+ * `FormData` it does not expect.
+ */
+type FormActionHandle<TArgs extends unknown[], TResult> = FormActionState<TArgs, TResult> & ([FormData] extends TArgs ? FormActionSubmit : Record<never, never>);
 /**
  * Wrap an async function into a reactive form-action handle.
  *
@@ -78,10 +92,29 @@ interface ListboxOptions {
 interface ListboxHandle {
     /** Reactive value: the currently-active (highlighted) option value. */
     activeValue: () => string | null;
-    /** Reactive value: the currently-selected option value (single-select) or CSV (multiple). */
+    /**
+     * Reactive value: the selected option values, in selection order. Holds at
+     * most one value in single-select mode. Every `data-value` string — including
+     * ones containing commas and the empty string — is represented exactly.
+     */
+    selectedValues: () => readonly string[];
+    /**
+     * Reactive value: the selected option value (single-select), or the selected
+     * values joined with `","` (multiple).
+     *
+     * @deprecated In multiple mode the CSV view is lossy — a value containing a
+     * comma cannot be told apart from two values. Use {@link selectedValues}.
+     */
     selectedValue: () => string | null;
     /** Stable id that can be used as `aria-activedescendant` on the trigger. */
     activeDescendantId: () => string | null;
+    /**
+     * Reconcile options added or removed since the last change: new options get a
+     * stable id and `aria-selected`, and a removed active option stops being the
+     * active descendant. Happens automatically (on DOM mutation and before every
+     * interaction); call it to reconcile synchronously.
+     */
+    refresh: () => void;
     /** Cleanup: removes listeners. */
     dispose: () => void;
 }
@@ -185,7 +218,7 @@ declare function lazyEffect(element: HTMLElement, effectFn: () => void, options?
 interface IntervalHandle {
     /** Stop the interval. Safe to call multiple times. */
     stop: () => void;
-    /** Pause (preserving remaining ticks until `resume()`). */
+    /** Pause, preserving the time remaining until the next tick for `resume()`. */
     pause: () => void;
     /** Resume a paused interval. */
     resume: () => void;
@@ -258,4 +291,4 @@ interface ScrollLockHandle {
  */
 declare function scrollLock(): ScrollLockHandle;
 
-export { type DialogAriaHandle, type DialogAriaOptions, type FocusManagerHandle, type FocusManagerOptions, type FormActionHandle, type IntervalHandle, type ListboxHandle, type ListboxOptions, type ScrollLockHandle, type TimeoutHandle, createDialogAria, createFocusManager, createListbox, formAction, hover, interval, lazyEffect, scrollLock, timeout };
+export { type DialogAriaHandle, type DialogAriaOptions, type FocusManagerHandle, type FocusManagerOptions, type FormActionHandle, type FormActionState, type FormActionSubmit, type IntervalHandle, type ListboxHandle, type ListboxOptions, type ScrollLockHandle, type TimeoutHandle, createDialogAria, createFocusManager, createListbox, formAction, hover, interval, lazyEffect, scrollLock, timeout };

package/dist/ui.d.ts

@@ -1,7 +1,8 @@
-export { A as AttributeSource, a as AttributeValue, B as BoundFieldProps, C as CustomElementOptions, F as FieldConfig, b as FocusTrap, c as FormConfig, d as FormField, e as FormReturn, I as IntersectionResult, M as MaskOptions, P as PaginationResult, T as Toast, f as ToastInstance, V as ValidatorFn, g as VirtualList, h as VirtualListProps, _ as __resetDialogStack, i as announce, j as aria, k as bindAttrs, l as bindBoolAttr, m as bindData, n as bindField, o as creditCardMask, p as custom, q as dateMask, r as defineElement, s as dialog, t as email, u as eventBus, v as focus, w as form, x as hotkey, y as infiniteScroll, z as inputMask, D as intersection, E as lazyLoad, G as matchesPattern, H as max, J as maxLength, K as min, L as minLength, N as pagination, O as phoneMask, Q as removeScopedStyle, R as required, S as scopedStyle, U as ssnMask, W as svgElement, X as timeMask, Y as toast, Z as withScopedStyle, $ as zipMask } from './customElement-OB9CIsc5.js';
-export { C as ComponentProps, P as PropDef, a as PropSchema, R as RenderProp, V as Validator, b as assertType, c as compose, d as createGuard, e as createSlots, f as defineComponent, g as defineSlottedComponent, h as defineStrictComponent, v as validateProps, i as validators, w as withBoundary, j as withDefaults, k as withProps, l as withWrapper } from './contracts-DBdg9J_a.js';
+export { A as AttributeSource, a as AttributeValue, B as BoundFieldProps, C as CustomElementOptions, F as FieldConfig, b as FocusTrap, c as FormConfig, d as FormField, e as FormReturn, I as IntersectionResult, M as MaskOptions, P as PaginationResult, T as Toast, f as ToastInstance, V as ValidatorFn, g as VirtualList, h as VirtualListProps, _ as __resetDialogStack, i as announce, j as aria, k as bindAttrs, l as bindBoolAttr, m as bindData, n as bindField, o as creditCardMask, p as custom, q as dateMask, r as defineElement, s as dialog, t as email, u as eventBus, v as focus, w as form, x as hotkey, y as infiniteScroll, z as inputMask, D as intersection, E as lazyLoad, G as matchesPattern, H as max, J as maxLength, K as min, L as minLength, N as pagination, O as phoneMask, Q as removeScopedStyle, R as required, S as scopedStyle, U as ssnMask, W as svgElement, X as timeMask, Y as toast, Z as withScopedStyle, $ as zipMask } from './customElement-MmInOW1U.js';
+export { C as ComponentProps, P as PropDef, a as PropSchema, R as RenderProp, V as Validator, W as WithDefaultsProps, b as assertType, c as compose, d as createGuard, e as createSlots, f as defineComponent, g as defineSlottedComponent, h as defineStrictComponent, v as validateProps, i as validators, w as withBoundary, j as withDefaults, k as withProps, l as withWrapper } from './contracts-DRIuclVT.js';
 
-interface FormActionHandle<TArgs extends unknown[], TResult> {
+/** The parts of a form-action handle available for every action signature. */
+interface FormActionState<TArgs extends unknown[], TResult> {
     /** Invoke the action. Rejections become `error()`, resolutions `result()`. */
     run: (...args: TArgs) => Promise<void>;
     /** True while the underlying promise is unresolved. */
@@ -12,13 +13,26 @@ interface FormActionHandle<TArgs extends unknown[], TResult> {
     result: () => TResult | null;
     /** Clear result and error without affecting an in-flight call. */
     reset: () => void;
+}
+/** The submit-handler part of a form-action handle. */
+interface FormActionSubmit {
     /**
      * A ready-to-attach submit handler for `<form>` elements. Calls
      * `e.preventDefault()`, builds a `FormData`, and passes it to the
-     * underlying action. Only available when `TArgs = [FormData]`.
+     * underlying action as its only argument.
      */
     onSubmit: (e: Event) => void;
 }
+/**
+ * Handle returned by {@link formAction}.
+ *
+ * `onSubmit` calls the action with exactly one `FormData`, so it is part of the
+ * type only when that call is valid for the action — `(data: FormData) => …`
+ * or `(data?: FormData) => …`. For any other signature (numeric, zero- or
+ * multi-argument) it is omitted rather than silently handing the action a
+ * `FormData` it does not expect.
+ */
+type FormActionHandle<TArgs extends unknown[], TResult> = FormActionState<TArgs, TResult> & ([FormData] extends TArgs ? FormActionSubmit : Record<never, never>);
 /**
  * Wrap an async function into a reactive form-action handle.
  *
@@ -78,10 +92,29 @@ interface ListboxOptions {
 interface ListboxHandle {
     /** Reactive value: the currently-active (highlighted) option value. */
     activeValue: () => string | null;
-    /** Reactive value: the currently-selected option value (single-select) or CSV (multiple). */
+    /**
+     * Reactive value: the selected option values, in selection order. Holds at
+     * most one value in single-select mode. Every `data-value` string — including
+     * ones containing commas and the empty string — is represented exactly.
+     */
+    selectedValues: () => readonly string[];
+    /**
+     * Reactive value: the selected option value (single-select), or the selected
+     * values joined with `","` (multiple).
+     *
+     * @deprecated In multiple mode the CSV view is lossy — a value containing a
+     * comma cannot be told apart from two values. Use {@link selectedValues}.
+     */
     selectedValue: () => string | null;
     /** Stable id that can be used as `aria-activedescendant` on the trigger. */
     activeDescendantId: () => string | null;
+    /**
+     * Reconcile options added or removed since the last change: new options get a
+     * stable id and `aria-selected`, and a removed active option stops being the
+     * active descendant. Happens automatically (on DOM mutation and before every
+     * interaction); call it to reconcile synchronously.
+     */
+    refresh: () => void;
     /** Cleanup: removes listeners. */
     dispose: () => void;
 }
@@ -185,7 +218,7 @@ declare function lazyEffect(element: HTMLElement, effectFn: () => void, options?
 interface IntervalHandle {
     /** Stop the interval. Safe to call multiple times. */
     stop: () => void;
-    /** Pause (preserving remaining ticks until `resume()`). */
+    /** Pause, preserving the time remaining until the next tick for `resume()`. */
     pause: () => void;
     /** Resume a paused interval. */
     resume: () => void;
@@ -258,4 +291,4 @@ interface ScrollLockHandle {
  */
 declare function scrollLock(): ScrollLockHandle;
 
-export { type DialogAriaHandle, type DialogAriaOptions, type FocusManagerHandle, type FocusManagerOptions, type FormActionHandle, type IntervalHandle, type ListboxHandle, type ListboxOptions, type ScrollLockHandle, type TimeoutHandle, createDialogAria, createFocusManager, createListbox, formAction, hover, interval, lazyEffect, scrollLock, timeout };
+export { type DialogAriaHandle, type DialogAriaOptions, type FocusManagerHandle, type FocusManagerOptions, type FormActionHandle, type FormActionState, type FormActionSubmit, type IntervalHandle, type ListboxHandle, type ListboxOptions, type ScrollLockHandle, type TimeoutHandle, createDialogAria, createFocusManager, createListbox, formAction, hover, interval, lazyEffect, scrollLock, timeout };

package/dist/ui.js

@@ -38,7 +38,7 @@ import {
   toast,
   withScopedStyle,
   zipMask
-} from "./chunk-2DCGACUU.js";
+} from "./chunk-SXXVZMKZ.js";
 import {
   RenderProp,
   assertType,
@@ -54,28 +54,30 @@ import {
   withDefaults,
   withProps,
   withWrapper
-} from "./chunk-R25EFXXC.js";
+} from "./chunk-TUCPL2HB.js";
 import {
   createId
-} from "./chunk-CCSJMTRN.js";
-import "./chunk-ONOHFDLG.js";
-import "./chunk-RBTPLM32.js";
-import "./chunk-IXKSNWV5.js";
+} from "./chunk-3ISI6ACU.js";
+import "./chunk-47M47FOM.js";
+import "./chunk-QE4TTDU3.js";
+import "./chunk-2INLLLMZ.js";
 import {
   globalSingleton
 } from "./chunk-7ZHH77QA.js";
 import {
   effect
-} from "./chunk-RIXRAYIU.js";
-import "./chunk-5DXA2J44.js";
-import {
-  registerDisposer
-} from "./chunk-QKRPLZ2V.js";
+} from "./chunk-XC4MEKGA.js";
+import "./chunk-7XHATCIH.js";
+import "./chunk-5HZXGZ6T.js";
 import {
+  batch,
   signal
-} from "./chunk-XZZOBQAY.js";
-import "./chunk-UGRX3S57.js";
-import "./chunk-2WLZ6757.js";
+} from "./chunk-D33YTSX5.js";
+import "./chunk-5Q4R7HCL.js";
+import {
+  registerDisposer,
+  unregisterDisposer
+} from "./chunk-NYNYSPK7.js";
 
 // src/ui/formAction.ts
 function formAction(fn) {
@@ -167,22 +169,43 @@ function createListbox(container, options = {}) {
   if (multiple) container.setAttribute("aria-multiselectable", "true");
   if (!container.hasAttribute("tabindex")) container.setAttribute("tabindex", "0");
   const [activeValue, setActiveValue] = signal(null);
+  const [selectedValues, setSelectedValues] = signal([]);
   const [selectedValue, setSelectedValue] = signal(null);
   const [activeDescendantId, setActiveDescendantId] = signal(null);
-  function stampIds() {
+  let activeValueRef = null;
+  let currentSelection = [];
+  function reconcileOptions() {
     const opts = Array.from(container.querySelectorAll(optionSelector));
+    const selectedSet = new Set(currentSelection);
+    let activeStillPresent = false;
+    const active = activeValueRef;
     for (const opt of opts) {
       if (!opt.id) opt.id = createId("listbox-option");
-      if (!opt.hasAttribute("aria-selected")) opt.setAttribute("aria-selected", "false");
+      const ov = opt.dataset.value;
+      if (!opt.hasAttribute("aria-selected")) {
+        opt.setAttribute("aria-selected", ov !== void 0 && selectedSet.has(ov) ? "true" : "false");
+      }
+      if (active !== null && ov === active) activeStillPresent = true;
     }
+    if (active !== null && !activeStillPresent) setActive(null, opts);
+    return opts;
   }
-  stampIds();
   function getOptions() {
-    return Array.from(container.querySelectorAll(optionSelector));
+    return reconcileOptions();
+  }
+  function isDisabled(opt) {
+    return opt.getAttribute("aria-disabled") === "true" || opt.hasAttribute("disabled");
+  }
+  function enabledOptions() {
+    return getOptions().filter((opt) => !isDisabled(opt) && opt.dataset.value !== void 0);
   }
-  function setActive(value) {
+  function optionByValue(value) {
+    return getOptions().find((opt) => opt.dataset.value === value);
+  }
+  function setActive(value, known) {
+    activeValueRef = value;
     setActiveValue(value);
-    const opts = getOptions();
+    const opts = known ?? getOptions();
     for (const opt of opts) {
       if (opt.dataset.value === value) {
         opt.setAttribute("data-highlighted", "");
@@ -198,29 +221,33 @@ function createListbox(container, options = {}) {
     }
   }
   function select(value) {
-    const previous = selectedValue();
-    let nextSelectedSet;
+    const target = optionByValue(value);
+    if (!target || isDisabled(target)) return;
+    const previous = selectedValues();
+    let next;
     if (multiple) {
-      nextSelectedSet = new Set((previous ?? "").split(",").filter(Boolean));
-      if (nextSelectedSet.has(value)) nextSelectedSet.delete(value);
-      else nextSelectedSet.add(value);
-      setSelectedValue(Array.from(nextSelectedSet).join(","));
+      next = previous.includes(value) ? previous.filter((v) => v !== value) : [...previous, value];
     } else {
-      nextSelectedSet = /* @__PURE__ */ new Set([value]);
-      setSelectedValue(value);
+      next = [value];
     }
+    currentSelection = next;
+    batch(() => {
+      setSelectedValues(next);
+      setSelectedValue(multiple ? next.join(",") : value);
+    });
     options.onSelect?.(value);
+    const nextSelectedSet = new Set(next);
     const opts = getOptions();
     for (const opt of opts) {
-      const ov = opt.dataset.value ?? "";
-      opt.setAttribute("aria-selected", nextSelectedSet.has(ov) ? "true" : "false");
+      const ov = opt.dataset.value;
+      opt.setAttribute("aria-selected", ov !== void 0 && nextSelectedSet.has(ov) ? "true" : "false");
     }
   }
   function moveActive(delta) {
-    const opts = getOptions();
+    const opts = enabledOptions();
     if (opts.length === 0) return;
-    const currentIdx = opts.findIndex((o) => o.dataset.value === activeValue());
-    let next = currentIdx + delta;
+    const currentIdx = opts.findIndex((o) => o.dataset.value === activeValueRef);
+    let next = currentIdx === -1 ? delta > 0 ? 0 : opts.length - 1 : currentIdx + delta;
     if (next < 0) next = opts.length - 1;
     if (next >= opts.length) next = 0;
     const nextValue = opts[next].dataset.value ?? null;
@@ -241,13 +268,13 @@ function createListbox(container, options = {}) {
         break;
       case "Home": {
         e.preventDefault();
-        const opts = getOptions();
+        const opts = enabledOptions();
         if (opts.length > 0) setActive(opts[0].dataset.value ?? null);
         break;
       }
       case "End": {
         e.preventDefault();
-        const opts = getOptions();
+        const opts = enabledOptions();
         if (opts.length > 0) setActive(opts[opts.length - 1].dataset.value ?? null);
         break;
       }
@@ -262,7 +289,7 @@ function createListbox(container, options = {}) {
   }
   function onClick(e) {
     const target = e.target.closest(optionSelector);
-    if (!target || !container.contains(target)) return;
+    if (!target || !container.contains(target) || isDisabled(target)) return;
     const value = target.dataset.value ?? null;
     if (value !== null) {
       setActive(value);
@@ -271,12 +298,26 @@ function createListbox(container, options = {}) {
   }
   container.addEventListener("keydown", onKeyDown);
   container.addEventListener("click", onClick);
+  reconcileOptions();
+  let observer = null;
+  if (typeof MutationObserver !== "undefined") {
+    observer = new MutationObserver(() => {
+      if (!disposed) reconcileOptions();
+    });
+    observer.observe(container, { childList: true, subtree: true });
+  }
+  let disposed = false;
   function dispose() {
+    if (disposed) return;
+    disposed = true;
+    unregisterDisposer(container, dispose);
+    observer?.disconnect();
+    observer = null;
     container.removeEventListener("keydown", onKeyDown);
     container.removeEventListener("click", onClick);
   }
   registerDisposer(container, dispose);
-  return { activeValue, selectedValue, activeDescendantId, dispose };
+  return { activeValue, selectedValues, selectedValue, activeDescendantId, refresh: reconcileOptions, dispose };
 }
 function createDialogAria(element, options = {}) {
   const titleId = options.labelledBy ?? createId("dialog-title");
@@ -324,25 +365,59 @@ function lazyEffect(element, effectFn, options) {
 
 // src/ui/timers.ts
 function interval(fn, ms) {
-  let id = null;
+  let intervalId = null;
+  let resumeId = null;
   let running = false;
-  function start() {
+  let nextDue = 0;
+  let remaining = ms;
+  function tick() {
+    nextDue = Date.now() + ms;
+    fn();
+  }
+  function clearTimers() {
+    if (intervalId !== null) {
+      clearInterval(intervalId);
+      intervalId = null;
+    }
+    if (resumeId !== null) {
+      clearTimeout(resumeId);
+      resumeId = null;
+    }
+  }
+  function startRegular() {
+    nextDue = Date.now() + ms;
+    intervalId = setInterval(tick, ms);
+  }
+  function resume() {
     if (running) return;
-    id = setInterval(fn, ms);
     running = true;
+    if (remaining >= ms) {
+      startRegular();
+      return;
+    }
+    nextDue = Date.now() + remaining;
+    resumeId = setTimeout(() => {
+      resumeId = null;
+      startRegular();
+      fn();
+    }, remaining);
+  }
+  function pause() {
+    if (!running) return;
+    remaining = Math.min(ms, Math.max(0, nextDue - Date.now()));
+    clearTimers();
+    running = false;
   }
   function stop() {
-    if (id !== null) {
-      clearInterval(id);
-      id = null;
-    }
+    clearTimers();
     running = false;
+    remaining = ms;
   }
-  start();
+  resume();
   return {
     stop,
-    pause: stop,
-    resume: start,
+    pause,
+    resume,
     isRunning: () => running
   };
 }
@@ -374,7 +449,11 @@ function hover(target) {
   const onLeave = () => setHovered(false);
   target.addEventListener("pointerenter", onEnter);
   target.addEventListener("pointerleave", onLeave);
+  let disposed = false;
   function dispose() {
+    if (disposed) return;
+    disposed = true;
+    unregisterDisposer(target, dispose);
     target.removeEventListener("pointerenter", onEnter);
     target.removeEventListener("pointerleave", onLeave);
   }
@@ -388,21 +467,37 @@ var _lock = globalSingleton(/* @__PURE__ */ Symbol.for("sibujs.scrollLock.v1"),
   savedOverflow: null,
   savedPaddingRight: null
 }));
+function applyBodyLock() {
+  const body = document.body;
+  if (!body) throw new Error("[scrollLock] document.body is not available yet");
+  const scrollBarWidth = window.innerWidth - document.documentElement.clientWidth;
+  const savedOverflow = body.style.overflow;
+  const savedPaddingRight = body.style.paddingRight;
+  try {
+    body.style.overflow = "hidden";
+    if (scrollBarWidth > 0) {
+      body.style.paddingRight = `${scrollBarWidth}px`;
+    }
+  } catch (err) {
+    try {
+      body.style.overflow = savedOverflow;
+      body.style.paddingRight = savedPaddingRight;
+    } catch {
+    }
+    throw err;
+  }
+  _lock.savedOverflow = savedOverflow;
+  _lock.savedPaddingRight = savedPaddingRight;
+}
 function scrollLock() {
   let owned = false;
   function lock() {
     if (owned) return;
+    if (_lock.count === 0 && typeof document !== "undefined") {
+      applyBodyLock();
+    }
     owned = true;
     _lock.count++;
-    if (_lock.count !== 1 || typeof document === "undefined") return;
-    const body = document.body;
-    const scrollBarWidth = window.innerWidth - document.documentElement.clientWidth;
-    _lock.savedOverflow = body.style.overflow;
-    _lock.savedPaddingRight = body.style.paddingRight;
-    body.style.overflow = "hidden";
-    if (scrollBarWidth > 0) {
-      body.style.paddingRight = `${scrollBarWidth}px`;
-    }
   }
   function unlock() {
     if (!owned) return;