@witchcraft/layout 0.4.2 → 0.4.4

package/dist/runtime/drag/SplitAction.js

@@ -6,6 +6,7 @@ import { createSplitDecoFromDrag } from "../layout/createSplitDecoFromDrag.js";
 import { getFrameSplitInfo } from "../layout/getFrameSplitInfo.js";
 export class SplitAction {
   name = "split";
+  minDragDistance = 5;
   state = {};
   // this is initialized by `this.reset()`
   debug = false;
@@ -24,6 +25,7 @@ export class SplitAction {
     this.hooks = hooks;
     this.reset();
     if (config?.debug) this.debug = true;
+    if (config?.minDragDistance !== void 0) this.minDragDistance = config.minDragDistance;
     if (config?.splitHints?.actions) this.splitHints.actions = config.splitHints.actions;
     if (config?.splitHints?.transformError) this.splitHints.transformError = config.splitHints.transformError;
   }
@@ -62,7 +64,7 @@ export class SplitAction {
   canHandleRequest(e, state) {
     const { draggingEdges } = state;
     if (draggingEdges.length !== 1) return false;
-    this.setTextHints(state.isDragging === "edge" ? true : void 0);
+    this.setTextHints(state.isDragging === "edge" && !state.isDraggingFromWindowEdge ? true : void 0);
     if (this.handleEvent(e, state)) {
       this.hooks.onStart?.();
       return true;
@@ -103,7 +105,7 @@ export class SplitAction {
       dragDirections[oppositeOrientation],
       dragPoint
     );
-    this.setTextHints(canSplit);
+    this.setTextHints(state.isDragging === "edge" && !state.isDraggingFromWindowEdge ? canSplit : void 0);
     if (!(canSplit instanceof Error)) {
       this.state.allowed = true;
       this.state.res = canSplit;
@@ -117,7 +119,10 @@ export class SplitAction {
     }
   }
   onDragChange(_type, _e, state) {
-    const { dragHoveredFrame } = state;
+    const { dragHoveredFrame, dragDistance } = state;
+    if (dragDistance <= this.minDragDistance) {
+      return { updateEdges: false, shapes: [], showDragging: false };
+    }
     let ok = false;
     if (dragHoveredFrame) {
       if (this.state.lastPoint?.x === state.dragPoint?.x && this.state.lastPoint?.y === state.dragPoint?.y && this.state.lastReturn) {

package/dist/runtime/helpers/findEdgesTouchingWindow.d.ts

@@ -0,0 +1,7 @@
+import type { EdgeSide, LayoutFrame } from "../types/index.js";
+/**
+ * Checks which window edges a frame touches and how.
+ *
+ * @returns Record mapping touched sides to `"full"` (spans the entire edge) or `"partial"` (touches but doesn't span fully). Only touched sides are included as keys.
+ */
+export declare function findEdgesTouchingWindow(frame: LayoutFrame): Partial<Record<EdgeSide, "full" | "partial">>;

package/dist/runtime/helpers/findEdgesTouchingWindow.js

@@ -0,0 +1,20 @@
+import { settings } from "../settings.js";
+export function findEdgesTouchingWindow(frame) {
+  const maxInt = settings.maxInt;
+  const result = {};
+  const spansVertical = frame.y === 0 && frame.y + frame.height === maxInt;
+  const spansHorizontal = frame.x === 0 && frame.x + frame.width === maxInt;
+  if (frame.x === 0) {
+    result.left = spansVertical ? "full" : "partial";
+  }
+  if (frame.x + frame.width === maxInt) {
+    result.right = spansVertical ? "full" : "partial";
+  }
+  if (frame.y === 0) {
+    result.top = spansHorizontal ? "full" : "partial";
+  }
+  if (frame.y + frame.height === maxInt) {
+    result.bottom = spansHorizontal ? "full" : "partial";
+  }
+  return result;
+}

package/dist/runtime/helpers/index.d.ts

@@ -9,6 +9,7 @@ export { assertValidWinAndFrameIds } from "./assertValidWinAndFrameIds.js";
 export { assertWindowHasActiveFrame } from "./assertWindowHasActiveFrame.js";
 export { cloneFrame } from "./cloneFrame.js";
 export { cloneFrames } from "./cloneFrames.js";
+export { consoleDebugWindow } from "./consoleDebugWindow.js";
 export { containsEdge } from "./containsEdge.js";
 export { convertLayoutWindowToWorkspace } from "./convertLayoutWindowToWorkspace.js";
 export { copySize } from "./copySize.js";
@@ -21,17 +22,21 @@ export { doesEdgeContinueEdge } from "./doesEdgeContinueEdge.js";
 export { edgeToPoints } from "./edgeToPoints.js";
 export { findDraggableEdge } from "./findDraggableEdge.js";
 export { findFrameDraggableEdges } from "./findFrameDraggableEdges.js";
+export { framesRedistributeFix } from "./framesRedistributeFix.js";
 export { frameToEdges } from "./frameToEdges.js";
 export { frameToPoints } from "./frameToPoints.js";
+export { getDockBoundaries } from "./getDockBoundaries.js";
 export { getEdgeLength } from "./getEdgeLength.js";
 export { getEdgeOrientation } from "./getEdgeOrientation.js";
 export { getEdgeSharedDirection } from "./getEdgeSharedDirection.js";
 export { getEdgeSide } from "./getEdgeSide.js";
 export { getFrameById } from "./getFrameById.js";
 export { getFrameConstant } from "./getFrameConstant.js";
+export { findEdgesTouchingWindow } from "./findEdgesTouchingWindow.js";
 export { getIntersections } from "./getIntersections.js";
 export { getIntersectionsCss } from "./getIntersectionsCss.js";
 export { getMoveEdgeInfo } from "./getMoveEdgeInfo.js";
+export { getPinnedEdgesForCollapsedFrames } from "./getPinnedEdgesForCollapsedFrames.js";
 export { getResizeLimit } from "./getResizeLimit.js";
 export { getShapeRectCss } from "./getShapeRectCss.js";
 export { getSideTouching } from "./getSideTouching.js";
@@ -52,9 +57,10 @@ export { isWindowEdge } from "./isWindowEdge.js";
 export { isWindowEdgePoint } from "./isWindowEdgePoint.js";
 export { moveEdge } from "./moveEdge.js";
 export { numberToScaledPercent } from "./numberToScaledPercent.js";
-export { pxSizeToScaledSize } from "./pxSizeToScaledSize.js";
 export { oppositeSide } from "./oppositeSide.js";
+export { pxSizeToScaledSize } from "./pxSizeToScaledSize.js";
 export { resizeByEdge } from "./resizeByEdge.js";
+export { rotateLayout } from "./rotateFrames.js";
 export { scaledPointToPx } from "./scaledPointToPx.js";
 export { sideToDirection } from "./sideToDirection.js";
 export { sideToOrientation } from "./sideToOrientation.js";
@@ -64,3 +70,4 @@ export { toId } from "./toId.js";
 export { toWindowCoord } from "./toWindowCoord.js";
 export { unionEdges } from "./unionEdges.js";
 export { updateWindowWithEvent } from "./updateWindowSizeWithEvent.js";
+export { validateLayoutShape } from "./validateLayoutShape.js";

package/dist/runtime/helpers/index.js

@@ -9,6 +9,7 @@ export { assertValidWinAndFrameIds } from "./assertValidWinAndFrameIds.js";
 export { assertWindowHasActiveFrame } from "./assertWindowHasActiveFrame.js";
 export { cloneFrame } from "./cloneFrame.js";
 export { cloneFrames } from "./cloneFrames.js";
+export { consoleDebugWindow } from "./consoleDebugWindow.js";
 export { containsEdge } from "./containsEdge.js";
 export { convertLayoutWindowToWorkspace } from "./convertLayoutWindowToWorkspace.js";
 export { copySize } from "./copySize.js";
@@ -21,17 +22,21 @@ export { doesEdgeContinueEdge } from "./doesEdgeContinueEdge.js";
 export { edgeToPoints } from "./edgeToPoints.js";
 export { findDraggableEdge } from "./findDraggableEdge.js";
 export { findFrameDraggableEdges } from "./findFrameDraggableEdges.js";
+export { framesRedistributeFix } from "./framesRedistributeFix.js";
 export { frameToEdges } from "./frameToEdges.js";
 export { frameToPoints } from "./frameToPoints.js";
+export { getDockBoundaries } from "./getDockBoundaries.js";
 export { getEdgeLength } from "./getEdgeLength.js";
 export { getEdgeOrientation } from "./getEdgeOrientation.js";
 export { getEdgeSharedDirection } from "./getEdgeSharedDirection.js";
 export { getEdgeSide } from "./getEdgeSide.js";
 export { getFrameById } from "./getFrameById.js";
 export { getFrameConstant } from "./getFrameConstant.js";
+export { findEdgesTouchingWindow } from "./findEdgesTouchingWindow.js";
 export { getIntersections } from "./getIntersections.js";
 export { getIntersectionsCss } from "./getIntersectionsCss.js";
 export { getMoveEdgeInfo } from "./getMoveEdgeInfo.js";
+export { getPinnedEdgesForCollapsedFrames } from "./getPinnedEdgesForCollapsedFrames.js";
 export { getResizeLimit } from "./getResizeLimit.js";
 export { getShapeRectCss } from "./getShapeRectCss.js";
 export { getSideTouching } from "./getSideTouching.js";
@@ -52,9 +57,10 @@ export { isWindowEdge } from "./isWindowEdge.js";
 export { isWindowEdgePoint } from "./isWindowEdgePoint.js";
 export { moveEdge } from "./moveEdge.js";
 export { numberToScaledPercent } from "./numberToScaledPercent.js";
-export { pxSizeToScaledSize } from "./pxSizeToScaledSize.js";
 export { oppositeSide } from "./oppositeSide.js";
+export { pxSizeToScaledSize } from "./pxSizeToScaledSize.js";
 export { resizeByEdge } from "./resizeByEdge.js";
+export { rotateLayout } from "./rotateFrames.js";
 export { scaledPointToPx } from "./scaledPointToPx.js";
 export { sideToDirection } from "./sideToDirection.js";
 export { sideToOrientation } from "./sideToOrientation.js";
@@ -64,3 +70,4 @@ export { toId } from "./toId.js";
 export { toWindowCoord } from "./toWindowCoord.js";
 export { unionEdges } from "./unionEdges.js";
 export { updateWindowWithEvent } from "./updateWindowSizeWithEvent.js";
+export { validateLayoutShape } from "./validateLayoutShape.js";

package/dist/runtime/layout/debugFrame.js

@@ -1,5 +1,9 @@
+import { keys } from "@alanscodelog/utils/keys";
+const builtinProperties = ["id", "x", "y", "width", "height", "docked", "collapsed"];
 export function debugFrame(frame) {
   const f = frame;
+  const otherProperties = keys(f).filter((k) => !builtinProperties.includes(k)).map((k) => `${k}: ${f[k]}`);
+  const otherPropertiesString = otherProperties.length > 0 ? `, ${otherProperties.join(", ")}` : "";
   return `id: ${f.id.slice(0, 4)}, x:  ${f.x}, y: ${f.y}, w: ${f.width}, h: ${f.height}
-docked: ${f.docked}, collapsed: ${f.collapsed}`;
+docked: ${f.docked}, collapsed: ${f.collapsed}${otherPropertiesString}`;
 }

package/dist/runtime/layout/getFrameCollapseInfo.d.ts

@@ -13,4 +13,4 @@ import { KnownError } from "../utils/KnownError.js";
 export declare function getFrameCollapseInfo(win: LayoutWindow, frameId: string, { collapseSizeScaled }?: {
     /** Override the target collapse size. If provided, the frame will collapse to this size instead of settings.collapseSizeScaled. */
     collapseSizeScaled?: Size;
-}): LayoutChange | KnownError<typeof LAYOUT_ERROR.CANT_COLLAPSE_NOT_DOCKED> | KnownError<typeof LAYOUT_ERROR.REDISTRIBUTE_WOULD_RESULT_IN_INVALID_FRAMES>;
+}): LayoutChange | KnownError<typeof LAYOUT_ERROR.CANT_COLLAPSE_NOT_DOCKED> | KnownError<typeof LAYOUT_ERROR.REDISTRIBUTE_WOULD_RESULT_IN_INVALID_FRAMES> | KnownError<typeof LAYOUT_ERROR.CANT_RESIZE_SINGLE_FRAME>;

package/dist/runtime/layout/getFrameCollapseInfo.js

@@ -1,10 +1,7 @@
 import { pushIfNotIn } from "@alanscodelog/utils/pushIfNotIn";
 import { walk } from "@alanscodelog/utils/walk";
 import { applyFrameChanges } from "./applyFrameChanges.js";
-import { getFramesRedistributeInfo } from "./getFramesRedistributeInfo.js";
-import { framesRedistributeFix } from "../helpers/framesRedistributeFix.js";
-import { getPinnedEdgesForCollapsedFrames } from "../helpers/getPinnedEdgesForCollapsedFrames.js";
-import { oppositeSide } from "../helpers/oppositeSide.js";
+import { getFrameShrinkInfo } from "./getFrameShrinkInfo.js";
 import { settings } from "../settings.js";
 import { LAYOUT_ERROR } from "../types/index.js";
 import { KnownError } from "../utils/KnownError.js";
@@ -27,35 +24,18 @@ export function getFrameCollapseInfo(win, frameId, {
   }
   const isVertical = frame.docked === "left" || frame.docked === "right";
   const sizeKey = isVertical ? "width" : "height";
-  const posKey = isVertical ? "x" : "y";
-  const oppositePosKey = isVertical ? "y" : "x";
-  const oppositeSizeKey = isVertical ? "height" : "width";
   const currentSize = frame[sizeKey];
-  const collapseAmount = collapseSizeScaled[sizeKey];
-  const shrinkAmount = currentSize - collapseAmount;
-  const dockedSide = frame.docked;
-  const { applyFixes, toFix } = framesRedistributeFix(win, frame, dockedSide, posKey, sizeKey, "shrink");
-  const otherFrameIds = Object.keys(win.frames).filter((id) => id !== frameId);
-  const redistributeSide = oppositeSide(dockedSide);
-  const pinnedEdgeCoordinates = getPinnedEdgesForCollapsedFrames(win, frame, dockedSide, posKey, sizeKey);
-  const changes = getFramesRedistributeInfo(win, redistributeSide, otherFrameIds, -shrinkAmount, { allowOutOfBounds: true, pinnedEdgeCoordinates });
-  if (changes instanceof KnownError) {
-    if (changes.code === LAYOUT_ERROR.REDISTRIBUTE_OUT_OF_BOUNDS || changes.code === LAYOUT_ERROR.NO_SPACE_TO_REDISTRIBUTE) {
-      changes.message = `This error should never happen, please file a bug report: ${changes.message}`;
-      throw changes;
-    }
-    return changes;
+  const shrinkAmount = currentSize - collapseSizeScaled[sizeKey];
+  const shrinkResult = getFrameShrinkInfo(win, frameId, shrinkAmount, frame.docked, { allowOutOfBounds: true });
+  if (shrinkResult instanceof KnownError) {
+    return shrinkResult;
   }
-  applyFrameChanges(win, changes);
-  pushIfNotIn(toExtract, changes.modified.map((_) => _.id));
-  applyFixes();
-  pushIfNotIn(toExtract, toFix);
-  if (frame.docked === "right" || frame.docked === "bottom") {
-    frame[posKey] = frame[posKey] + (frame[sizeKey] - collapseSizeScaled[sizeKey]);
-  }
-  frame[sizeKey] = collapseSizeScaled[sizeKey];
+  applyFrameChanges(win, shrinkResult);
+  pushIfNotIn(toExtract, shrinkResult.modified.map((_) => _.id));
   frame.collapsed = currentSize;
   if (collapseSizeScaled[sizeKey] === 0) {
+    const oppositePosKey = isVertical ? "y" : "x";
+    const oppositeSizeKey = isVertical ? "height" : "width";
     frame[oppositePosKey] = 0;
     frame[oppositeSizeKey] = settings.maxInt;
   }

package/dist/runtime/layout/getFrameDockInfo.d.ts

@@ -6,4 +6,4 @@ import { KnownError } from "../utils/KnownError.js";
  *
  * Changes can be applied to a window with {@link applyFrameChanges}.
  */
-export declare function getFrameDockInfo(win: LayoutWindow, frameId: string, side: EdgeSide, maxPerpendicularLength?: number): LayoutChange | KnownError<typeof LAYOUT_ERROR.REDISTRIBUTE_OUT_OF_BOUNDS> | KnownError<typeof LAYOUT_ERROR.NO_SPACE_TO_REDISTRIBUTE> | KnownError<typeof LAYOUT_ERROR.REDISTRIBUTE_WOULD_RESULT_IN_INVALID_FRAMES> | KnownError<typeof LAYOUT_ERROR.CANT_LEAVE_NO_UNDOCKED_FRAMES> | KnownError<typeof LAYOUT_ERROR.FRAME_ALREADY_DOCKED_ON_SIDE> | KnownError<typeof LAYOUT_ERROR.CANT_UNDOCK_COLLAPSED_FRAME> | KnownError<typeof LAYOUT_ERROR.NO_FILL_CANDIDATES>;
+export declare function getFrameDockInfo(win: LayoutWindow, frameId: string, side: EdgeSide, maxPerpendicularLength?: number): LayoutChange | KnownError<typeof LAYOUT_ERROR.REDISTRIBUTE_OUT_OF_BOUNDS> | KnownError<typeof LAYOUT_ERROR.NO_SPACE_TO_REDISTRIBUTE> | KnownError<typeof LAYOUT_ERROR.REDISTRIBUTE_WOULD_RESULT_IN_INVALID_FRAMES> | KnownError<typeof LAYOUT_ERROR.CANT_LEAVE_NO_UNDOCKED_FRAMES> | KnownError<typeof LAYOUT_ERROR.FRAME_ALREADY_DOCKED_ON_SIDE> | KnownError<typeof LAYOUT_ERROR.CANT_UNDOCK_COLLAPSED_FRAME> | KnownError<typeof LAYOUT_ERROR.NO_FILL_CANDIDATES> | KnownError<typeof LAYOUT_ERROR.CANT_RESIZE_SINGLE_FRAME>;

package/dist/runtime/layout/getFrameDockInfo.js

@@ -2,9 +2,11 @@ import { pushIfNotIn } from "@alanscodelog/utils/pushIfNotIn";
 import { walk } from "@alanscodelog/utils/walk";
 import { applyFrameChanges } from "./applyFrameChanges.js";
 import { getFillEmptySpaceInfo } from "./getFillEmptySpaceInfo.js";
+import { getFrameShrinkInfo } from "./getFrameShrinkInfo.js";
 import { getFramesRedistributeInfo } from "./getFramesRedistributeInfo.js";
 import { getFrameUndockInfo } from "./getFrameUndockInfo.js";
 import { cloneFrame } from "../helpers/cloneFrame.js";
+import { findEdgesTouchingWindow } from "../helpers/findEdgesTouchingWindow.js";
 import { getDockBoundaries } from "../helpers/getDockBoundaries.js";
 import { getPinnedEdgesForCollapsedFrames } from "../helpers/getPinnedEdgesForCollapsedFrames.js";
 import { oppositeSide } from "../helpers/oppositeSide.js";
@@ -29,58 +31,73 @@ export function getFrameDockInfo(win, frameId, side, maxPerpendicularLength) {
   }
   const isHorizontal = side === "left" || side === "right";
   const perpendicular = isHorizontal ? "width" : "height";
-  const oldFrame = cloneFrame(frame);
+  const posKey = isHorizontal ? "x" : "y";
+  const sizeKey = isHorizontal ? "width" : "height";
   const otherFrameIds = Object.keys(win.frames).filter((_) => _ !== frameId);
   const nonDockedFrameIds = otherFrameIds.filter((id) => !win.frames[id].docked);
   if (nonDockedFrameIds.length === 0) {
     return new KnownError(LAYOUT_ERROR.CANT_LEAVE_NO_UNDOCKED_FRAMES, `Can't dock frame ${frameId} because there are no other undocked frames.`, { frameId });
   }
-  const effectiveMaxPerpendicular = maxPerpendicularLength ?? settings.maxPerpendicularLengthScaled.width;
-  const perpendicularLength = otherFrameIds.length > 0 ? Math.min(frame[perpendicular], effectiveMaxPerpendicular) : frame[perpendicular];
+  const maxPerpendicular = maxPerpendicularLength ?? settings.maxPerpendicularLengthScaled.width;
+  const perpendicularLength = otherFrameIds.length > 0 ? Math.min(frame[perpendicular], maxPerpendicular) : frame[perpendicular];
   frame.docked = side;
   frame.collapsed = void 0;
   const toExtract = [frame.id];
-  const changes = getFillEmptySpaceInfo(win, oldFrame, [], [frameId]);
-  if (changes instanceof Error) return changes;
-  applyFrameChanges(win, changes);
-  pushIfNotIn(toExtract, changes.modified.map((_) => _.id));
-  const sideToPushTowards = oppositeSide(side);
-  const posKey = isHorizontal ? "x" : "y";
-  const sizeKey = isHorizontal ? "width" : "height";
-  const pinnedEdgeCoordinates = getPinnedEdgesForCollapsedFrames(win, frame, side, posKey, sizeKey);
-  const redistributeChanges = getFramesRedistributeInfo(win, sideToPushTowards, nonDockedFrameIds, perpendicularLength, { pinnedEdgeCoordinates });
-  if (redistributeChanges instanceof KnownError) {
-    return redistributeChanges;
+  if (frame[perpendicular] === perpendicularLength) {
+    return { modified: toExtract.map((_) => win.frames[_]), created: [], deleted: [] };
   }
-  applyFrameChanges(win, redistributeChanges);
-  pushIfNotIn(toExtract, redistributeChanges.modified.map((_) => _.id));
-  const { minX, maxX, minY, maxY } = getDockBoundaries(win);
-  switch (side) {
-    case "left":
-      frame.x = 0;
-      frame.y = minY;
-      frame.width = perpendicularLength;
-      frame.height = maxY - minY;
-      break;
-    case "right":
-      frame.x = settings.maxInt - perpendicularLength;
-      frame.y = minY;
-      frame.width = perpendicularLength;
-      frame.height = maxY - minY;
-      break;
-    case "top":
-      frame.x = minX;
-      frame.y = 0;
-      frame.width = maxX - minX;
-      frame.height = perpendicularLength;
-      break;
-    case "bottom":
-      frame.x = minX;
-      frame.y = settings.maxInt - perpendicularLength;
-      frame.width = maxX - minX;
-      frame.height = perpendicularLength;
-      break;
+  const touchesEntireEdge = findEdgesTouchingWindow(frame)[side] === "full";
+  if (touchesEntireEdge) {
+    const shrinkAmount = frame[sizeKey] - perpendicularLength;
+    if (shrinkAmount > 0) {
+      const shrinkResult = getFrameShrinkInfo(win, frameId, shrinkAmount, side);
+      if (shrinkResult instanceof KnownError) {
+        return shrinkResult;
+      }
+      applyFrameChanges(win, shrinkResult);
+      pushIfNotIn(toExtract, shrinkResult.modified.map((_) => _.id));
+    }
+  } else {
+    const oldFrame = cloneFrame(frame);
+    const changes = getFillEmptySpaceInfo(win, oldFrame, [], [frameId]);
+    if (changes instanceof Error) return changes;
+    applyFrameChanges(win, changes);
+    pushIfNotIn(toExtract, changes.modified.map((_) => _.id));
+    const sideToPushTowards = oppositeSide(side);
+    const pinnedEdgeCoordinates = getPinnedEdgesForCollapsedFrames(win, frame, side, posKey, sizeKey);
+    const redistributeChanges = getFramesRedistributeInfo(win, sideToPushTowards, nonDockedFrameIds, perpendicularLength, { pinnedEdgeCoordinates });
+    if (redistributeChanges instanceof KnownError) {
+      return redistributeChanges;
+    }
+    applyFrameChanges(win, redistributeChanges);
+    pushIfNotIn(toExtract, redistributeChanges.modified.map((_) => _.id));
+    const { minX, maxX, minY, maxY } = getDockBoundaries(win);
+    switch (side) {
+      case "left":
+        frame.x = 0;
+        frame.y = minY;
+        frame.width = perpendicularLength;
+        frame.height = maxY - minY;
+        break;
+      case "right":
+        frame.x = settings.maxInt - perpendicularLength;
+        frame.y = minY;
+        frame.width = perpendicularLength;
+        frame.height = maxY - minY;
+        break;
+      case "top":
+        frame.x = minX;
+        frame.y = 0;
+        frame.width = maxX - minX;
+        frame.height = perpendicularLength;
+        break;
+      case "bottom":
+        frame.x = minX;
+        frame.y = settings.maxInt - perpendicularLength;
+        frame.width = maxX - minX;
+        frame.height = perpendicularLength;
+        break;
+    }
   }
-  const res = toExtract.map((_) => win.frames[_]);
-  return { modified: res, created: [], deleted: [] };
+  return { modified: toExtract.map((_) => win.frames[_]), created: [], deleted: [] };
 }

package/dist/runtime/layout/getFrameExpandInfo.d.ts

@@ -0,0 +1,11 @@
+import type { EdgeSide, LayoutChange, LayoutWindow } from "../types/index.js";
+import { LAYOUT_ERROR } from "../types/index.js";
+import { KnownError } from "../utils/KnownError.js";
+/**
+ * Returns a {@link LayoutChange} with the information necessary to expand a frame touching a window edge by a given amount.
+ *
+ * Changes can be applied to a window with {@link applyFrameChanges}.
+ *
+ * It expands the frame by redistributing space from neighboring frames.
+ */
+export declare function getFrameExpandInfo(win: LayoutWindow, frameId: string, amount: number, expandSide: EdgeSide): LayoutChange | KnownError<typeof LAYOUT_ERROR.REDISTRIBUTE_OUT_OF_BOUNDS> | KnownError<typeof LAYOUT_ERROR.NO_SPACE_TO_REDISTRIBUTE> | KnownError<typeof LAYOUT_ERROR.REDISTRIBUTE_WOULD_RESULT_IN_INVALID_FRAMES> | KnownError<typeof LAYOUT_ERROR.CANT_RESIZE_SINGLE_FRAME>;

package/dist/runtime/layout/getFrameExpandInfo.js

@@ -0,0 +1,49 @@
+import { pushIfNotIn } from "@alanscodelog/utils/pushIfNotIn";
+import { walk } from "@alanscodelog/utils/walk";
+import { applyFrameChanges } from "./applyFrameChanges.js";
+import { getFramesRedistributeInfo } from "./getFramesRedistributeInfo.js";
+import { findEdgesTouchingWindow } from "../helpers/findEdgesTouchingWindow.js";
+import { framesRedistributeFix } from "../helpers/framesRedistributeFix.js";
+import { getPinnedEdgesForCollapsedFrames } from "../helpers/getPinnedEdgesForCollapsedFrames.js";
+import { oppositeSide } from "../helpers/oppositeSide.js";
+import { LAYOUT_ERROR } from "../types/index.js";
+import { KnownError } from "../utils/KnownError.js";
+export function getFrameExpandInfo(win, frameId, amount, expandSide) {
+  win = walk(win, void 0, { save: true });
+  const frame = win.frames[frameId];
+  if (!frame) {
+    throw new Error(`Unknown frame ${frameId}`);
+  }
+  if (!frame.docked) {
+    throw new Error(`Frame ${frameId} is not docked.`);
+  }
+  const toExtract = [frame.id];
+  if (Object.keys(win.frames).length === 1) {
+    return new KnownError(LAYOUT_ERROR.CANT_RESIZE_SINGLE_FRAME, `Frame ${frameId} is the only frame, cannot expand.`, { frame });
+  }
+  if (!(expandSide in findEdgesTouchingWindow(frame))) {
+    throw new Error(`Frame ${frameId} does not touch the ${expandSide} edge.`);
+  }
+  const isVertical = frame.docked === "left" || frame.docked === "right";
+  const sizeKey = isVertical ? "width" : "height";
+  const posKey = isVertical ? "x" : "y";
+  const currentSize = frame[sizeKey];
+  const dockedSide = frame.docked;
+  const { applyFixes, toFix } = framesRedistributeFix(win, frame, dockedSide, posKey, sizeKey, "expand");
+  const otherFrameIds = Object.keys(win.frames).filter((id) => id !== frameId);
+  const redistributeSide = oppositeSide(frame.docked);
+  const pinnedEdgeCoordinates = getPinnedEdgesForCollapsedFrames(win, frame, dockedSide, posKey, sizeKey);
+  const changes = getFramesRedistributeInfo(win, redistributeSide, otherFrameIds, amount, { pinnedEdgeCoordinates });
+  if (changes instanceof KnownError) {
+    return changes;
+  }
+  applyFrameChanges(win, changes);
+  pushIfNotIn(toExtract, changes.modified.map((_) => _.id));
+  applyFixes();
+  pushIfNotIn(toExtract, toFix);
+  frame[sizeKey] = currentSize + amount;
+  if (frame.docked === "right" || frame.docked === "bottom") {
+    frame[posKey] -= amount;
+  }
+  return { modified: toExtract.map((_) => win.frames[_]), created: [], deleted: [] };
+}

package/dist/runtime/layout/getFrameShrinkInfo.d.ts

@@ -0,0 +1,14 @@
+import type { EdgeSide, LayoutChange, LayoutWindow } from "../types/index.js";
+import { LAYOUT_ERROR } from "../types/index.js";
+import { KnownError } from "../utils/KnownError.js";
+/**
+ * Returns a {@link LayoutChange} with the information necessary to shrink a frame touching a window edge by a given amount.
+ *
+ * Changes can be applied to a window with {@link applyFrameChanges}.
+ *
+ * It shrinks the frame by redistributing the freed space to neighboring frames.
+ */
+export declare function getFrameShrinkInfo(win: LayoutWindow, frameId: string, amount: number, shrinkSide: EdgeSide, { allowOutOfBounds }?: {
+    /** Allow the resize span to exceed window bounds. */
+    allowOutOfBounds?: boolean;
+}): LayoutChange | KnownError<typeof LAYOUT_ERROR.REDISTRIBUTE_WOULD_RESULT_IN_INVALID_FRAMES> | KnownError<typeof LAYOUT_ERROR.CANT_RESIZE_SINGLE_FRAME>;

package/dist/runtime/layout/getFrameShrinkInfo.js

@@ -0,0 +1,48 @@
+import { pushIfNotIn } from "@alanscodelog/utils/pushIfNotIn";
+import { walk } from "@alanscodelog/utils/walk";
+import { applyFrameChanges } from "./applyFrameChanges.js";
+import { getFramesRedistributeInfo } from "./getFramesRedistributeInfo.js";
+import { findEdgesTouchingWindow } from "../helpers/findEdgesTouchingWindow.js";
+import { framesRedistributeFix } from "../helpers/framesRedistributeFix.js";
+import { getPinnedEdgesForCollapsedFrames } from "../helpers/getPinnedEdgesForCollapsedFrames.js";
+import { oppositeSide } from "../helpers/oppositeSide.js";
+import { LAYOUT_ERROR } from "../types/index.js";
+import { KnownError } from "../utils/KnownError.js";
+export function getFrameShrinkInfo(win, frameId, amount, shrinkSide, {
+  allowOutOfBounds = false
+} = {}) {
+  win = walk(win, void 0, { save: true });
+  const frame = win.frames[frameId];
+  if (!frame) throw new Error(`Unknown frame ${frameId}`);
+  if (Object.keys(win.frames).length === 1) {
+    return new KnownError(LAYOUT_ERROR.CANT_RESIZE_SINGLE_FRAME, `Frame ${frameId} is the only frame, cannot shrink.`, { frame });
+  }
+  if (!(shrinkSide in findEdgesTouchingWindow(frame))) {
+    throw new Error(`Frame ${frameId} does not touch the ${shrinkSide} edge.`);
+  }
+  const isVertical = shrinkSide === "left" || shrinkSide === "right";
+  const sizeKey = isVertical ? "width" : "height";
+  const posKey = isVertical ? "x" : "y";
+  const toExtract = [frame.id];
+  const { applyFixes, toFix } = framesRedistributeFix(win, frame, shrinkSide, posKey, sizeKey, "shrink");
+  const otherFrameIds = Object.keys(win.frames).filter((id) => id !== frameId);
+  const redistributeSide = oppositeSide(shrinkSide);
+  const pinnedEdgeCoordinates = getPinnedEdgesForCollapsedFrames(win, frame, shrinkSide, posKey, sizeKey);
+  const changes = getFramesRedistributeInfo(win, redistributeSide, otherFrameIds, -amount, { allowOutOfBounds, pinnedEdgeCoordinates });
+  if (changes instanceof KnownError) {
+    if (changes.code === LAYOUT_ERROR.REDISTRIBUTE_OUT_OF_BOUNDS || changes.code === LAYOUT_ERROR.NO_SPACE_TO_REDISTRIBUTE) {
+      changes.message = `This error should never happen, please file a bug report: ${changes.message}`;
+      throw changes;
+    }
+    return changes;
+  }
+  applyFrameChanges(win, changes);
+  pushIfNotIn(toExtract, changes.modified.map((_) => _.id));
+  applyFixes();
+  pushIfNotIn(toExtract, toFix);
+  if (shrinkSide === "right" || shrinkSide === "bottom") {
+    frame[posKey] = frame[posKey] + amount;
+  }
+  frame[sizeKey] = frame[sizeKey] - amount;
+  return { modified: toExtract.map((_) => win.frames[_]), created: [], deleted: [] };
+}

package/dist/runtime/layout/getFrameUncollapseInfo.d.ts

@@ -12,4 +12,4 @@ import { KnownError } from "../utils/KnownError.js";
 export declare function getFrameUncollapseInfo(win: LayoutWindow, frameId: string, { restoreSize }?: {
     /** Override the size to restore the frame to. */
     restoreSize?: Size;
-}): LayoutChange | KnownError<typeof LAYOUT_ERROR.CANT_UNCOLLAPSE_NOT_COLLAPSED> | KnownError<typeof LAYOUT_ERROR.REDISTRIBUTE_OUT_OF_BOUNDS> | KnownError<typeof LAYOUT_ERROR.NO_SPACE_TO_REDISTRIBUTE> | KnownError<typeof LAYOUT_ERROR.REDISTRIBUTE_WOULD_RESULT_IN_INVALID_FRAMES>;
+}): LayoutChange | KnownError<typeof LAYOUT_ERROR.CANT_UNCOLLAPSE_NOT_COLLAPSED> | KnownError<typeof LAYOUT_ERROR.REDISTRIBUTE_OUT_OF_BOUNDS> | KnownError<typeof LAYOUT_ERROR.NO_SPACE_TO_REDISTRIBUTE> | KnownError<typeof LAYOUT_ERROR.REDISTRIBUTE_WOULD_RESULT_IN_INVALID_FRAMES> | KnownError<typeof LAYOUT_ERROR.CANT_RESIZE_SINGLE_FRAME>;

package/dist/runtime/layout/getFrameUncollapseInfo.js

@@ -1,10 +1,7 @@
 import { pushIfNotIn } from "@alanscodelog/utils/pushIfNotIn";
 import { walk } from "@alanscodelog/utils/walk";
 import { applyFrameChanges } from "./applyFrameChanges.js";
-import { getFramesRedistributeInfo } from "./getFramesRedistributeInfo.js";
-import { framesRedistributeFix } from "../helpers/framesRedistributeFix.js";
-import { getPinnedEdgesForCollapsedFrames } from "../helpers/getPinnedEdgesForCollapsedFrames.js";
-import { oppositeSide } from "../helpers/oppositeSide.js";
+import { getFrameExpandInfo } from "./getFrameExpandInfo.js";
 import { LAYOUT_ERROR } from "../types/index.js";
 import { KnownError } from "../utils/KnownError.js";
 export function getFrameUncollapseInfo(win, frameId, {
@@ -21,7 +18,6 @@ export function getFrameUncollapseInfo(win, frameId, {
   const toExtract = [frame.id];
   const isVertical = frame.docked === "left" || frame.docked === "right";
   const sizeKey = isVertical ? "width" : "height";
-  const posKey = isVertical ? "x" : "y";
   const currentSize = frame[sizeKey];
   const storedSize = restoreSize !== void 0 ? restoreSize[sizeKey] : frame.collapsed;
   if (frame.collapsed === void 0) {
@@ -33,22 +29,12 @@ export function getFrameUncollapseInfo(win, frameId, {
   }
   const expandAmount = storedSize - currentSize;
   const dockedSide = frame.docked;
-  const { applyFixes, toFix } = framesRedistributeFix(win, frame, dockedSide, posKey, sizeKey, "expand");
-  const otherFrameIds = Object.keys(win.frames).filter((id) => id !== frameId);
-  const redistributeSide = oppositeSide(frame.docked);
-  const pinnedEdgeCoordinates = getPinnedEdgesForCollapsedFrames(win, frame, dockedSide, posKey, sizeKey);
-  const changes = getFramesRedistributeInfo(win, redistributeSide, otherFrameIds, expandAmount, { pinnedEdgeCoordinates });
-  if (changes instanceof KnownError) {
-    return changes;
+  const expandResult = getFrameExpandInfo(win, frameId, expandAmount, dockedSide);
+  if (expandResult instanceof KnownError) {
+    return expandResult;
   }
-  applyFrameChanges(win, changes);
-  pushIfNotIn(toExtract, changes.modified.map((_) => _.id));
-  applyFixes();
-  pushIfNotIn(toExtract, toFix);
-  frame[sizeKey] = storedSize;
+  applyFrameChanges(win, expandResult);
+  pushIfNotIn(toExtract, expandResult.modified.map((_) => _.id));
   frame.collapsed = void 0;
-  if (frame.docked === "right" || frame.docked === "bottom") {
-    frame[posKey] -= expandAmount;
-  }
   return { modified: toExtract.map((_) => win.frames[_]), created: [], deleted: [] };
 }

package/dist/runtime/layout/getUpdateWindowSizeInfo.js

@@ -1,8 +1,8 @@
 import { pushIfNotIn } from "@alanscodelog/utils/pushIfNotIn";
 import { walk } from "@alanscodelog/utils/walk";
 import { applyFrameChanges } from "../layout/applyFrameChanges.js";
-import { getFrameCollapseInfo } from "../layout/getFrameCollapseInfo.js";
-import { getFrameUncollapseInfo } from "../layout/getFrameUncollapseInfo.js";
+import { getFrameExpandInfo } from "../layout/getFrameExpandInfo.js";
+import { getFrameShrinkInfo } from "../layout/getFrameShrinkInfo.js";
 import { getRelaxFramesInfo } from "../layout/getRelaxFramesInfo.js";
 import { settings } from "../settings.js";
 import { KnownError } from "../utils/KnownError.js";
@@ -30,23 +30,21 @@ export function getUpdateWindowSizeInfo(win, event, { relaxPasses = 2 } = {}) {
     const targetScaled = Math.round(targetPxSize / (orientation === "horizontal" ? win.pxWidth : win.pxHeight) * maxInt);
     if (frame[sizeKey] === targetScaled) continue;
     if (frame[sizeKey] === 0) continue;
+    const side = frame.docked;
+    const diff = targetScaled - frame[sizeKey];
     let result;
-    const wasCollapsed = frame.collapsed;
-    const wasMinSize = { ...settings.minSize };
-    settings.minSize = 1;
-    if (targetScaled < frame[sizeKey]) {
-      frame.collapsed = void 0;
-      result = getFrameCollapseInfo(win, frame.id, { collapseSizeScaled: { width: targetScaled, height: targetScaled } });
+    if (diff < 0) {
+      result = getFrameShrinkInfo(win, frame.id, -diff, side, { allowOutOfBounds: true });
     } else {
-      frame.collapsed = Infinity;
-      result = getFrameUncollapseInfo(win, frame.id, { restoreSize: { width: targetScaled, height: targetScaled } });
+      const wasMinSize = { ...settings.minSize };
+      settings.minSize = 1;
+      result = getFrameExpandInfo(win, frame.id, diff, side);
+      settings.minSize = wasMinSize;
     }
     if (!(result instanceof KnownError)) {
       applyFrameChanges(win, result);
       pushIfNotIn(toExtract, result.modified.map((f) => f.id));
     }
-    frame.collapsed = wasCollapsed;
-    settings.minSize = wasMinSize;
     const result2 = getRelaxFramesInfo(win, relaxPasses);
     if (!(result2 instanceof KnownError)) {
       applyFrameChanges(win, result2);

package/dist/runtime/layout/index.d.ts

@@ -12,13 +12,16 @@ export { getFillEmptySpaceInfo } from "./getFillEmptySpaceInfo.js";
 export { getFrameCollapseInfo } from "./getFrameCollapseInfo.js";
 export { getFrameDockInfo } from "./getFrameDockInfo.js";
 export { getFrameDragZones } from "./getFrameDragZones.js";
+export { getFrameExpandInfo } from "./getFrameExpandInfo.js";
 export { getFrameRearrangeInfo } from "./getFrameRearrangeInfo.js";
+export { getFrameShrinkInfo } from "./getFrameShrinkInfo.js";
 export { getFrameSplitInfo } from "./getFrameSplitInfo.js";
 export { getFramesRedistributeInfo } from "./getFramesRedistributeInfo.js";
 export { getFrameSwapInfo } from "./getFrameSwapInfo.js";
 export { getFrameTo } from "./getFrameTo.js";
 export { getFrameUncollapseInfo } from "./getFrameUncollapseInfo.js";
 export { getFrameUndockInfo } from "./getFrameUndockInfo.js";
+export { getRelaxFramesInfo } from "./getRelaxFramesInfo.js";
 export { getUpdateWindowSizeInfo } from "./getUpdateWindowSizeInfo.js";
 export { getWindowDragZones } from "./getWindowDragZones.js";
 export { isPointInRect } from "./isPointInRect.js";