sibujs 3.3.2 → 3.3.3

package/dist/ui.cjs

@@ -107,8 +107,69 @@ function devWarn(message) {
   }
 }
 
-// src/reactivity/track-core.ts
+// src/core/rendering/dispose.ts
+var elementDisposers = /* @__PURE__ */ new WeakMap();
 var _isDev2 = isDev();
+var activeBindingCount = 0;
+function registerDisposer(node, teardown) {
+  let disposers = elementDisposers.get(node);
+  if (!disposers) {
+    disposers = [];
+    elementDisposers.set(node, disposers);
+  }
+  disposers.push(teardown);
+  if (_isDev2) activeBindingCount++;
+}
+function dispose(node) {
+  const stack = [node];
+  const order = [];
+  while (stack.length > 0) {
+    const current = stack.pop();
+    order.push(current);
+    const children = Array.from(current.childNodes);
+    for (let i = 0; i < children.length; i++) {
+      stack.push(children[i]);
+    }
+  }
+  for (let i = order.length - 1; i >= 0; i--) {
+    const current = order[i];
+    const disposers = elementDisposers.get(current);
+    if (disposers) {
+      const snapshot = disposers.slice();
+      elementDisposers.delete(current);
+      if (_isDev2) activeBindingCount -= snapshot.length;
+      for (const d of snapshot) {
+        try {
+          d();
+        } catch (err) {
+          if (_isDev2 && typeof console !== "undefined") {
+            console.warn("[SibuJS] Disposer threw during cleanup:", err);
+          }
+        }
+      }
+      let extraPasses = 0;
+      while (extraPasses++ < 8) {
+        const added = elementDisposers.get(current);
+        if (!added || added.length === 0) break;
+        const moreSnapshot = added.slice();
+        elementDisposers.delete(current);
+        if (_isDev2) activeBindingCount -= moreSnapshot.length;
+        for (const d of moreSnapshot) {
+          try {
+            d();
+          } catch (err) {
+            if (_isDev2 && typeof console !== "undefined") {
+              console.warn("[SibuJS] Disposer threw during cleanup:", err);
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+// src/reactivity/track-core.ts
+var _isDev3 = isDev();
 var POOL_MAX = 4096;
 var nodePool = [];
 function createNode() {
@@ -200,7 +261,7 @@ function safeInvoke(sub) {
   try {
     sub();
   } catch (err) {
-    if (_isDev2) devWarn(`Subscriber threw during notification: ${err instanceof Error ? err.message : String(err)}`);
+    if (_isDev3) devWarn(`Subscriber threw during notification: ${err instanceof Error ? err.message : String(err)}`);
   }
 }
 var suspendDepth = 0;
@@ -522,14 +583,14 @@ function forEachSubscriber(signal2, visit) {
 }
 
 // src/reactivity/track.ts
-var _isDev3 = isDev();
-var _runtimeVersion = true ? "3.3.2" : "dev";
+var _isDev4 = isDev();
+var _runtimeVersion = true ? "3.3.3" : "dev";
 var REGISTRY_KEY = /* @__PURE__ */ Symbol.for("sibujs.reactive.v1");
 function resolveReactiveApi() {
   const g = globalThis;
   const existing = g[REGISTRY_KEY];
   if (existing) {
-    if (_isDev3 && !existing.__dupWarned) {
+    if (_isDev4 && !existing.__dupWarned) {
       existing.__dupWarned = true;
       devWarn(
         `Multiple instances of the reactive runtime detected on this page (active: ${existing.version}, duplicate: ${_runtimeVersion}). Reactivity still works \u2014 all copies share the first one \u2014 but de-duplicate sibujs in your bundler (e.g. Vite optimizeDeps.exclude: ['sibujs'] or resolve.dedupe: ['sibujs']).`
@@ -658,6 +719,162 @@ function derived(getter, options) {
   return computedGetter;
 }
 
+// src/core/ssr-context.ts
+var SSR_KEY = /* @__PURE__ */ Symbol.for("sibujs.ssr.v1");
+function detectSSRShared() {
+  let detected = null;
+  try {
+    if (typeof process !== "undefined" && process.versions && process.versions.node) {
+      let mod = null;
+      const getBuiltin = process.getBuiltinModule;
+      if (typeof getBuiltin === "function") {
+        mod = getBuiltin("node:async_hooks");
+      } else {
+        const req = Function("return typeof require==='function'?require:null")();
+        if (req) mod = req("node:async_hooks");
+      }
+      if (mod) detected = new mod.AsyncLocalStorage();
+    }
+  } catch {
+    detected = null;
+  }
+  return { als: detected, fallbackStore: { ssr: false, suspenseIdCounter: 0 } };
+}
+var _shared = globalThis[SSR_KEY] ?? (globalThis[SSR_KEY] = detectSSRShared());
+var als = _shared.als;
+var fallbackStore = _shared.fallbackStore;
+function getSSRStore() {
+  if (als) {
+    const s = als.getStore();
+    if (s) return s;
+  }
+  return fallbackStore;
+}
+function isSSR() {
+  return getSSRStore().ssr;
+}
+
+// src/core/signals/effect.ts
+var _g = globalThis;
+var MAX_RERUNS = 100;
+function flushUserCleanups(ctx) {
+  const list = ctx.userCleanups;
+  if (list.length === 0) return;
+  ctx.userCleanups = [];
+  for (let i = list.length - 1; i >= 0; i--) {
+    try {
+      list[i]();
+    } catch (err) {
+      if (typeof console !== "undefined") console.warn("[SibuJS effect] onCleanup threw:", err);
+    }
+  }
+}
+function drainReruns(ctx) {
+  let reruns = 1;
+  do {
+    ctx.rerunPending = false;
+    if (ctx.userCleanups.length > 0) flushUserCleanups(ctx);
+    retrack2(ctx.bodyFn, ctx.subscriber);
+  } while (ctx.rerunPending && ++reruns <= MAX_RERUNS);
+  if (ctx.rerunPending) {
+    ctx.rerunPending = false;
+    if (_g.__SIBU_DEV_WARN__ !== false && typeof console !== "undefined") {
+      console.error(
+        `[SibuJS] effect re-requested itself ${MAX_RERUNS}+ times \u2014 likely a write-reads-self cycle. Breaking to prevent infinite loop.`
+      );
+    }
+  }
+}
+function disposeEffect(ctx) {
+  if (ctx.disposed) return;
+  ctx.disposed = true;
+  const h = _g.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
+  if (h) {
+    try {
+      h.emit("effect:destroy", { effectFn: ctx.fn });
+    } catch {
+    }
+  }
+  try {
+    if (ctx.userCleanups.length > 0) flushUserCleanups(ctx);
+  } catch (err) {
+    if (typeof console !== "undefined") {
+      console.warn("[SibuJS effect] onCleanup threw during dispose:", err);
+    }
+  }
+  try {
+    cleanup2(ctx.subscriber);
+  } catch (err) {
+    if (typeof console !== "undefined") {
+      console.warn("[SibuJS effect] dispose threw:", err);
+    }
+  }
+}
+function effect(effectFn, options) {
+  devAssert(typeof effectFn === "function", "effect: argument must be a function.");
+  if (isSSR()) return () => {
+  };
+  const ctx = {
+    fn: effectFn,
+    onError: options?.onError,
+    userCleanups: [],
+    running: false,
+    rerunPending: false,
+    disposed: false,
+    onCleanup: null,
+    subscriber: null,
+    bodyFn: null
+  };
+  ctx.onCleanup = (fn) => {
+    ctx.userCleanups.push(fn);
+  };
+  const onErrorCaptured = ctx.onError;
+  ctx.bodyFn = onErrorCaptured ? () => {
+    try {
+      ctx.fn(ctx.onCleanup);
+    } catch (err) {
+      onErrorCaptured(err);
+    }
+  } : () => {
+    ctx.fn(ctx.onCleanup);
+  };
+  const sub = (() => {
+    if (ctx.disposed) return;
+    if (ctx.running) {
+      ctx.rerunPending = true;
+      return;
+    }
+    ctx.running = true;
+    try {
+      ctx.rerunPending = false;
+      if (ctx.userCleanups.length > 0) flushUserCleanups(ctx);
+      retrack2(ctx.bodyFn, sub);
+      if (ctx.rerunPending) drainReruns(ctx);
+    } finally {
+      ctx.running = false;
+      ctx.rerunPending = false;
+    }
+  });
+  sub.depsHead = null;
+  sub.depsTail = null;
+  sub._epoch = 0;
+  sub._structDirty = false;
+  sub._runEpoch = 0;
+  sub._runs = 0;
+  ctx.subscriber = sub;
+  ctx.running = true;
+  try {
+    retrack2(ctx.bodyFn, ctx.subscriber);
+    if (ctx.rerunPending) drainReruns(ctx);
+  } finally {
+    ctx.running = false;
+    ctx.rerunPending = false;
+  }
+  const hook = _g.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
+  if (hook) hook.emit("effect:create", { effectFn });
+  return () => disposeEffect(ctx);
+}
+
 // src/reactivity/batch.ts
 var batchDepth = 0;
 var pendingSignals = /* @__PURE__ */ new Set();
@@ -709,8 +926,8 @@ var enqueueBatchedSignal = API2.enqueueBatchedSignal;
 var isBatching = API2.isBatching;
 
 // src/core/signals/signal.ts
-var _g = globalThis;
-var _isDev4 = isDev();
+var _g2 = globalThis;
+var _isDev5 = isDev();
 function signal(initial, options) {
   const state = {
     value: initial,
@@ -721,7 +938,7 @@ function signal(initial, options) {
     __activeNode: null,
     __name: void 0
   };
-  const debugName = _isDev4 ? options?.name : void 0;
+  const debugName = _isDev5 ? options?.name : void 0;
   const equalsFn = options?.equals;
   if (debugName) state.__name = debugName;
   function get() {
@@ -738,22 +955,22 @@ function signal(initial, options) {
       if (equalsFn(prev, newValue)) return;
       state.value = newValue;
       state.__v++;
-      if (_isDev4) {
-        const hook = _g.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
+      if (_isDev5) {
+        const hook = _g2.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
         if (hook) hook.emit("signal:update", { signal: state, name: debugName, oldValue: prev, newValue });
       }
       if (!enqueueBatchedSignal(state)) {
         notifySubscribers2(state);
       }
     };
-  } else if (_isDev4) {
+  } else if (_isDev5) {
     set = (next) => {
       const prev = state.value;
       const newValue = typeof next === "function" ? next(prev) : next;
       if (Object.is(newValue, prev)) return;
       state.value = newValue;
       state.__v++;
-      const hook = _g.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
+      const hook = _g2.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
       if (hook) hook.emit("signal:update", { signal: state, name: debugName, oldValue: prev, newValue });
       if (!enqueueBatchedSignal(state)) {
         notifySubscribers2(state);
@@ -771,8 +988,8 @@ function signal(initial, options) {
       }
     };
   }
-  if (_isDev4) {
-    const hook = _g.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
+  if (_isDev5) {
+    const hook = _g2.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
     if (hook) hook.emit("signal:create", { signal: state, name: debugName, getter: get, initial });
   }
   return [get, set];
@@ -848,11 +1065,32 @@ function bindField(field, extras) {
     change: (e) => field.set(readControlValue(e.target)),
     blur: () => field.touch()
   };
-  const { on: extraOn, value: _ignoreValue, ...restExtras } = extras ?? {};
+  const {
+    on: extraOn,
+    value: _ignoreValue,
+    onElement: extraOnElement,
+    ...restExtras
+  } = extras ?? {};
   const mergedOn = extraOn && typeof extraOn === "object" ? { ...extraOn, ...fieldOn } : fieldOn;
+  const onElement = (el) => {
+    if (el instanceof HTMLSelectElement && el.multiple) {
+      const stop = effect(() => {
+        const v = field.value();
+        const selected = Array.isArray(v) ? v.map(String) : [];
+        for (const opt of Array.from(el.options)) {
+          opt.selected = selected.includes(opt.value);
+        }
+      });
+      registerDisposer(el, stop);
+    }
+    if (typeof extraOnElement === "function") {
+      extraOnElement(el);
+    }
+  };
   return {
     value: field.value,
     on: mergedOn,
+    onElement,
     ...restExtras
   };
 }
@@ -909,9 +1147,21 @@ function form(config) {
     }
     return true;
   });
+  const valueEquals = (a, b) => {
+    if (Object.is(a, b)) return true;
+    if (Array.isArray(a) && Array.isArray(b)) {
+      return a.length === b.length && a.every((v, i) => Object.is(v, b[i]));
+    }
+    if (a && b && typeof a === "object" && typeof b === "object") {
+      const ak = Object.keys(a);
+      const bk = Object.keys(b);
+      return ak.length === bk.length && ak.every((k) => Object.is(a[k], b[k]));
+    }
+    return false;
+  };
   const isDirty = derived(() => {
     for (const [name, cfg] of fieldEntries) {
-      if (!Object.is(fieldMap[name].value(), cfg.initial)) return true;
+      if (!valueEquals(fieldMap[name].value(), cfg.initial)) return true;
     }
     return false;
   });
@@ -1006,223 +1256,6 @@ function formAction(fn) {
   return { run, pending, error, result, reset, onSubmit };
 }
 
-// src/core/rendering/dispose.ts
-var elementDisposers = /* @__PURE__ */ new WeakMap();
-var _isDev5 = isDev();
-var activeBindingCount = 0;
-function registerDisposer(node, teardown) {
-  let disposers = elementDisposers.get(node);
-  if (!disposers) {
-    disposers = [];
-    elementDisposers.set(node, disposers);
-  }
-  disposers.push(teardown);
-  if (_isDev5) activeBindingCount++;
-}
-function dispose(node) {
-  const stack = [node];
-  const order = [];
-  while (stack.length > 0) {
-    const current = stack.pop();
-    order.push(current);
-    const children = Array.from(current.childNodes);
-    for (let i = 0; i < children.length; i++) {
-      stack.push(children[i]);
-    }
-  }
-  for (let i = order.length - 1; i >= 0; i--) {
-    const current = order[i];
-    const disposers = elementDisposers.get(current);
-    if (disposers) {
-      const snapshot = disposers.slice();
-      elementDisposers.delete(current);
-      if (_isDev5) activeBindingCount -= snapshot.length;
-      for (const d of snapshot) {
-        try {
-          d();
-        } catch (err) {
-          if (_isDev5 && typeof console !== "undefined") {
-            console.warn("[SibuJS] Disposer threw during cleanup:", err);
-          }
-        }
-      }
-      let extraPasses = 0;
-      while (extraPasses++ < 8) {
-        const added = elementDisposers.get(current);
-        if (!added || added.length === 0) break;
-        const moreSnapshot = added.slice();
-        elementDisposers.delete(current);
-        if (_isDev5) activeBindingCount -= moreSnapshot.length;
-        for (const d of moreSnapshot) {
-          try {
-            d();
-          } catch (err) {
-            if (_isDev5 && typeof console !== "undefined") {
-              console.warn("[SibuJS] Disposer threw during cleanup:", err);
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-// src/core/ssr-context.ts
-var SSR_KEY = /* @__PURE__ */ Symbol.for("sibujs.ssr.v1");
-function detectSSRShared() {
-  let detected = null;
-  try {
-    if (typeof process !== "undefined" && process.versions && process.versions.node) {
-      let mod = null;
-      const getBuiltin = process.getBuiltinModule;
-      if (typeof getBuiltin === "function") {
-        mod = getBuiltin("node:async_hooks");
-      } else {
-        const req = Function("return typeof require==='function'?require:null")();
-        if (req) mod = req("node:async_hooks");
-      }
-      if (mod) detected = new mod.AsyncLocalStorage();
-    }
-  } catch {
-    detected = null;
-  }
-  return { als: detected, fallbackStore: { ssr: false, suspenseIdCounter: 0 } };
-}
-var _shared = globalThis[SSR_KEY] ?? (globalThis[SSR_KEY] = detectSSRShared());
-var als = _shared.als;
-var fallbackStore = _shared.fallbackStore;
-function getSSRStore() {
-  if (als) {
-    const s = als.getStore();
-    if (s) return s;
-  }
-  return fallbackStore;
-}
-function isSSR() {
-  return getSSRStore().ssr;
-}
-
-// src/core/signals/effect.ts
-var _g2 = globalThis;
-var MAX_RERUNS = 100;
-function flushUserCleanups(ctx) {
-  const list = ctx.userCleanups;
-  if (list.length === 0) return;
-  ctx.userCleanups = [];
-  for (let i = list.length - 1; i >= 0; i--) {
-    try {
-      list[i]();
-    } catch (err) {
-      if (typeof console !== "undefined") console.warn("[SibuJS effect] onCleanup threw:", err);
-    }
-  }
-}
-function drainReruns(ctx) {
-  let reruns = 1;
-  do {
-    ctx.rerunPending = false;
-    if (ctx.userCleanups.length > 0) flushUserCleanups(ctx);
-    retrack2(ctx.bodyFn, ctx.subscriber);
-  } while (ctx.rerunPending && ++reruns <= MAX_RERUNS);
-  if (ctx.rerunPending) {
-    ctx.rerunPending = false;
-    if (_g2.__SIBU_DEV_WARN__ !== false && typeof console !== "undefined") {
-      console.error(
-        `[SibuJS] effect re-requested itself ${MAX_RERUNS}+ times \u2014 likely a write-reads-self cycle. Breaking to prevent infinite loop.`
-      );
-    }
-  }
-}
-function disposeEffect(ctx) {
-  if (ctx.disposed) return;
-  ctx.disposed = true;
-  const h = _g2.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
-  if (h) {
-    try {
-      h.emit("effect:destroy", { effectFn: ctx.fn });
-    } catch {
-    }
-  }
-  try {
-    if (ctx.userCleanups.length > 0) flushUserCleanups(ctx);
-  } catch (err) {
-    if (typeof console !== "undefined") {
-      console.warn("[SibuJS effect] onCleanup threw during dispose:", err);
-    }
-  }
-  try {
-    cleanup2(ctx.subscriber);
-  } catch (err) {
-    if (typeof console !== "undefined") {
-      console.warn("[SibuJS effect] dispose threw:", err);
-    }
-  }
-}
-function effect(effectFn, options) {
-  devAssert(typeof effectFn === "function", "effect: argument must be a function.");
-  if (isSSR()) return () => {
-  };
-  const ctx = {
-    fn: effectFn,
-    onError: options?.onError,
-    userCleanups: [],
-    running: false,
-    rerunPending: false,
-    disposed: false,
-    onCleanup: null,
-    subscriber: null,
-    bodyFn: null
-  };
-  ctx.onCleanup = (fn) => {
-    ctx.userCleanups.push(fn);
-  };
-  const onErrorCaptured = ctx.onError;
-  ctx.bodyFn = onErrorCaptured ? () => {
-    try {
-      ctx.fn(ctx.onCleanup);
-    } catch (err) {
-      onErrorCaptured(err);
-    }
-  } : () => {
-    ctx.fn(ctx.onCleanup);
-  };
-  const sub = (() => {
-    if (ctx.disposed) return;
-    if (ctx.running) {
-      ctx.rerunPending = true;
-      return;
-    }
-    ctx.running = true;
-    try {
-      ctx.rerunPending = false;
-      if (ctx.userCleanups.length > 0) flushUserCleanups(ctx);
-      retrack2(ctx.bodyFn, sub);
-      if (ctx.rerunPending) drainReruns(ctx);
-    } finally {
-      ctx.running = false;
-      ctx.rerunPending = false;
-    }
-  });
-  sub.depsHead = null;
-  sub.depsTail = null;
-  sub._epoch = 0;
-  sub._structDirty = false;
-  sub._runEpoch = 0;
-  sub._runs = 0;
-  ctx.subscriber = sub;
-  ctx.running = true;
-  try {
-    retrack2(ctx.bodyFn, ctx.subscriber);
-    if (ctx.rerunPending) drainReruns(ctx);
-  } finally {
-    ctx.running = false;
-    ctx.rerunPending = false;
-  }
-  const hook = _g2.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
-  if (hook) hook.emit("effect:create", { effectFn });
-  return () => disposeEffect(ctx);
-}
-
 // src/ui/virtualList.ts
 function VirtualList(props) {
   const overscan = props.overscan ?? 3;
@@ -1379,7 +1412,6 @@ function inputMask(options) {
     return /[^a-zA-Z0-9]/g;
   }
   const stripRegex = buildStripRegex();
-  const rawCharTest = options.pattern.includes("*") ? () => true : (c) => /[a-zA-Z0-9]/.test(c);
   function bind(input) {
     const onInput = () => {
       const cursorBefore = input.selectionStart ?? input.value.length;
@@ -1389,20 +1421,14 @@ function inputMask(options) {
       setValue(masked);
       setRawValue(extractRaw(masked));
       input.value = masked;
-      let rawBefore = 0;
-      for (let i = 0; i < cursorBefore && i < oldValue.length; i++) {
-        if (rawCharTest(oldValue[i])) rawBefore++;
-      }
+      const rawBefore = oldValue.slice(0, cursorBefore).replace(stripRegex, "").length;
       let newCursor = 0;
       let counted = 0;
-      for (; newCursor < masked.length; newCursor++) {
+      while (newCursor < masked.length && counted < rawBefore) {
         if (newCursor < options.pattern.length && isSlot(options.pattern[newCursor])) {
           counted++;
-          if (counted >= rawBefore) {
-            newCursor++;
-            break;
-          }
         }
+        newCursor++;
       }
       try {
         input.setSelectionRange(newCursor, newCursor);
@@ -1443,6 +1469,12 @@ function zipMask() {
   return { pattern: "99999" };
 }
 
+// src/utils/globalSingleton.ts
+function globalSingleton(key, create) {
+  const g = globalThis;
+  return g[key] ?? (g[key] = create());
+}
+
 // src/ui/a11y.ts
 function aria(element, attrs) {
   for (const [key, value] of Object.entries(attrs)) {
@@ -1601,14 +1633,12 @@ function hotkey(combo, handler, options = {}) {
   document.addEventListener("keydown", listener);
   return () => document.removeEventListener("keydown", listener);
 }
-var announceQueues = {
-  polite: [],
-  assertive: []
-};
-var announceDraining = {
-  polite: false,
-  assertive: false
-};
+var _announce = globalSingleton(/* @__PURE__ */ Symbol.for("sibujs.a11y.announce.v1"), () => ({
+  queues: { polite: [], assertive: [] },
+  draining: { polite: false, assertive: false }
+}));
+var announceQueues = _announce.queues;
+var announceDraining = _announce.draining;
 var ANNOUNCE_INTERVAL_MS = 150;
 function ensureLiveRegion(priority) {
   let region = document.getElementById(`sibu-announce-${priority}`);
@@ -1835,7 +1865,7 @@ function createDialogAria(element, options = {}) {
 }
 
 // src/ui/scopedStyle.ts
-var scopeCounter = 0;
+var _scope = globalSingleton(/* @__PURE__ */ Symbol.for("sibujs.scopedStyle.v1"), () => ({ n: 0 }));
 function decodeCssEscapes(css) {
   return css.replace(/\\([0-9a-f]{1,6})[ \t\n\r\f]?|\\([^\n])/gi, (_match, hex, ch) => {
     if (hex) {
@@ -1862,7 +1892,7 @@ function sanitizeCSS(css) {
   return sanitized;
 }
 function scopedStyle(css) {
-  const id = `sibu-s${scopeCounter++}`;
+  const id = `sibu-s${_scope.n++}`;
   const attr = `data-${id}`;
   const safeCss = sanitizeCSS(css);
   const scopedCSS = safeCss.replace(/([^\r\n,{}]+)(,(?=[^}]*{)|\s*{)/g, (match, selector, delimiter) => {
@@ -2076,13 +2106,16 @@ function bindData(el, key, getter) {
 }
 
 // src/ui/dialog.ts
-var dialogStack = [];
-var globalListenerAttached = false;
+var _dlg = globalSingleton(/* @__PURE__ */ Symbol.for("sibujs.dialog.v1"), () => ({
+  stack: [],
+  listenerAttached: false
+}));
+var dialogStack = _dlg.stack;
 function __resetDialogStack() {
   while (dialogStack.length > 0) dialogStack.pop();
-  if (typeof window !== "undefined" && globalListenerAttached) {
+  if (typeof window !== "undefined" && _dlg.listenerAttached) {
     window.removeEventListener("keydown", handleGlobalKeydown);
-    globalListenerAttached = false;
+    _dlg.listenerAttached = false;
   }
 }
 function handleGlobalKeydown(event) {
@@ -2091,16 +2124,16 @@ function handleGlobalKeydown(event) {
   if (top) top.close();
 }
 function ensureGlobalListener() {
-  if (typeof window === "undefined" || globalListenerAttached) return;
+  if (typeof window === "undefined" || _dlg.listenerAttached) return;
   window.addEventListener("keydown", handleGlobalKeydown);
-  globalListenerAttached = true;
+  _dlg.listenerAttached = true;
 }
 function removeGlobalListenerIfIdle() {
   if (typeof window === "undefined") return;
-  if (!globalListenerAttached) return;
+  if (!_dlg.listenerAttached) return;
   if (dialogStack.length > 0) return;
   window.removeEventListener("keydown", handleGlobalKeydown);
-  globalListenerAttached = false;
+  _dlg.listenerAttached = false;
 }
 function dialog() {
   const [isOpen, setIsOpen] = signal(false);
@@ -2226,6 +2259,10 @@ function infiniteScroll(options) {
       await onLoadMore();
     } finally {
       setLoading(false);
+      if (!disposed && observer && _current && hasMore()) {
+        observer.unobserve(_current);
+        observer.observe(_current);
+      }
     }
   }
   const originalRef = sentinelRef;
@@ -2265,29 +2302,30 @@ function pagination(options) {
     const total = options.totalItems();
     return Math.max(1, Math.ceil(total / pageSizeValue));
   });
+  const currentPage = derived(() => Math.min(Math.max(1, page()), totalPages()));
   const startIndex = derived(() => {
-    return (page() - 1) * pageSizeValue;
+    return (currentPage() - 1) * pageSizeValue;
   });
   const endIndex = derived(() => {
-    const end = page() * pageSizeValue;
+    const end = currentPage() * pageSizeValue;
     const total = options.totalItems();
     return Math.min(end, total);
   });
   function next() {
-    if (page() < totalPages()) {
-      setPage((p) => p + 1);
+    if (currentPage() < totalPages()) {
+      setPage(currentPage() + 1);
     }
   }
   function prev() {
-    if (page() > 1) {
-      setPage((p) => p - 1);
+    if (currentPage() > 1) {
+      setPage(currentPage() - 1);
     }
   }
   function goTo(target) {
     const clamped = Math.max(1, Math.min(target, totalPages()));
     setPage(clamped);
   }
-  return { page, pageSize, totalPages, next, prev, goTo, startIndex, endIndex };
+  return { page: currentPage, pageSize, totalPages, next, prev, goTo, startIndex, endIndex };
 }
 
 // src/ui/eventBus.ts
@@ -2414,24 +2452,27 @@ function hover(target) {
     target.removeEventListener("pointerenter", onEnter);
     target.removeEventListener("pointerleave", onLeave);
   }
+  registerDisposer(target, dispose2);
   return { hovered, dispose: dispose2 };
 }
 
 // src/ui/scrollLock.ts
-var lockCount = 0;
-var savedOverflow = null;
-var savedPaddingRight = null;
+var _lock = globalSingleton(/* @__PURE__ */ Symbol.for("sibujs.scrollLock.v1"), () => ({
+  count: 0,
+  savedOverflow: null,
+  savedPaddingRight: null
+}));
 function scrollLock() {
   let owned = false;
   function lock() {
     if (owned) return;
     owned = true;
-    lockCount++;
-    if (lockCount !== 1 || typeof document === "undefined") return;
+    _lock.count++;
+    if (_lock.count !== 1 || typeof document === "undefined") return;
     const body = document.body;
     const scrollBarWidth = window.innerWidth - document.documentElement.clientWidth;
-    savedOverflow = body.style.overflow;
-    savedPaddingRight = body.style.paddingRight;
+    _lock.savedOverflow = body.style.overflow;
+    _lock.savedPaddingRight = body.style.paddingRight;
     body.style.overflow = "hidden";
     if (scrollBarWidth > 0) {
       body.style.paddingRight = `${scrollBarWidth}px`;
@@ -2440,13 +2481,13 @@ function scrollLock() {
   function unlock() {
     if (!owned) return;
     owned = false;
-    lockCount = Math.max(0, lockCount - 1);
-    if (lockCount !== 0 || typeof document === "undefined") return;
+    _lock.count = Math.max(0, _lock.count - 1);
+    if (_lock.count !== 0 || typeof document === "undefined") return;
     const body = document.body;
-    body.style.overflow = savedOverflow ?? "";
-    body.style.paddingRight = savedPaddingRight ?? "";
-    savedOverflow = null;
-    savedPaddingRight = null;
+    body.style.overflow = _lock.savedOverflow ?? "";
+    body.style.paddingRight = _lock.savedPaddingRight ?? "";
+    _lock.savedOverflow = null;
+    _lock.savedPaddingRight = null;
   }
   return { lock, unlock };
 }