@surdeddd/wmkit 0.6.1 → 0.7.1

package/dist/{chunk-3HLKVOSI.js → chunk-WOCAQEM6.js}

@@ -283,8 +283,7 @@ function createWindowManager(options = {}) {
   }
   function blockOf(id) {
     const win = windows[id];
-    if (win.groupId === null) return [id];
-    return [...membersOf(win.groupId).filter((entry) => entry !== id), id];
+    return win.groupId === null ? [id] : membersOf(win.groupId);
   }
   function raise(id) {
     const win = windows[id];
@@ -893,6 +892,37 @@ function createWindowManager(options = {}) {
     commit();
     return true;
   }
+  function moveTab(id, index) {
+    const win = windows[id];
+    if (!win?.groupId || !Number.isFinite(index)) return false;
+    const members = membersOf(win.groupId);
+    const from = members.indexOf(id);
+    const target = Math.max(0, Math.min(members.length - 1, Math.trunc(index)));
+    if (from === -1 || from === target) return false;
+    const reordered = [...members];
+    reordered.splice(from, 1);
+    reordered.splice(target, 0, id);
+    const next = [...order];
+    let cursor = 0;
+    for (let i = 0; i < next.length; i += 1) {
+      if (!members.includes(next[i])) continue;
+      next[i] = reordered[cursor++];
+    }
+    order = next;
+    emitGroup(win.groupId, null);
+    queueEvent(() => emitter.emit("order", { order }));
+    commit();
+    return true;
+  }
+  function cycleTab(direction = 1) {
+    const win = focusedId ? windows[focusedId] : void 0;
+    if (!win?.groupId) return null;
+    const members = membersOf(win.groupId);
+    const current = members.indexOf(activeTabs[win.groupId]);
+    const index = (current + direction + members.length) % members.length;
+    const next = members[index];
+    return activateTab(next) ? next : null;
+  }
   function groupMembers(groupId) {
     return membersOf(groupId).map((id) => windows[id]);
   }
@@ -995,6 +1025,7 @@ function createWindowManager(options = {}) {
     }
   }
   function applyEntry(entry) {
+    const previousWindows = windows;
     windows = entry.windows;
     order = [...entry.order];
     modalCount = countModals();
@@ -1006,6 +1037,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();
   }
@@ -1301,6 +1342,8 @@ function createWindowManager(options = {}) {
     group: (ids) => transact(() => group(ids)),
     ungroup: (id) => transact(() => ungroup(id)),
     activateTab: (id) => transact(() => activateTab(id)),
+    moveTab: (id, index) => transact(() => moveTab(id, index)),
+    cycleTab: (direction) => transact(() => cycleTab(direction)),
     groupMembers,
     batch: (run) => transact(run),
     serialize,
@@ -1954,7 +1997,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;
@@ -2141,16 +2184,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;
   }
@@ -2380,23 +2418,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 });
@@ -2470,5 +2516,5 @@ function createDesktopBinder(wm, options = {}) {
 }
 
 export { applyAspect, attachDesktop, boundsEqual, clamp, clampSize, clampToViewport, createAnnouncer, createDesktopBinder, createEmitter, createWindowManager, defaultMessages, detectSnapZone, flipFromTarget, flipToTarget, magnetize, prefersReducedMotion, zoneBounds };
-//# sourceMappingURL=chunk-3HLKVOSI.js.map
-//# sourceMappingURL=chunk-3HLKVOSI.js.map
+//# sourceMappingURL=chunk-WOCAQEM6.js.map
+//# sourceMappingURL=chunk-WOCAQEM6.js.map