@surdeddd/wmkit 0.7.0 → 0.7.2

package/dist/{chunk-E47Q36LM.cjs → chunk-NJAI5R4J.cjs}

@@ -1027,6 +1027,7 @@ function createWindowManager(options = {}) {
     }
   }
   function applyEntry(entry) {
+    const previousWindows = windows;
     windows = entry.windows;
     order = [...entry.order];
     modalCount = countModals();
@@ -1038,6 +1039,16 @@ function createWindowManager(options = {}) {
     if (workspace !== previousWorkspace) {
       queueEvent(() => emitter.emit("workspace", { workspace, previous: previousWorkspace }));
     }
+    for (const id of Object.keys(previousWindows)) {
+      if (windows[id]) continue;
+      const closed = previousWindows[id];
+      queueEvent(() => emitter.emit("close", { window: closed }));
+    }
+    for (const id of order) {
+      if (previousWindows[id]) continue;
+      const opened = windows[id];
+      queueEvent(() => emitter.emit("open", { window: opened }));
+    }
     reflowViewport();
     commit();
   }
@@ -1988,7 +1999,7 @@ function attachDesktop(wm, element, options = {}) {
   const registry = /* @__PURE__ */ new Map();
   const cleanup = [];
   let lastOrder = null;
-  let lastFocused = null;
+  let focusedEl = null;
   let drag = null;
   let groupTargetId = null;
   let groupTargetEl = null;
@@ -2175,16 +2186,11 @@ function attachDesktop(wm, element, options = {}) {
       }
     }
     if (orderChanged) applyStacking(state.order);
-    if (state.focusedId !== lastFocused) {
-      if (lastFocused) {
-        const prev = registry.get(lastFocused);
-        if (prev) delete prev.element.dataset.wmFocused;
-      }
-      if (state.focusedId) {
-        const next = registry.get(state.focusedId);
-        if (next) next.element.dataset.wmFocused = "";
-      }
-      lastFocused = state.focusedId;
+    const wanted = state.focusedId ? registry.get(state.focusedId)?.element ?? null : null;
+    if (wanted !== focusedEl) {
+      if (focusedEl) delete focusedEl.dataset.wmFocused;
+      focusedEl = wanted;
+      if (focusedEl) focusedEl.dataset.wmFocused = "";
     }
     lastOrder = state.order;
   }
@@ -2414,23 +2420,31 @@ function attachDesktop(wm, element, options = {}) {
     };
     windowElement.addEventListener("keydown", onModalTrap);
     attached.cleanup.push(() => windowElement.removeEventListener("keydown", onModalTrap));
+    let detached = false;
     const detach = () => {
+      if (detached) return;
+      detached = true;
       if (drag?.id === id) endDrag(true);
       for (const dispose of attached.cleanup) dispose();
       for (const resizeHandle of attached.handles) resizeHandle.remove();
       registry.delete(id);
+      if (registry.get(id)?.element !== windowElement) delete windowElement.dataset.wmWindow;
+      delete windowElement.dataset.wmFocused;
+      delete windowElement.dataset.wmTabTarget;
+      if (focusedEl === windowElement) focusedEl = null;
+      if (groupTargetEl === windowElement) {
+        groupTargetId = null;
+        groupTargetEl = null;
+      }
     };
-    if (windowOptions.removeOnClose) {
-      const stopOnClose = wm.on("close", ({ window: closed }) => {
-        if (closed.id !== id) return;
-        detach();
-        windowElement.remove();
-      });
-      attached.cleanup.push(stopOnClose);
-    }
+    const stopOnClose = wm.on("close", ({ window: closed }) => {
+      if (closed.id !== id) return;
+      detach();
+      if (windowOptions.removeOnClose) windowElement.remove();
+    });
+    attached.cleanup.push(stopOnClose);
     registry.set(id, attached);
     lastOrder = null;
-    lastFocused = null;
     syncAll();
     if (wm.getState().focusedId === id && !windowElement.contains(doc.activeElement)) {
       windowElement.focus({ preventScroll: true });
@@ -2458,7 +2472,7 @@ function attachDesktop(wm, element, options = {}) {
 // src/dom/binder.ts
 function createDesktopBinder(wm, options = {}) {
   let controller = null;
-  let stopOpen = null;
+  let stops = [];
   const entries = /* @__PURE__ */ new Set();
   function attachEntry(entry) {
     if (controller && !entry.detach && wm.get(entry.id)) {
@@ -2466,8 +2480,8 @@ function createDesktopBinder(wm, options = {}) {
     }
   }
   function unbindDesktop() {
-    stopOpen?.();
-    stopOpen = null;
+    for (const stop of stops) stop();
+    stops = [];
     for (const entry of entries) entry.detach = null;
     controller?.destroy();
     controller = null;
@@ -2478,11 +2492,18 @@ function createDesktopBinder(wm, options = {}) {
     bindDesktop(element) {
       if (controller) throw new Error("wmkit: desktop is already bound");
       controller = attachDesktop(wm, element, options);
-      stopOpen = wm.on("open", ({ window: win }) => {
-        for (const entry of entries) {
-          if (entry.id === win.id) attachEntry(entry);
-        }
-      });
+      stops.push(
+        wm.on("open", ({ window: win }) => {
+          for (const entry of entries) {
+            if (entry.id === win.id) attachEntry(entry);
+          }
+        }),
+        wm.on("close", ({ window: win }) => {
+          for (const entry of entries) {
+            if (entry.id === win.id) entry.detach = null;
+          }
+        })
+      );
       for (const entry of entries) attachEntry(entry);
       return unbindDesktop;
     },
@@ -2520,5 +2541,5 @@ exports.flipToTarget = flipToTarget;
 exports.magnetize = magnetize;
 exports.prefersReducedMotion = prefersReducedMotion;
 exports.zoneBounds = zoneBounds;
-//# sourceMappingURL=chunk-E47Q36LM.cjs.map
-//# sourceMappingURL=chunk-E47Q36LM.cjs.map
+//# sourceMappingURL=chunk-NJAI5R4J.cjs.map
+//# sourceMappingURL=chunk-NJAI5R4J.cjs.map