@surdeddd/wmkit 0.5.0 → 0.5.1

package/dist/{chunk-RXAMUBUJ.cjs → chunk-C2UHNBSA.cjs}

@@ -254,16 +254,22 @@ function createWindowManager(options = {}) {
   function sortByLayer(ids) {
     return ids.map((id, index) => ({ id, index, rank: layerRankOf(id) })).sort((a, b) => a.rank !== b.rank ? a.rank - b.rank : a.index - b.index).map((entry) => entry.id);
   }
+  function blockOf(id) {
+    const win = windows[id];
+    if (win.groupId === null) return [id];
+    return [...membersOf(win.groupId).filter((entry) => entry !== id), id];
+  }
   function raise(id) {
     const win = windows[id];
-    const without = order.filter((entry) => entry !== id);
+    const block = blockOf(id);
+    const without = order.filter((entry) => !block.includes(entry));
     const rank = LAYER_RANK[win.layer];
     let insertAt = without.length;
     for (let i = without.length - 1; i >= 0; i -= 1) {
       if (layerRankOf(without[i]) > rank) insertAt = i;
       else break;
     }
-    const next = [...without.slice(0, insertAt), id, ...without.slice(insertAt)];
+    const next = [...without.slice(0, insertAt), ...block, ...without.slice(insertAt)];
     const changed = next.length !== order.length || next.some((entry, i) => entry !== order[i]);
     order = next;
     return changed;
@@ -278,7 +284,7 @@ function createWindowManager(options = {}) {
     return win.groupId === null || activeTabs[win.groupId] === win.id;
   }
   function buildGroups() {
-    const result = {};
+    const result = /* @__PURE__ */ Object.create(null);
     for (const [groupId, activeId] of Object.entries(activeTabs)) {
       result[groupId] = { id: groupId, activeId, members: membersOf(groupId) };
     }
@@ -335,6 +341,14 @@ function createWindowManager(options = {}) {
     const targets = focusTargets();
     focusedId = targets.length > 0 ? targets[targets.length - 1] : null;
   }
+  function reconcileFocus() {
+    if (focusedId === null) return;
+    const win = windows[focusedId];
+    if (win && win.stage !== "minimized" && onActiveWorkspace(win) && isVisibleTab(win)) return;
+    const previous = focusedId;
+    focusTop();
+    if (focusedId) emitFocus(windows[focusedId], previous);
+  }
   function emitFocus(win, previous) {
     queueEvent(() => emitter.emit("focus", { window: win, previous }));
   }
@@ -456,7 +470,6 @@ function createWindowManager(options = {}) {
     const win = windows[id];
     if (!win) return false;
     if (!onActiveWorkspace(win)) setWorkspace(win.workspace);
-    if (!isVisibleTab(win)) activateTab(id);
     const modal = topModalId();
     if (modal && modal !== id && win.layer !== "modal") {
       const modalWin = windows[modal];
@@ -464,6 +477,7 @@ function createWindowManager(options = {}) {
       commitQuiet();
       return false;
     }
+    if (!isVisibleTab(win)) activateTab(id);
     if (win.stage === "minimized") {
       restore(id);
       return focusedId === id;
@@ -518,6 +532,7 @@ function createWindowManager(options = {}) {
     setWindow(next);
     syncGroup(next);
     queueEvent(() => emitter.emit("stage", { window: next, previous: win.stage }));
+    if (next.groupId !== null) reconcileFocus();
     commit();
     return true;
   }
@@ -722,6 +737,8 @@ function createWindowManager(options = {}) {
     if (!onActiveWorkspace(updated) && focusedId === id) {
       focusTop();
       if (focusedId) emitFocus(windows[focusedId], id);
+    } else if (updated.groupId !== null && !onActiveWorkspace(updated)) {
+      reconcileFocus();
     } else if (onActiveWorkspace(updated) && topModalId() === id && focusedId !== id) {
       const previous = focusedId;
       focusedId = id;
@@ -747,7 +764,16 @@ function createWindowManager(options = {}) {
       for (const entry of siblings) if (!expanded.includes(entry)) expanded.push(entry);
     }
     if (expanded.length < 2) return null;
-    const groupId = `${idPrefix}-group-${++groupCounter}`;
+    let groupId = `${idPrefix}-group-${++groupCounter}`;
+    while (activeTabs[groupId]) groupId = `${idPrefix}-group-${++groupCounter}`;
+    const shared = expanded.reduce(
+      (size, id) => {
+        const fit = normalizeSize(size, windows[id]);
+        return { width: Math.max(size.width, fit.width), height: Math.max(size.height, fit.height) };
+      },
+      { width: host.bounds.width, height: host.bounds.height }
+    );
+    const bounds = { x: host.bounds.x, y: host.bounds.y, ...shared };
     const retired = /* @__PURE__ */ new Set();
     for (const id of expanded) {
       const win = windows[id];
@@ -755,7 +781,7 @@ function createWindowManager(options = {}) {
       setWindow({
         ...win,
         groupId,
-        bounds: host.bounds,
+        bounds,
         stage: host.stage,
         snapZone: host.snapZone,
         restoreBounds: host.restoreBounds,
@@ -770,8 +796,10 @@ function createWindowManager(options = {}) {
     raise(host.id);
     emitGroup(groupId, null);
     queueEvent(() => emitter.emit("order", { order }));
+    const hostVisible = onActiveWorkspace(host) && host.stage !== "minimized";
+    if (!hostVisible) reconcileFocus();
     commit();
-    if (onActiveWorkspace(host) && host.stage !== "minimized") focus(host.id);
+    if (hostVisible) focus(host.id);
     return groupId;
   }
   function ungroup(id) {
@@ -785,7 +813,7 @@ function createWindowManager(options = {}) {
     dissolveIfOrphaned(groupId);
     if (membersOf(groupId).length >= 2) emitGroup(groupId, wasActive ? id : null);
     commit();
-    focus(id);
+    if (onActiveWorkspace(win) && win.stage !== "minimized") focus(id);
     return true;
   }
   function activateTab(id) {
@@ -795,6 +823,10 @@ function createWindowManager(options = {}) {
     const previous = activeTabs[groupId];
     if (previous === id) return false;
     activeTabs = { ...activeTabs, [groupId]: id };
+    if (focusedId === previous) {
+      focusedId = id;
+      emitFocus(win, previous);
+    }
     emitGroup(groupId, previous);
     commit();
     return true;
@@ -805,14 +837,15 @@ function createWindowManager(options = {}) {
   function sendToBack(id) {
     const win = windows[id];
     if (!win) return false;
-    const without = order.filter((entry) => entry !== id);
+    const block = blockOf(id);
+    const without = order.filter((entry) => !block.includes(entry));
     const rank = LAYER_RANK[win.layer];
     let insertAt = 0;
     for (const entry of without) {
       if (layerRankOf(entry) < rank) insertAt += 1;
       else break;
     }
-    const next = [...without.slice(0, insertAt), id, ...without.slice(insertAt)];
+    const next = [...without.slice(0, insertAt), ...block, ...without.slice(insertAt)];
     if (next.every((entry, i) => entry === order[i])) return false;
     order = next;
     queueEvent(() => emitter.emit("order", { order }));
@@ -876,19 +909,23 @@ function createWindowManager(options = {}) {
   function reflowViewport() {
     for (const id of order) {
       const win = windows[id];
+      if (!isVisibleTab(win)) continue;
       if (win.stage === "maximized") {
         const updated = { ...win, bounds: fullBounds() };
         setWindow(updated);
+        syncGroup(updated);
         queueEvent(() => emitter.emit("resize", { window: updated }));
       } else if (win.stage === "snapped" && win.snapZone) {
         const updated = { ...win, bounds: snapBounds(win, win.snapZone) };
         setWindow(updated);
+        syncGroup(updated);
         queueEvent(() => emitter.emit("resize", { window: updated }));
       } else if (win.stage === "normal" && keepInViewport) {
         const bounds = clampToViewport(win.bounds, viewport, minVisible);
         if (!boundsEqual(bounds, win.bounds)) {
           const updated = { ...win, bounds };
           setWindow(updated);
+          syncGroup(updated);
           queueEvent(() => emitter.emit("move", { window: updated }));
         }
       }
@@ -975,7 +1012,7 @@ function createWindowManager(options = {}) {
   function arrange(mode) {
     const ids = order.filter((id) => {
       const win = windows[id];
-      return win.stage !== "minimized" && onActiveWorkspace(win);
+      return win.stage !== "minimized" && onActiveWorkspace(win) && isVisibleTab(win);
     });
     if (ids.length === 0) return;
     if (mode === "cascade") {
@@ -1007,7 +1044,8 @@ function createWindowManager(options = {}) {
   }
   function minimizeAll() {
     for (const id of [...order]) {
-      if (onActiveWorkspace(windows[id])) minimize(id);
+      const win = windows[id];
+      if (onActiveWorkspace(win) && isVisibleTab(win)) minimize(id);
     }
   }
   function restoreAll() {
@@ -1127,7 +1165,7 @@ function createWindowManager(options = {}) {
     if (focusedCandidate && (focusedCandidate.stage === "minimized" || !onActiveWorkspace(focusedCandidate))) {
       focusedId = null;
     }
-    const restoredTabs = {};
+    const restoredTabs = /* @__PURE__ */ Object.create(null);
     const rawTabs = data.activeTabs;
     for (const id of order) {
       const groupId = windows[id].groupId;
@@ -1400,6 +1438,8 @@ function createDragStarter(ctx) {
     const el = ctx.windowElement(id);
     function armGroup(target2) {
       session.groupTarget = target2;
+      session.zone = null;
+      ctx.hidePreview();
       ctx.markGroupTarget(target2);
     }
     function clearHover() {
@@ -1444,9 +1484,9 @@ function createDragStarter(ctx) {
         for (const otherId of state.order) {
           if (otherId === id) continue;
           const other = state.windows[otherId];
-          if (other && other.stage !== "minimized" && other.workspace === state.workspace) {
-            targets.push(other.bounds);
-          }
+          if (!other || other.stage === "minimized" || other.workspace !== state.workspace) continue;
+          if (other.groupId !== null && state.groups[other.groupId]?.activeId !== otherId) continue;
+          targets.push(other.bounds);
         }
         const magnet = magnetize(
           { x: nextX, y: nextY, width: current.bounds.width, height: current.bounds.height },
@@ -1757,6 +1797,7 @@ function attachDesktop(wm, element, options = {}) {
   let lastFocused = null;
   let drag = null;
   let groupTargetId = null;
+  let groupTargetEl = null;
   let cachedRect = null;
   let rectUsers = 0;
   let announcer = null;
@@ -1835,21 +1876,16 @@ function attachDesktop(wm, element, options = {}) {
         const handle = node.closest?.("[data-wm-drag]");
         const host = handle?.closest("[data-wm-window]");
         const id = host?.dataset.wmWindow;
-        if (id && id !== selfId && registry.has(id)) return id;
+        if (id && id !== selfId && registry.get(id)?.element === host) return id;
       }
       return null;
     },
     markGroupTarget(id) {
       if (groupTargetId === id) return;
-      if (groupTargetId) {
-        const previous = registry.get(groupTargetId);
-        if (previous) delete previous.element.dataset.wmTabTarget;
-      }
+      if (groupTargetEl) delete groupTargetEl.dataset.wmTabTarget;
       groupTargetId = id;
-      if (id) {
-        const next = registry.get(id);
-        if (next) next.element.dataset.wmTabTarget = "";
-      }
+      groupTargetEl = id ? registry.get(id)?.element ?? null : null;
+      if (groupTargetEl) groupTargetEl.dataset.wmTabTarget = "";
     },
     currentDrag: () => drag,
     claimDrag(session) {
@@ -2267,5 +2303,5 @@ exports.flipToTarget = flipToTarget;
 exports.magnetize = magnetize;
 exports.prefersReducedMotion = prefersReducedMotion;
 exports.zoneBounds = zoneBounds;
-//# sourceMappingURL=chunk-RXAMUBUJ.cjs.map
-//# sourceMappingURL=chunk-RXAMUBUJ.cjs.map
+//# sourceMappingURL=chunk-C2UHNBSA.cjs.map
+//# sourceMappingURL=chunk-C2UHNBSA.cjs.map