@surdeddd/wmkit 0.9.2 → 0.11.0

package/dist/{chunk-ZWUVWRUS.cjs → chunk-VHS2YX3A.cjs}

@@ -1858,6 +1858,14 @@ var SNAP_ZONES = /* @__PURE__ */ new Set([
 ]);
 var LANDMARK_TAGS = /* @__PURE__ */ new Set(["header", "footer", "aside", "nav"]);
 var FOCUSABLE_SELECTOR = 'button:not([disabled]), [href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), [tabindex]:not([tabindex="-1"])';
+function firedOn(event) {
+  const path = event.composedPath();
+  const first = path.length > 0 ? path[0] : event.target;
+  return first instanceof Element ? first : null;
+}
+function findInWindow(el, selector) {
+  return el.querySelector(selector) ?? el.shadowRoot?.querySelector(selector) ?? null;
+}
 function focusablesOf(el) {
   const root = el.shadowRoot;
   if (!root) return [...el.querySelectorAll(FOCUSABLE_SELECTOR)];
@@ -1877,8 +1885,15 @@ function focusablesOf(el) {
 function dragHandleAt(node, clientX, clientY) {
   const handle = node.closest?.("[data-wm-drag]");
   if (handle) return handle;
-  const inner = node.shadowRoot?.elementFromPoint?.(clientX, clientY) ?? null;
-  return inner === null || inner === node ? null : dragHandleAt(inner, clientX, clientY);
+  const root = node.shadowRoot;
+  if (!root) return null;
+  for (const candidate of root.querySelectorAll("[data-wm-drag]")) {
+    const box = candidate.getBoundingClientRect();
+    if (clientX >= box.left && clientX <= box.right && clientY >= box.top && clientY <= box.bottom) {
+      return candidate;
+    }
+  }
+  return null;
 }
 function windowElementOf(node) {
   const found = node.closest("[data-wm-window]");
@@ -2119,7 +2134,24 @@ function attachDesktop(wm, element, options = {}) {
     restack(stackTarget, { base: zIndexBase, gap: zIndexGap });
     stackRows.length = length;
   }
+  let syncing = false;
+  let syncAgain = false;
   function syncAll() {
+    if (syncing) {
+      syncAgain = true;
+      return;
+    }
+    syncing = true;
+    try {
+      do {
+        syncAgain = false;
+        syncPass();
+      } while (syncAgain);
+    } finally {
+      syncing = false;
+    }
+  }
+  function syncPass() {
     const state = wm.getState();
     const orderChanged = state.order !== lastOrder;
     let restyle = null;
@@ -2143,7 +2175,7 @@ function attachDesktop(wm, element, options = {}) {
         const attached = registry.get(id);
         if (attached && attached.skin !== wanted2) buildSkin(id, wanted2, attached.mountOptions);
       }
-      syncAll();
+      syncAgain = true;
       return;
     }
     if (orderChanged) applyStacking(state.order);
@@ -2202,7 +2234,7 @@ function attachDesktop(wm, element, options = {}) {
       }
       if (!event.ctrlKey && !event.metaKey) return;
       if (drag) return;
-      const target = event.target;
+      const target = firedOn(event);
       if (target?.closest(interactiveSelector)) return;
       if (historyShortcuts && (event.key === "z" || event.key === "Z")) {
         event.preventDefault();
@@ -2233,6 +2265,7 @@ function attachDesktop(wm, element, options = {}) {
     element.addEventListener("keydown", onDesktopKeydown);
     cleanup.push(() => element.removeEventListener("keydown", onDesktopKeydown));
   }
+  let rebuilding = false;
   function endDrag(cancelled) {
     if (drag) drag.finish(cancelled);
   }
@@ -2262,12 +2295,12 @@ function attachDesktop(wm, element, options = {}) {
     windowElement.style.left = "0";
     windowElement.style.top = "0";
     const lightTitle = windowElement.querySelector("[data-wm-title]");
-    attached.title = lightTitle ?? windowElement.shadowRoot?.querySelector("[data-wm-title]") ?? null;
+    attached.title = lightTitle ?? findInWindow(windowElement, "[data-wm-title]");
     if (lightTitle) {
       if (!lightTitle.id) lightTitle.id = `wmkit-title-${id}`;
       windowElement.setAttribute("aria-labelledby", lightTitle.id);
     }
-    const handle = typeof windowOptions.handle === "string" ? windowElement.querySelector(windowOptions.handle) : windowOptions.handle ?? windowElement.querySelector("[data-wm-drag]");
+    const handle = typeof windowOptions.handle === "string" ? findInWindow(windowElement, windowOptions.handle) : windowOptions.handle ?? findInWindow(windowElement, "[data-wm-drag]");
     attached.handle = handle;
     if (handle && !handle.hasAttribute("role") && LANDMARK_TAGS.has(handle.localName)) {
       handle.setAttribute("role", "presentation");
@@ -2280,7 +2313,7 @@ function attachDesktop(wm, element, options = {}) {
       () => windowElement.removeEventListener("pointerdown", onPointerDownFocus, true)
     );
     const onClick = (event) => {
-      const target = event.target;
+      const target = firedOn(event);
       if (!target) return;
       const current = wm.get(id);
       if (!current) return;
@@ -2328,7 +2361,7 @@ function attachDesktop(wm, element, options = {}) {
       handle.addEventListener("pointerdown", onHandleDown);
       attached.cleanup.push(() => handle.removeEventListener("pointerdown", onHandleDown));
       const onDoubleClick = (event) => {
-        const target = event.target;
+        const target = firedOn(event);
         if (target?.closest(interactiveSelector)) return;
         const current = wm.get(id);
         if (current?.maximizable) wm.toggleMaximize(id);
@@ -2360,7 +2393,7 @@ function attachDesktop(wm, element, options = {}) {
       }
     }
     const onWindowKeydown = (event) => {
-      const target = event.target;
+      const target = firedOn(event);
       if (target?.closest(interactiveSelector)) return;
       const current = wm.get(id);
       if (!current) return;
@@ -2420,7 +2453,7 @@ function attachDesktop(wm, element, options = {}) {
     const detach = () => {
       if (detached) return;
       detached = true;
-      if (drag?.id === id) endDrag(true);
+      if (drag?.id === id) endDrag(!rebuilding);
       for (const dispose of attached.cleanup) dispose();
       for (const resizeHandle of attached.handles) resizeHandle.remove();
       registry.delete(id);
@@ -2456,15 +2489,21 @@ function attachDesktop(wm, element, options = {}) {
   function buildSkin(id, skin, windowOptions) {
     const win = wm.get(id);
     if (!win) throw new Error(`wmkit: cannot mount unknown window "${id}"`);
+    const build = resolveSkin(skin);
     const standing = registry.get(id);
     const previous = standing?.mount ?? null;
-    const carried = previous === null ? [] : [...previous.content.childNodes];
+    const carried = previous === null || previous.content.ownerDocument !== doc ? [] : [...previous.content.childNodes];
     if (previous !== null) {
       registry.delete(id);
-      standing?.release?.();
+      rebuilding = true;
+      try {
+        standing?.release?.();
+      } finally {
+        rebuilding = false;
+      }
       previous.element.remove();
     }
-    const mount = resolveSkin(skin)({ doc, id, window: win, actions: createActions(wm, id) });
+    const mount = build({ doc, id, window: win, actions: createActions(wm, id) });
     element.append(mount.element);
     const release = attachWindow(id, mount.element, windowOptions);
     const attached = registry.get(id);
@@ -2476,10 +2515,14 @@ function attachDesktop(wm, element, options = {}) {
     previous?.destroy?.();
     return mount;
   }
-  function mountWindow(id, skin, windowOptions = {}) {
+  function mountWindow(id, skin, options2 = {}) {
+    const windowOptions = { removeOnClose: true, ...options2 };
     let last = buildSkin(id, skin, windowOptions);
+    let spent = false;
     const live = () => {
-      last = registry.get(id)?.mount ?? last;
+      if (spent) return last;
+      const now = registry.get(id)?.mount;
+      if (now) last = now;
       return last;
     };
     return {
@@ -2490,8 +2533,10 @@ function attachDesktop(wm, element, options = {}) {
         return live().content;
       },
       detach() {
+        if (spent) return;
         const mount = live();
-        registry.get(id)?.release?.();
+        spent = true;
+        if (registry.get(id)?.mount === mount) registry.get(id)?.release?.();
         mount.element.remove();
         mount.destroy?.();
       }
@@ -2508,6 +2553,10 @@ function attachDesktop(wm, element, options = {}) {
       for (const [, attached] of registry) {
         for (const dispose of attached.cleanup) dispose();
         for (const resizeHandle of attached.handles) resizeHandle.remove();
+        if (attached.mount) {
+          attached.mount.element.remove();
+          attached.mount.destroy?.();
+        }
       }
       registry.clear();
       for (const dispose of cleanup) dispose();
@@ -2581,5 +2630,5 @@ exports.defaultMessages = defaultMessages;
 exports.flipFromTarget = flipFromTarget;
 exports.flipToTarget = flipToTarget;
 exports.prefersReducedMotion = prefersReducedMotion;
-//# sourceMappingURL=chunk-ZWUVWRUS.cjs.map
-//# sourceMappingURL=chunk-ZWUVWRUS.cjs.map
+//# sourceMappingURL=chunk-VHS2YX3A.cjs.map
+//# sourceMappingURL=chunk-VHS2YX3A.cjs.map