sibujs 4.4.0 → 4.6.0

package/dist/{chunk-HFCOH2GN.js → chunk-HYXDKS4N.js}

@@ -1,22 +1,21 @@
 import {
   watch
-} from "./chunk-RR7M3FHM.js";
+} from "./chunk-UZQ6ALFS.js";
 import {
-  createId
-} from "./chunk-CCSJMTRN.js";
+  createId,
+  domBinding,
+  idSegment
+} from "./chunk-3ISI6ACU.js";
 import {
   derived
-} from "./chunk-W2EQ7X2L.js";
+} from "./chunk-QE4TTDU3.js";
 import {
   stripHtml
-} from "./chunk-IXKSNWV5.js";
-import {
-  effect
-} from "./chunk-7GIHSAWB.js";
+} from "./chunk-2INLLLMZ.js";
 import {
   batch,
   signal
-} from "./chunk-NVNJH22U.js";
+} from "./chunk-D33YTSX5.js";
 
 // src/widgets/Combobox.ts
 var boundComboboxes = /* @__PURE__ */ new WeakMap();
@@ -91,7 +90,7 @@ function combobox(options) {
     els.input.setAttribute("role", "combobox");
     els.input.setAttribute("aria-autocomplete", "list");
     els.input.setAttribute("aria-controls", listboxId);
-    const fxTeardown = effect(() => {
+    const fxTeardown = domBinding(() => {
       const open2 = isOpen();
       els.input.setAttribute("aria-expanded", open2 ? "true" : "false");
       els.listbox.hidden = !open2;
@@ -109,7 +108,7 @@ function combobox(options) {
       }
       if (activeId) els.input.setAttribute("aria-activedescendant", activeId);
       else els.input.removeAttribute("aria-activedescendant");
-    });
+    }, els.input);
     const onInput = () => {
       setQuery(els.input.value);
       open();
@@ -157,8 +156,11 @@ function combobox(options) {
     els.input.addEventListener("focus", onFocus);
     els.input.addEventListener("blur", onBlur);
     els.listbox.addEventListener("mousedown", onListboxPointerDown);
+    let tornDown = false;
     const teardown = () => {
-      boundComboboxes.delete(els.input);
+      if (tornDown) return;
+      tornDown = true;
+      if (boundComboboxes.get(els.input) === teardown) boundComboboxes.delete(els.input);
       fxTeardown();
       els.input.removeEventListener("input", onInput);
       els.input.removeEventListener("keydown", onKey);
@@ -203,11 +205,23 @@ function combobox(options) {
   };
 }
 
+// src/widgets/attributeSnapshot.ts
+function snapshotAttributes(el, names) {
+  const previous = names.map((name) => [name, el.getAttribute(name)]);
+  return () => {
+    for (const [name, value] of previous) {
+      if (value === null) el.removeAttribute(name);
+      else el.setAttribute(name, value);
+    }
+  };
+}
+
 // src/widgets/Tabs.ts
 var boundTablists = /* @__PURE__ */ new WeakMap();
 function tabs(options) {
   const { tabs: tabDefs, defaultTab } = options;
-  const initialTab = defaultTab ?? tabDefs.find((t) => !t.disabled)?.id ?? tabDefs[0]?.id ?? "";
+  const firstEnabled = tabDefs.find((t) => !t.disabled)?.id ?? "";
+  const initialTab = defaultTab !== void 0 && tabDefs.some((t) => t.id === defaultTab && !t.disabled) ? defaultTab : firstEnabled;
   const [activeTab, setActiveTabState] = signal(initialTab);
   function setActiveTab(id) {
     const tab = tabDefs.find((t) => t.id === id);
@@ -254,58 +268,29 @@ function tabs(options) {
   function bind(els) {
     const existing = boundTablists.get(els.tablist);
     if (existing) return existing;
-    const restore = [];
-    const prevTablistRole = els.tablist.getAttribute("role");
+    const restore = [snapshotAttributes(els.tablist, ["role"])];
     els.tablist.setAttribute("role", "tablist");
-    restore.push(() => {
-      if (prevTablistRole === null) els.tablist.removeAttribute("role");
-      else els.tablist.setAttribute("role", prevTablistRole);
-    });
+    const idPrefix = createId("sibu-tabs");
     for (const def of tabDefs) {
       const tabEl = els.tabs[def.id];
       if (!tabEl) continue;
-      const prevRole = tabEl.getAttribute("role");
-      const prevId = tabEl.id;
-      const prevDisabled = tabEl.getAttribute("aria-disabled");
-      const prevControls = tabEl.getAttribute("aria-controls");
+      restore.push(
+        snapshotAttributes(tabEl, ["role", "id", "aria-disabled", "aria-controls", "aria-selected", "tabindex"])
+      );
       tabEl.setAttribute("role", "tab");
-      tabEl.setAttribute("id", `sibu-tab-${def.id}`);
+      if (!tabEl.id) tabEl.id = `${idPrefix}-tab-${idSegment(def.id)}`;
       if (def.disabled) tabEl.setAttribute("aria-disabled", "true");
+      else tabEl.removeAttribute("aria-disabled");
       const panelEl = els.panels?.[def.id];
-      let prevPanelRole = null;
-      let prevPanelId = "";
-      let prevPanelLabelledBy = null;
       if (panelEl) {
-        prevPanelRole = panelEl.getAttribute("role");
-        prevPanelId = panelEl.id;
-        prevPanelLabelledBy = panelEl.getAttribute("aria-labelledby");
+        restore.push(snapshotAttributes(panelEl, ["role", "id", "aria-labelledby", "hidden"]));
         panelEl.setAttribute("role", "tabpanel");
-        panelEl.setAttribute("id", `sibu-tabpanel-${def.id}`);
-        panelEl.setAttribute("aria-labelledby", `sibu-tab-${def.id}`);
-        tabEl.setAttribute("aria-controls", `sibu-tabpanel-${def.id}`);
+        if (!panelEl.id) panelEl.id = `${idPrefix}-panel-${idSegment(def.id)}`;
+        panelEl.setAttribute("aria-labelledby", tabEl.id);
+        tabEl.setAttribute("aria-controls", panelEl.id);
       }
-      restore.push(() => {
-        if (prevRole === null) tabEl.removeAttribute("role");
-        else tabEl.setAttribute("role", prevRole);
-        if (prevId === "") tabEl.removeAttribute("id");
-        else tabEl.id = prevId;
-        if (prevDisabled === null) tabEl.removeAttribute("aria-disabled");
-        else tabEl.setAttribute("aria-disabled", prevDisabled);
-        if (prevControls === null) tabEl.removeAttribute("aria-controls");
-        else tabEl.setAttribute("aria-controls", prevControls);
-        tabEl.removeAttribute("aria-selected");
-        tabEl.removeAttribute("tabindex");
-        if (panelEl) {
-          if (prevPanelRole === null) panelEl.removeAttribute("role");
-          else panelEl.setAttribute("role", prevPanelRole);
-          if (prevPanelId === "") panelEl.removeAttribute("id");
-          else panelEl.id = prevPanelId;
-          if (prevPanelLabelledBy === null) panelEl.removeAttribute("aria-labelledby");
-          else panelEl.setAttribute("aria-labelledby", prevPanelLabelledBy);
-        }
-      });
     }
-    const fxTeardown = effect(() => {
+    const fxTeardown = domBinding(() => {
       const active = activeTab();
       for (const def of tabDefs) {
         const tabEl = els.tabs[def.id];
@@ -316,7 +301,7 @@ function tabs(options) {
         const panelEl = els.panels?.[def.id];
         if (panelEl) panelEl.hidden = !isAct;
       }
-    });
+    }, els.tablist);
     const onKey = (e) => {
       if (e.key === "ArrowRight" || e.key === "ArrowDown") {
         e.preventDefault();
@@ -353,7 +338,10 @@ function tabs(options) {
       tabEl.addEventListener("click", fn);
       clickHandlers.push({ el: tabEl, fn });
     }
+    let tornDown = false;
     const teardown = () => {
+      if (tornDown) return;
+      tornDown = true;
       boundTablists.delete(els.tablist);
       fxTeardown();
       els.tablist.removeEventListener("keydown", onKey);
@@ -379,7 +367,10 @@ function tabs(options) {
 var boundAccordions = /* @__PURE__ */ new WeakMap();
 function accordion(options) {
   const { items: itemDefs, multiple = false, defaultExpanded = [] } = options;
-  const [expandedIds, setExpandedIds] = signal(new Set(defaultExpanded));
+  const knownIds = new Set(itemDefs.map((item) => item.id));
+  const validDefaults = defaultExpanded.filter((id) => knownIds.has(id));
+  const initialExpanded = multiple ? validDefaults : validDefaults.slice(0, 1);
+  const [expandedIds, setExpandedIds] = signal(new Set(initialExpanded));
   const items = derived(
     () => itemDefs.map((item) => ({
       ...item,
@@ -430,42 +421,22 @@ function accordion(options) {
       if (existing) return existing;
     }
     const restore = [];
+    const idPrefix = createId("sibu-accordion");
     for (const item of itemDefs) {
       const trig = els.triggers[item.id];
       const panel = els.panels[item.id];
       if (!trig) continue;
-      const prevTrigId = trig.id;
-      const prevTrigControls = trig.getAttribute("aria-controls");
-      trig.id = `sibu-accordion-trigger-${item.id}`;
-      let prevPanelRole = null;
-      let prevPanelId = "";
-      let prevPanelLabelledBy = null;
+      restore.push(snapshotAttributes(trig, ["id", "aria-controls", "aria-expanded"]));
+      if (!trig.id) trig.id = `${idPrefix}-trigger-${idSegment(item.id)}`;
       if (panel) {
-        prevPanelRole = panel.getAttribute("role");
-        prevPanelId = panel.id;
-        prevPanelLabelledBy = panel.getAttribute("aria-labelledby");
+        restore.push(snapshotAttributes(panel, ["role", "id", "aria-labelledby", "hidden"]));
         panel.setAttribute("role", "region");
-        panel.id = `sibu-accordion-panel-${item.id}`;
+        if (!panel.id) panel.id = `${idPrefix}-panel-${idSegment(item.id)}`;
         panel.setAttribute("aria-labelledby", trig.id);
         trig.setAttribute("aria-controls", panel.id);
       }
-      restore.push(() => {
-        if (prevTrigId === "") trig.removeAttribute("id");
-        else trig.id = prevTrigId;
-        if (prevTrigControls === null) trig.removeAttribute("aria-controls");
-        else trig.setAttribute("aria-controls", prevTrigControls);
-        trig.removeAttribute("aria-expanded");
-        if (panel) {
-          if (prevPanelRole === null) panel.removeAttribute("role");
-          else panel.setAttribute("role", prevPanelRole);
-          if (prevPanelId === "") panel.removeAttribute("id");
-          else panel.id = prevPanelId;
-          if (prevPanelLabelledBy === null) panel.removeAttribute("aria-labelledby");
-          else panel.setAttribute("aria-labelledby", prevPanelLabelledBy);
-        }
-      });
     }
-    const fxTeardown = effect(() => {
+    const fxTeardown = domBinding(() => {
       const ids = expandedIds();
       for (const item of itemDefs) {
         const trig = els.triggers[item.id];
@@ -475,7 +446,7 @@ function accordion(options) {
         trig.setAttribute("aria-expanded", expanded ? "true" : "false");
         if (panel) panel.hidden = !expanded;
       }
-    });
+    }, idempotencyKey);
     const handlers = [];
     for (const item of itemDefs) {
       const trig = els.triggers[item.id];
@@ -491,7 +462,10 @@ function accordion(options) {
       trig.addEventListener("keydown", key);
       handlers.push({ el: trig, click, key });
     }
+    let tornDown = false;
     const teardown = () => {
+      if (tornDown) return;
+      tornDown = true;
       if (idempotencyKey) boundAccordions.delete(idempotencyKey);
       fxTeardown();
       for (const { el, click, key } of handlers) {
@@ -550,11 +524,11 @@ function popover() {
       }
       els.popover.setAttribute("aria-labelledby", els.labelledBy.id);
     }
-    const fxTeardown = effect(() => {
+    const fxTeardown = domBinding(() => {
       const open2 = isOpen();
       els.trigger.setAttribute("aria-expanded", open2 ? "true" : "false");
       els.popover.hidden = !open2;
-    });
+    }, els.trigger);
     const onTriggerClick = (e) => {
       e.preventDefault();
       toggle();
@@ -577,8 +551,11 @@ function popover() {
     els.popover.addEventListener("keydown", onKey);
     els.trigger.addEventListener("keydown", onKey);
     document.addEventListener("pointerdown", onDocPointer);
+    let tornDown = false;
     const teardown = () => {
-      boundPopovers.delete(els.trigger);
+      if (tornDown) return;
+      tornDown = true;
+      if (boundPopovers.get(els.trigger) === teardown) boundPopovers.delete(els.trigger);
       fxTeardown();
       els.trigger.removeEventListener("click", onTriggerClick);
       els.popover.removeEventListener("keydown", onKey);
@@ -696,7 +673,7 @@ function select(options) {
     els.listbox.setAttribute("aria-multiselectable", multiple ? "true" : "false");
     if (els.listbox.tabIndex < 0) els.listbox.tabIndex = 0;
     const toStr = els.itemToString ?? itemToString ?? ((it) => String(it));
-    const fxTeardown = effect(() => {
+    const fxTeardown = domBinding(() => {
       const idx = highlightedIndex();
       const sel = selectedItems();
       let activeId = "";
@@ -706,13 +683,14 @@ function select(options) {
         if (!optEl.id) optEl.id = `${listboxId}-opt-${i}`;
         optEl.setAttribute("role", "option");
         optEl.setAttribute("aria-selected", sel.includes(items[i]) ? "true" : "false");
-        if (isItemDisabled(items[i])) optEl.setAttribute("aria-disabled", "true");
+        const disabled = isItemDisabled(items[i]);
+        if (disabled) optEl.setAttribute("aria-disabled", "true");
         else optEl.removeAttribute("aria-disabled");
-        if (i === idx) activeId = optEl.id;
+        if (i === idx && !disabled) activeId = optEl.id;
       }
       if (activeId) els.listbox.setAttribute("aria-activedescendant", activeId);
       else els.listbox.removeAttribute("aria-activedescendant");
-    });
+    }, els.listbox);
     let typeBuffer = "";
     let typeTimer = null;
     const onKey = (e) => {
@@ -724,10 +702,12 @@ function select(options) {
         highlightPrev();
       } else if (e.key === "Home") {
         e.preventDefault();
-        if (items.length > 0) setHighlightedIndex(0);
+        const first = nextEnabled(-1, 1);
+        if (first !== -1) setHighlightedIndex(first);
       } else if (e.key === "End") {
         e.preventDefault();
-        if (items.length > 0) setHighlightedIndex(items.length - 1);
+        const last = nextEnabled(items.length, -1);
+        if (last !== -1) setHighlightedIndex(last);
       } else if (e.key === "Enter" || e.key === " ") {
         if (highlightedIndex() >= 0) {
           e.preventDefault();
@@ -745,8 +725,11 @@ function select(options) {
       }
     };
     els.listbox.addEventListener("keydown", onKey);
+    let tornDown = false;
     const teardown = () => {
-      boundSelects.delete(els.listbox);
+      if (tornDown) return;
+      tornDown = true;
+      if (boundSelects.get(els.listbox) === teardown) boundSelects.delete(els.listbox);
       fxTeardown();
       els.listbox.removeEventListener("keydown", onKey);
       if (typeTimer !== null) clearTimeout(typeTimer);
@@ -832,9 +815,9 @@ function tooltip(options) {
     els.tooltip.id = id;
     const prevDescribedBy = els.trigger.getAttribute("aria-describedby");
     els.trigger.setAttribute("aria-describedby", prevDescribedBy ? `${prevDescribedBy} ${id}` : id);
-    const fxTeardown = effect(() => {
+    const fxTeardown = domBinding(() => {
       els.tooltip.hidden = !isVisible();
-    });
+    }, els.trigger);
     const onTriggerEnter = () => show();
     const onTriggerLeave = () => scheduleHide();
     const onTooltipEnter = () => {
@@ -859,8 +842,11 @@ function tooltip(options) {
     els.trigger.addEventListener("keydown", onKey);
     els.tooltip.addEventListener("pointerenter", onTooltipEnter);
     els.tooltip.addEventListener("pointerleave", onTooltipLeave);
+    let tornDown = false;
     const teardown = () => {
-      boundTriggers.delete(els.trigger);
+      if (tornDown) return;
+      tornDown = true;
+      if (boundTriggers.get(els.trigger) === teardown) boundTriggers.delete(els.trigger);
       fxTeardown();
       els.trigger.removeEventListener("pointerenter", onTriggerEnter);
       els.trigger.removeEventListener("pointerleave", onTriggerLeave);
@@ -898,7 +884,8 @@ function fileUpload(options) {
   const [isDragOver, setDragOver] = signal(false);
   function isAccepted(file) {
     if (!accept) return true;
-    const acceptedTypes = accept.split(",").map((t) => t.trim().toLowerCase());
+    const acceptedTypes = accept.split(",").map((t) => t.trim().toLowerCase()).filter((t) => t.length > 0);
+    if (acceptedTypes.length === 0) return true;
     const fileName = file.name.toLowerCase();
     const fileType = file.type.toLowerCase();
     return acceptedTypes.some((pattern) => {
@@ -927,16 +914,17 @@ function fileUpload(options) {
       }
       validFiles.push(file);
     }
+    const committed = multiple ? validFiles : validFiles.slice(-1);
     batch(() => {
       setErrors(newErrors);
-      if (validFiles.length > 0) {
+      if (committed.length > 0) {
         if (multiple) {
-          setFiles((prev) => [...prev, ...validFiles]);
+          setFiles((prev) => [...prev, ...committed]);
         } else {
-          setFiles([validFiles[validFiles.length - 1]]);
+          setFiles(committed);
         }
         if (onFiles) {
-          onFiles(validFiles);
+          onFiles(committed);
         }
       }
     });
@@ -960,8 +948,15 @@ function fileUpload(options) {
     if (existing) return existing;
     const id = createId("sibu-fileupload");
     const restore = [];
+    const prevAccept = els.input.getAttribute("accept");
+    const prevMultiple = els.input.hasAttribute("multiple");
     if (accept) els.input.accept = accept;
     els.input.multiple = multiple;
+    restore.push(() => {
+      if (prevAccept === null) els.input.removeAttribute("accept");
+      else els.input.setAttribute("accept", prevAccept);
+      els.input.multiple = prevMultiple;
+    });
     let hintId = null;
     if (els.hint) {
       const assignedHintId = !els.hint.id;
@@ -982,6 +977,7 @@ function fileUpload(options) {
     if (els.errorRegion) {
       const prevRole = els.errorRegion.getAttribute("role");
       const prevLive = els.errorRegion.getAttribute("aria-live");
+      const prevText = els.errorRegion.textContent;
       els.errorRegion.setAttribute("role", "status");
       els.errorRegion.setAttribute("aria-live", "polite");
       restore.push(() => {
@@ -989,12 +985,14 @@ function fileUpload(options) {
         else els.errorRegion.setAttribute("role", prevRole);
         if (prevLive === null) els.errorRegion.removeAttribute("aria-live");
         else els.errorRegion.setAttribute("aria-live", prevLive);
+        els.errorRegion.textContent = prevText;
       });
     }
     if (els.dropZone) {
       const prevDzRole = els.dropZone.getAttribute("role");
       const prevDzLabel = els.dropZone.getAttribute("aria-label");
       const prevDzTabindex = els.dropZone.hasAttribute("tabindex") ? els.dropZone.getAttribute("tabindex") : null;
+      const prevDzDragOver = els.dropZone.getAttribute("data-drag-over");
       els.dropZone.setAttribute("role", "button");
       els.dropZone.setAttribute("aria-label", "File drop zone \u2014 click or press Enter to browse");
       if (els.dropZone.tabIndex < 0) els.dropZone.tabIndex = 0;
@@ -1005,13 +1003,15 @@ function fileUpload(options) {
         else els.dropZone.setAttribute("aria-label", prevDzLabel);
         if (prevDzTabindex === null) els.dropZone.removeAttribute("tabindex");
         else els.dropZone.setAttribute("tabindex", prevDzTabindex);
+        if (prevDzDragOver === null) els.dropZone.removeAttribute("data-drag-over");
+        else els.dropZone.setAttribute("data-drag-over", prevDzDragOver);
       });
     }
-    const fxTeardown = effect(() => {
+    const fxTeardown = domBinding(() => {
       const errs = errors();
       if (els.errorRegion) els.errorRegion.textContent = errs.join(". ");
       if (els.dropZone) els.dropZone.setAttribute("data-drag-over", isDragOver() ? "true" : "false");
-    });
+    }, els.input);
     const onChange = () => {
       if (els.input.files) addFiles(els.input.files);
     };
@@ -1040,7 +1040,10 @@ function fileUpload(options) {
       els.dropZone.addEventListener("dragleave", onDragLeave);
       els.dropZone.addEventListener("drop", onDrop);
     }
+    let tornDown = false;
     const teardown = () => {
+      if (tornDown) return;
+      tornDown = true;
       boundFileUploads.delete(els.input);
       fxTeardown();
       els.input.removeEventListener("change", onChange);
@@ -1069,12 +1072,15 @@ function fileUpload(options) {
 }
 
 // src/widgets/contentEditable.ts
+function toInertText(html) {
+  return stripHtml(String(html)).replace(/<(?=[a-z!/?])/gi, "&lt;");
+}
 function contentEditable(element) {
   const [content, setContentInternal] = signal("");
   const [isFocused, setFocused] = signal(false);
   function setContent(input) {
     if (typeof input === "string") {
-      setContentInternal(input);
+      setContentInternal(toInertText(input));
       return;
     }
     if (typeof input.text === "string") {
@@ -1083,7 +1089,7 @@ function contentEditable(element) {
     }
     if (typeof input.html === "string") {
       const shouldSanitize = input.sanitize !== false;
-      setContentInternal(shouldSanitize ? stripHtml(input.html) : input.html);
+      setContentInternal(shouldSanitize ? toInertText(input.html) : input.html);
       return;
     }
     setContentInternal("");
@@ -1095,7 +1101,7 @@ function contentEditable(element) {
     const range = selection.getRangeAt(0);
     if (element && !element.contains(range.commonAncestorContainer)) return;
     const ancestor = range.commonAncestorContainer;
-    const existingWrap = findAncestorByTag(
+    const existingWrap = findWrapperWithinEditor(
       ancestor instanceof HTMLElement ? ancestor : ancestor.parentElement,
       tagName
     );
@@ -1136,14 +1142,19 @@ function contentEditable(element) {
       selection.addRange(newRange);
     }
   }
-  function findAncestorByTag(el, tagName) {
+  function findWrapperWithinEditor(el, tagName) {
     const upper = tagName.toUpperCase();
     while (el) {
+      if (el === element || isEditingHost(el)) return null;
       if (el.tagName === upper) return el;
       el = el.parentElement;
     }
     return null;
   }
+  function isEditingHost(el) {
+    const attr = el.getAttribute("contenteditable");
+    return attr !== null && attr.toLowerCase() !== "false";
+  }
   function bold() {
     wrapSelection("strong");
   }
@@ -1279,15 +1290,36 @@ function datePicker(options) {
     els.grid.setAttribute("role", "grid");
     if (els.grid.tabIndex < 0) els.grid.tabIndex = 0;
     let pendingFocus = false;
-    const fxTeardown = effect(() => {
+    const touchedCells = /* @__PURE__ */ new Map();
+    const restoreAttr = (el, name, value) => {
+      if (value === null) el.removeAttribute(name);
+      else el.setAttribute(name, value);
+    };
+    const restoreCell = (cell, snap) => {
+      restoreAttr(cell, "role", snap.role);
+      restoreAttr(cell, "aria-selected", snap.selected);
+      restoreAttr(cell, "aria-disabled", snap.disabled);
+      restoreAttr(cell, "tabindex", snap.tabindex);
+    };
+    const fxTeardown = domBinding(() => {
       const sel = selectedDate();
       const view = viewDate();
       const days = daysInMonth();
       els.grid.setAttribute("aria-label", view.toLocaleDateString(void 0, { month: "long", year: "numeric" }));
       let viewCell = null;
+      const displayed = /* @__PURE__ */ new Set();
       for (const d of days) {
         const cell = els.cell(d.date);
         if (!cell) continue;
+        displayed.add(cell);
+        if (!touchedCells.has(cell)) {
+          touchedCells.set(cell, {
+            role: cell.getAttribute("role"),
+            selected: cell.getAttribute("aria-selected"),
+            disabled: cell.getAttribute("aria-disabled"),
+            tabindex: cell.getAttribute("tabindex")
+          });
+        }
         cell.setAttribute("role", "gridcell");
         cell.setAttribute("aria-selected", sel && isSameCalendarDay(sel, d.date) ? "true" : "false");
         if (d.isDisabled) cell.setAttribute("aria-disabled", "true");
@@ -1296,11 +1328,17 @@ function datePicker(options) {
         cell.tabIndex = isView ? 0 : -1;
         if (isView) viewCell = cell;
       }
+      for (const [cell, snap] of touchedCells) {
+        if (!displayed.has(cell)) {
+          restoreCell(cell, snap);
+          touchedCells.delete(cell);
+        }
+      }
       if (pendingFocus && viewCell && typeof viewCell.focus === "function") {
         pendingFocus = false;
         viewCell.focus();
       }
-    });
+    }, els.grid);
     function isSameCalendarDay(a, b) {
       return a.getFullYear() === b.getFullYear() && a.getMonth() === b.getMonth() && a.getDate() === b.getDate();
     }
@@ -1355,8 +1393,11 @@ function datePicker(options) {
       }
     };
     els.grid.addEventListener("keydown", onKey);
+    let tornDown = false;
     const teardown = () => {
-      boundDatePickers.delete(els.grid);
+      if (tornDown) return;
+      tornDown = true;
+      if (boundDatePickers.get(els.grid) === teardown) boundDatePickers.delete(els.grid);
       fxTeardown();
       els.grid.removeEventListener("keydown", onKey);
       if (prevGridRole === null) els.grid.removeAttribute("role");
@@ -1365,6 +1406,8 @@ function datePicker(options) {
       else els.grid.setAttribute("tabindex", prevGridTabIndex);
       if (prevGridLabel === null) els.grid.removeAttribute("aria-label");
       else els.grid.setAttribute("aria-label", prevGridLabel);
+      for (const [cell, snap] of touchedCells) restoreCell(cell, snap);
+      touchedCells.clear();
     };
     boundDatePickers.set(els.grid, teardown);
     return teardown;