@surdeddd/wmkit 0.4.1 → 0.4.2

package/README.md

@@ -376,7 +376,7 @@ This README is the tour. The reference lives in [`docs/`](./docs/README.md):
 
 ## Quality
 
-- 216 unit tests, **100%** line/branch/function/statement coverage on the core state machine and persistence
+- 250 unit tests: **100%** line/branch/function/statement coverage on the core state machine and persistence, with enforced floors on the DOM layer and the adapters
 - 190+ Playwright scenarios on Chromium, WebKit and mobile emulation: drag, 8-way resize, snap, magnetism, workspaces, undo after drag, keyboard, touch, persistence across reloads, 50-window stress, modal traps, axe accessibility scans, visual regression screenshots
 - performance benchmarks run in CI on every push (`vitest bench`): 1 000 windows open in ~150 ms, a move among 50 windows costs ~1.2 µs, a full 100-step undo/redo sweep ~52 µs
 - `publint` + `@arethetypeswrong/cli` validate the published package, `size-limit` guards bundle budgets

package/README.ru.md

@@ -273,7 +273,7 @@ if (isPopoutSupported()) await popout(wm, 'docs', contentElement)
 
 ## Качество
 
-- 216 юнит-тестов, **100%** покрытие стейт-машины и persist по строкам/веткам/функциям
+- 250 юнит-тестов: **100%** покрытие стейт-машины и persist по строкам/веткам/функциям, плюс обязательные пороги на DOM-слой и адаптеры
 - 190+ Playwright-сценариев на Chromium, WebKit и мобильной эмуляции: drag, ресайз во все стороны, снэп, магнетизм, рабочие столы, undo после drag, клавиатура, touch, персист через перезагрузку, стресс на 50 окон, модальные ловушки, axe-аудиты доступности, визуальная регрессия по скриншотам
 - перф-бенчмарки в CI на каждый push (`vitest bench`): 1 000 окон открываются за ~150 мс, move среди 50 окон ~1.2 мкс, полный undo/redo-проход на 100 шагов ~52 мкс
 - `publint` + `@arethetypeswrong/cli` проверяют валидность пакета, `size-limit` следит за бюджетами

package/dist/angular.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkTJ6QOOJ2_cjs = require('./chunk-TJ6QOOJ2.cjs');
+var chunkGLBVT4AQ_cjs = require('./chunk-GLBVT4AQ.cjs');
 var core = require('@angular/core');
 
 function onDestroy(dispose) {
@@ -13,7 +13,7 @@ function onDestroy(dispose) {
   destroyRef?.onDestroy(dispose);
 }
 function useWindowManager(options) {
-  const wm = chunkTJ6QOOJ2_cjs.createWindowManager(options);
+  const wm = chunkGLBVT4AQ_cjs.createWindowManager(options);
   onDestroy(() => wm.destroy());
   return wm;
 }
@@ -28,7 +28,7 @@ function useWmWindow(wm, id) {
   return core.computed(() => state().windows[id]);
 }
 function createDesktop(wm, options) {
-  const binder = chunkTJ6QOOJ2_cjs.createDesktopBinder(wm, options);
+  const binder = chunkGLBVT4AQ_cjs.createDesktopBinder(wm, options);
   onDestroy(() => binder.destroy());
   return {
     binder,

package/dist/angular.js

@@ -1,4 +1,4 @@
-import { createWindowManager, createDesktopBinder } from './chunk-OOEDFA7K.js';
+import { createWindowManager, createDesktopBinder } from './chunk-GGDF2EWV.js';
 import { signal, computed, inject, DestroyRef } from '@angular/core';
 
 function onDestroy(dispose) {

package/dist/{chunk-OOEDFA7K.js → chunk-GGDF2EWV.js}

@@ -209,6 +209,7 @@ function createWindowManager(options = {}) {
   let future = [];
   let interactionDepth = 0;
   let interactionRecorded = false;
+  let interactionMark = null;
   let skipNextHistory = false;
   let pendingHistory = null;
   const layouts = /* @__PURE__ */ new Map();
@@ -319,7 +320,13 @@ function createWindowManager(options = {}) {
       width: init.width ?? defaultSize.width,
       height: init.height ?? defaultSize.height
     };
-    const size = aspectRatio === null ? clampSize(requested, minSize, maxSize) : applyAspect(requested, aspectRatio, minSize, maxSize, "width");
+    const size = aspectRatio === null ? clampSize(requested, minSize, maxSize) : applyAspect(
+      requested,
+      aspectRatio,
+      minSize,
+      maxSize,
+      init.width === void 0 && init.height !== void 0 ? "height" : "width"
+    );
     const position = positionForOpen(init);
     let bounds = { ...position, ...size };
     if (keepInViewport) bounds = clampToViewport(bounds, viewport, minVisible);
@@ -435,7 +442,13 @@ function createWindowManager(options = {}) {
   }
   function snapBounds(win, zone) {
     const rect = zoneBounds(zone, viewport);
-    return { x: rect.x, y: rect.y, ...normalizeSize(rect, win) };
+    const byWidth = normalizeSize(rect, win);
+    const size = byWidth.height > rect.height ? normalizeSize(rect, win, "height") : byWidth;
+    return {
+      x: Math.max(0, Math.min(rect.x, viewport.width - size.width)),
+      y: Math.max(0, Math.min(rect.y, viewport.height - size.height)),
+      ...size
+    };
   }
   function focusUnlessBlocked(id) {
     const modal = topModalId();
@@ -600,7 +613,7 @@ function createWindowManager(options = {}) {
       snappable: patch.snappable ?? win.snappable,
       meta: patch.meta ? { ...win.meta, ...patch.meta } : win.meta
     };
-    const size = normalizeSize(next.bounds, next);
+    const size = next.stage === "maximized" ? next.bounds : normalizeSize(next.bounds, next);
     const resized = size.width !== next.bounds.width || size.height !== next.bounds.height;
     const finalWin = resized ? { ...next, bounds: { ...next.bounds, ...size } } : next;
     setWindow(finalWin);
@@ -648,6 +661,10 @@ function createWindowManager(options = {}) {
     if (!onActiveWorkspace(updated) && focusedId === id) {
       focusTop();
       if (focusedId) emitFocus(windows[focusedId], id);
+    } else if (onActiveWorkspace(updated) && topModalId() === id && focusedId !== id) {
+      const previous = focusedId;
+      focusedId = id;
+      emitFocus(updated, previous);
     }
     queueEvent(() => emitter.emit("update", { window: updated }));
     commit();
@@ -775,14 +792,20 @@ function createWindowManager(options = {}) {
   }
   function beginInteraction() {
     interactionDepth += 1;
-    if (interactionDepth === 1) interactionRecorded = false;
+    if (interactionDepth === 1) {
+      interactionRecorded = false;
+      interactionMark = { past: [...past], future };
+    }
   }
   function endInteraction() {
     if (interactionDepth > 0) interactionDepth -= 1;
+    if (interactionDepth === 0) interactionMark = null;
   }
   function abortInteraction() {
-    if (interactionDepth > 0 && interactionRecorded) {
-      past.pop();
+    if (interactionDepth > 0 && interactionMark) {
+      past.length = 0;
+      past.push(...interactionMark.past);
+      future = interactionMark.future;
       interactionRecorded = false;
     }
     endInteraction();
@@ -1130,10 +1153,8 @@ function createAnnouncer(wm, container, messages = {}) {
   element.style.cssText = "position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0 0 0 0);white-space:nowrap;border:0";
   container.append(element);
   let clearTimer;
-  let lastMessage = "";
   let detailed = false;
   function announce(message) {
-    lastMessage = message;
     element.textContent = message;
     if (clearTimer !== void 0) clearTimeout(clearTimer);
     clearTimer = setTimeout(() => {
@@ -1141,8 +1162,14 @@ function createAnnouncer(wm, container, messages = {}) {
     }, 2e3);
   }
   const unsubscribers = [
-    wm.on("open", ({ window: win }) => announce(dict.opened(win.title))),
-    wm.on("close", ({ window: win }) => announce(dict.closed(win.title))),
+    wm.on("open", ({ window: win }) => {
+      announce(dict.opened(win.title));
+      detailed = true;
+    }),
+    wm.on("close", ({ window: win }) => {
+      announce(dict.closed(win.title));
+      detailed = true;
+    }),
     wm.on("stage", ({ window: win, previous }) => {
       if (win.stage === "minimized") announce(dict.minimized(win.title));
       else if (win.stage === "maximized") announce(dict.maximized(win.title));
@@ -1153,7 +1180,7 @@ function createAnnouncer(wm, container, messages = {}) {
       detailed = true;
     }),
     wm.on("focus", ({ window: win, previous }) => {
-      if (detailed || previous === null || lastMessage === dict.opened(win.title)) return;
+      if (detailed || previous === null) return;
       announce(dict.focused(win.title));
     }),
     wm.on("workspace", ({ workspace }) => {
@@ -1400,6 +1427,7 @@ function createResizeStarter(ctx) {
     let pendingX = 0;
     let pendingY = 0;
     let hasPending = false;
+    let applied = false;
     const el = ctx.windowElement(id);
     if (el) el.dataset.wmResizing = direction;
     function flush() {
@@ -1408,18 +1436,24 @@ function createResizeStarter(ctx) {
       raf = 0;
       const dx = pendingX - startPoint.x;
       const dy = pendingY - startPoint.y;
-      const top = direction.includes("n") ? Math.max(0, start.y + dy) : start.y;
+      const floor = Math.min(0, start.y);
+      const top = direction.includes("n") ? Math.max(floor, start.y + dy) : start.y;
       const raw = {
         width: direction.includes("e") ? start.width + dx : direction.includes("w") ? start.width - dx : start.width,
         height: direction.includes("s") ? start.height + dy : direction.includes("n") ? start.y + start.height - top : start.height
       };
-      const size = aspect === null ? clampSize(raw, minSize, maxSize) : applyAspect(raw, aspect, minSize, maxSize, drive);
+      let size = aspect === null ? clampSize(raw, minSize, maxSize) : applyAspect(raw, aspect, minSize, maxSize, drive);
+      const available = start.y + start.height - floor;
+      if (direction.includes("n") && size.height > available) {
+        size = applyAspect({ ...size, height: available }, aspect ?? 0, minSize, maxSize, "height");
+      }
       const next = {
         x: direction.includes("w") ? start.x + start.width - size.width : start.x,
         y: direction.includes("n") ? start.y + start.height - size.height : start.y,
         ...size
       };
       wm.resize(id, next);
+      applied = true;
     }
     function onMove(moveEvent) {
       if (moveEvent.pointerId !== event.pointerId) return;
@@ -1434,7 +1468,7 @@ function createResizeStarter(ctx) {
       try {
         if (raf !== 0) view.cancelAnimationFrame(raf);
         if (hasPending && !cancelled) flush();
-        if (cancelled) {
+        if (cancelled && applied) {
           if (startStage === "snapped" && startZone) {
             wm.restoreTo(id, startRestore ?? start);
             wm.snap(id, startZone);
@@ -1636,6 +1670,11 @@ function attachDesktop(wm, element, options = {}) {
       if (hide && !el.hidden && el.contains(doc.activeElement)) {
         element.focus({ preventScroll: true });
       }
+      if (!hide && el.hidden && wm.getState().focusedId === win.id) {
+        queueMicrotask(() => {
+          if (!el.hidden && !el.contains(doc.activeElement)) el.focus({ preventScroll: true });
+        });
+      }
       el.hidden = hide;
       el.setAttribute("aria-label", win.title);
       if (win.layer === "modal") el.setAttribute("aria-modal", "true");
@@ -1684,6 +1723,7 @@ function attachDesktop(wm, element, options = {}) {
     wm.on("focus", ({ window: win }) => {
       const attached = registry.get(win.id);
       if (!attached) return;
+      if (attached.element.hidden) syncAll();
       if (!attached.element.contains(doc.activeElement)) {
         attached.element.focus({ preventScroll: true });
       }
@@ -1719,6 +1759,7 @@ function attachDesktop(wm, element, options = {}) {
         return;
       }
       if (!event.ctrlKey && !event.metaKey) return;
+      if (drag) return;
       const target = event.target;
       if (target?.closest(INTERACTIVE_SELECTOR)) return;
       if (historyShortcuts && (event.key === "z" || event.key === "Z")) {
@@ -1987,5 +2028,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-OOEDFA7K.js.map
-//# sourceMappingURL=chunk-OOEDFA7K.js.map
+//# sourceMappingURL=chunk-GGDF2EWV.js.map
+//# sourceMappingURL=chunk-GGDF2EWV.js.map