@witchcraft/layout 0.4.3 → 0.4.4

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@witchcraft/layout",
   "configKey": "witchcraftLayout",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "unknown"

package/dist/runtime/components/LayoutWindow.d.vue.ts

@@ -3,7 +3,7 @@ import { type DragState, type IDragAction } from "../types/index.js";
 import { getUpdateWindowSizeInfo } from "../layout/getUpdateWindowSizeInfo.js";
 import { type LayoutWindow } from "../types/index.js";
 type __VLS_Props = {
-    /** If you really need it, you can provide your own drag action handler, note the actionHandler's prop will no longer have any effect.*/
+    /** If you really need it, you can provide your own drag action handler (remember to markRaw it), note the actionHandler's prop will no longer have any effect.*/
     dragActionHandler?: DragActionHandler<any, any>;
     /** Custom drag action handlers. Falls back to default split/close/frame handlers if not provided. */
     actionHandlers?: IDragAction[];
@@ -109,6 +109,8 @@ declare const __VLS_component: import("vue").DefineComponent<__VLS_PublicProps,
                 frame: import("../types/index.js").LayoutFrame;
             } | {
                 frame: import("../types/index.js").LayoutFrame;
+            } | {
+                frame: import("../types/index.js").LayoutFrame;
             }> | {
                 code: string;
                 message: string;
@@ -184,6 +186,8 @@ declare const __VLS_component: import("vue").DefineComponent<__VLS_PublicProps,
                         frame: import("../types/index.js").LayoutFrame;
                     } | {
                         frame: import("../types/index.js").LayoutFrame;
+                    } | {
+                        frame: import("../types/index.js").LayoutFrame;
                     }> | {
                         code: string;
                         message: string;
@@ -251,6 +255,8 @@ declare const __VLS_component: import("vue").DefineComponent<__VLS_PublicProps,
                         frame: import("../types/index.js").LayoutFrame;
                     } | {
                         frame: import("../types/index.js").LayoutFrame;
+                    } | {
+                        frame: import("../types/index.js").LayoutFrame;
                     }> | {
                         code: string;
                         message: string;
@@ -321,6 +327,8 @@ declare const __VLS_component: import("vue").DefineComponent<__VLS_PublicProps,
                 frame: import("../types/index.js").LayoutFrame;
             } | {
                 frame: import("../types/index.js").LayoutFrame;
+            } | {
+                frame: import("../types/index.js").LayoutFrame;
             }> | {
                 code: string;
                 message: string;
@@ -332,6 +340,7 @@ declare const __VLS_component: import("vue").DefineComponent<__VLS_PublicProps,
         dragHoveredFrame: import("../types/index.js").LayoutFrame | undefined;
         intersections: import("../types/index.js").IntersectionEntry[];
         isDraggingFromWindowEdge: boolean;
+        eventContext: Record<string, unknown> | undefined;
         win: import("../types/index.js").BaseLayoutWindow;
     }>;
     win: import("vue").ModelRef<import("../types/index.js").BaseLayoutWindow, string, import("../types/index.js").BaseLayoutWindow, import("../types/index.js").BaseLayoutWindow>;

package/dist/runtime/components/LayoutWindow.vue

@@ -7,7 +7,7 @@
 			flex
 			flex-col
 		`,
-  isDragging && `dragging cursor-pointer user-select-none`,
+  isDragging && `dragging cursor-pointer user-select-none pointer-events-none`,
   requestType && `request-${requestType}`,
   $attrs.class
 )"
@@ -67,7 +67,7 @@
 <script setup>
 import { useGlobalResizeObserver } from "@witchcraft/ui/composables/useGlobalResizeObserver";
 import { twMerge } from "@witchcraft/ui/utils/twMerge";
-import { computed, provide, reactive, ref, useAttrs, watch } from "vue";
+import { computed, markRaw, provide, reactive, ref, useAttrs, watch } from "vue";
 import { useFrames } from "../composables/useFrames.js";
 import { createDefaultHandlers } from "../drag/createDefaultHandlers.js";
 import { DragActionHandler } from "../drag/DragActionHandler";
@@ -92,7 +92,7 @@ const props = defineProps({
 const emit = defineEmits(["isShowingDrag", "dragState"]);
 const windowEl = ref(null);
 const requestType = ref();
-const dragActionHandler = props.dragActionHandler ?? new DragActionHandler(
+const dragActionHandler = props.dragActionHandler ?? markRaw(new DragActionHandler(
   [
     ...props.actionHandlers ?? createDefaultHandlers()
   ],
@@ -111,7 +111,7 @@ const dragActionHandler = props.dragActionHandler ?? new DragActionHandler(
       showDragging.value = true;
     }
   }
-);
+));
 dragActionHandler.shapes = reactive([]);
 dragActionHandler.textHints = reactive({ actions: [], errors: [] });
 const shapes = dragActionHandler.shapes;

package/dist/runtime/components/LayoutWindow.vue.d.ts

@@ -3,7 +3,7 @@ import { type DragState, type IDragAction } from "../types/index.js";
 import { getUpdateWindowSizeInfo } from "../layout/getUpdateWindowSizeInfo.js";
 import { type LayoutWindow } from "../types/index.js";
 type __VLS_Props = {
-    /** If you really need it, you can provide your own drag action handler, note the actionHandler's prop will no longer have any effect.*/
+    /** If you really need it, you can provide your own drag action handler (remember to markRaw it), note the actionHandler's prop will no longer have any effect.*/
     dragActionHandler?: DragActionHandler<any, any>;
     /** Custom drag action handlers. Falls back to default split/close/frame handlers if not provided. */
     actionHandlers?: IDragAction[];
@@ -109,6 +109,8 @@ declare const __VLS_component: import("vue").DefineComponent<__VLS_PublicProps,
                 frame: import("../types/index.js").LayoutFrame;
             } | {
                 frame: import("../types/index.js").LayoutFrame;
+            } | {
+                frame: import("../types/index.js").LayoutFrame;
             }> | {
                 code: string;
                 message: string;
@@ -184,6 +186,8 @@ declare const __VLS_component: import("vue").DefineComponent<__VLS_PublicProps,
                         frame: import("../types/index.js").LayoutFrame;
                     } | {
                         frame: import("../types/index.js").LayoutFrame;
+                    } | {
+                        frame: import("../types/index.js").LayoutFrame;
                     }> | {
                         code: string;
                         message: string;
@@ -251,6 +255,8 @@ declare const __VLS_component: import("vue").DefineComponent<__VLS_PublicProps,
                         frame: import("../types/index.js").LayoutFrame;
                     } | {
                         frame: import("../types/index.js").LayoutFrame;
+                    } | {
+                        frame: import("../types/index.js").LayoutFrame;
                     }> | {
                         code: string;
                         message: string;
@@ -321,6 +327,8 @@ declare const __VLS_component: import("vue").DefineComponent<__VLS_PublicProps,
                 frame: import("../types/index.js").LayoutFrame;
             } | {
                 frame: import("../types/index.js").LayoutFrame;
+            } | {
+                frame: import("../types/index.js").LayoutFrame;
             }> | {
                 code: string;
                 message: string;
@@ -332,6 +340,7 @@ declare const __VLS_component: import("vue").DefineComponent<__VLS_PublicProps,
         dragHoveredFrame: import("../types/index.js").LayoutFrame | undefined;
         intersections: import("../types/index.js").IntersectionEntry[];
         isDraggingFromWindowEdge: boolean;
+        eventContext: Record<string, unknown> | undefined;
         win: import("../types/index.js").BaseLayoutWindow;
     }>;
     win: import("vue").ModelRef<import("../types/index.js").BaseLayoutWindow, string, import("../types/index.js").BaseLayoutWindow, import("../types/index.js").BaseLayoutWindow>;

package/dist/runtime/composables/useFrames.d.ts

@@ -1,26 +1,11 @@
 import type { Ref } from "vue";
-import type { DragChangeHandler, DragChangeResult, DragState, Edge, EdgeDragStartData, FrameDragStartData, IntersectionEntry, LayoutFrame, LayoutWindow } from "../types/index.js";
-export declare function useFrames(win: Ref<LayoutWindow>, handler: {
-    eventHandler: (e: KeyboardEvent, state: DragState, forceRecalculateEdges: () => void) => void;
-    /**
-        * Called when the drag coordinates change (during any event). Should return true to allow the edges to be updated/moved, or false to prevent it.
-        *
-        * Can return anything for the end event as it's ignored.
-        *
-        * Can be used to save some context/info to later apply safely during onDragApply.
-        */
-    onDragChange: (...args: Parameters<DragChangeHandler>) => DragChangeResult;
-    /**
-     * Called when drag will be applied. If dragEnd was called with apply false, it will not be called.
-     * Return false to not apply the regular drag end changes (i.e. return false to reset to the position before dragging).
-     */
-    onDragApply: ((state: DragState, forceRecalculateEdges: () => void) => boolean);
-    /**
-     * Called after visual edges are recalculated. Action handlers can annotate edges with error info.
-     */
-    annotateEdges?: (edges: Edge[], frames: LayoutFrame[]) => void;
-}): {
-    dragStart: <T extends "edge" | "frame">(e: PointerEvent, type: T, data: T extends "edge" ? EdgeDragStartData : FrameDragStartData) => void;
+import type { ActionHandler, EdgeDragStartData, FrameDragStartData, IntersectionEntry, LayoutFrame, LayoutWindow } from "../types/index.js";
+export declare function useFrames(win: Ref<LayoutWindow>, handler: ActionHandler): {
+    dragStart: <T extends "edge" | "frame">(e: PointerEvent, type: T, data: T extends "edge" ? EdgeDragStartData : FrameDragStartData, { moveEvent, endEvent, context }?: {
+        moveEvent?: string;
+        endEvent?: string;
+        context?: Record<string, unknown>;
+    }) => Promise<any>;
     dragEnd: (e?: PointerEvent, { apply }?: {
         apply?: boolean;
     }) => void;
@@ -103,6 +88,8 @@ export declare function useFrames(win: Ref<LayoutWindow>, handler: {
             frame: LayoutFrame;
         } | {
             frame: LayoutFrame;
+        } | {
+            frame: LayoutFrame;
         }> | {
             code: string;
             message: string;
@@ -169,6 +156,8 @@ export declare function useFrames(win: Ref<LayoutWindow>, handler: {
             frame: LayoutFrame;
         } | {
             frame: LayoutFrame;
+        } | {
+            frame: LayoutFrame;
         }> | {
             code: string;
             message: string;
@@ -235,6 +224,8 @@ export declare function useFrames(win: Ref<LayoutWindow>, handler: {
             frame: LayoutFrame;
         } | {
             frame: LayoutFrame;
+        } | {
+            frame: LayoutFrame;
         }> | {
             code: string;
             message: string;
@@ -310,6 +301,8 @@ export declare function useFrames(win: Ref<LayoutWindow>, handler: {
                     frame: LayoutFrame;
                 } | {
                     frame: LayoutFrame;
+                } | {
+                    frame: LayoutFrame;
                 }> | {
                     code: string;
                     message: string;
@@ -377,6 +370,8 @@ export declare function useFrames(win: Ref<LayoutWindow>, handler: {
                     frame: LayoutFrame;
                 } | {
                     frame: LayoutFrame;
+                } | {
+                    frame: LayoutFrame;
                 }> | {
                     code: string;
                     message: string;
@@ -454,6 +449,8 @@ export declare function useFrames(win: Ref<LayoutWindow>, handler: {
                     frame: LayoutFrame;
                 } | {
                     frame: LayoutFrame;
+                } | {
+                    frame: LayoutFrame;
                 }> | {
                     code: string;
                     message: string;
@@ -521,6 +518,8 @@ export declare function useFrames(win: Ref<LayoutWindow>, handler: {
                     frame: LayoutFrame;
                 } | {
                     frame: LayoutFrame;
+                } | {
+                    frame: LayoutFrame;
                 }> | {
                     code: string;
                     message: string;
@@ -591,6 +590,8 @@ export declare function useFrames(win: Ref<LayoutWindow>, handler: {
             frame: LayoutFrame;
         } | {
             frame: LayoutFrame;
+        } | {
+            frame: LayoutFrame;
         }> | {
             code: string;
             message: string;
@@ -657,6 +658,8 @@ export declare function useFrames(win: Ref<LayoutWindow>, handler: {
             frame: LayoutFrame;
         } | {
             frame: LayoutFrame;
+        } | {
+            frame: LayoutFrame;
         }> | {
             code: string;
             message: string;
@@ -723,6 +726,8 @@ export declare function useFrames(win: Ref<LayoutWindow>, handler: {
             frame: LayoutFrame;
         } | {
             frame: LayoutFrame;
+        } | {
+            frame: LayoutFrame;
         }> | {
             code: string;
             message: string;
@@ -810,6 +815,8 @@ export declare function useFrames(win: Ref<LayoutWindow>, handler: {
                 frame: LayoutFrame;
             } | {
                 frame: LayoutFrame;
+            } | {
+                frame: LayoutFrame;
             }> | {
                 code: string;
                 message: string;
@@ -885,6 +892,8 @@ export declare function useFrames(win: Ref<LayoutWindow>, handler: {
                         frame: LayoutFrame;
                     } | {
                         frame: LayoutFrame;
+                    } | {
+                        frame: LayoutFrame;
                     }> | {
                         code: string;
                         message: string;
@@ -952,6 +961,8 @@ export declare function useFrames(win: Ref<LayoutWindow>, handler: {
                         frame: LayoutFrame;
                     } | {
                         frame: LayoutFrame;
+                    } | {
+                        frame: LayoutFrame;
                     }> | {
                         code: string;
                         message: string;
@@ -1022,6 +1033,8 @@ export declare function useFrames(win: Ref<LayoutWindow>, handler: {
                 frame: LayoutFrame;
             } | {
                 frame: LayoutFrame;
+            } | {
+                frame: LayoutFrame;
             }> | {
                 code: string;
                 message: string;
@@ -1033,8 +1046,10 @@ export declare function useFrames(win: Ref<LayoutWindow>, handler: {
         dragHoveredFrame: LayoutFrame | undefined;
         intersections: IntersectionEntry[];
         isDraggingFromWindowEdge: boolean;
+        eventContext: Record<string, unknown> | undefined;
         win: import("../types/index.js").BaseLayoutWindow;
     }>;
     showDragging: Ref<boolean, boolean>;
     frameDragFrameId: Ref<string | undefined, string | undefined>;
+    actionHandler: ActionHandler;
 };

package/dist/runtime/composables/useFrames.js

@@ -32,6 +32,7 @@ export function useFrames(win, handler) {
   const draggingIntersection = ref(void 0);
   const isDraggingFromWindowEdge = ref(false);
   const frameDragFrameId = ref();
+  const eventContext = ref();
   const frames = computed(
     () => isDragging.value && showDragging.value ? { ...win.value.frames, ...allTouchingFrames.value } : win.value.frames
   );
@@ -79,11 +80,17 @@ export function useFrames(win, handler) {
     dragHoveredFrame: dragHoveredFrame.value,
     intersections: intersections.value,
     isDraggingFromWindowEdge: isDraggingFromWindowEdge.value,
+    eventContext: eventContext.value,
     win: win.value
   }));
   let controller;
+  let dragResolve;
+  let dragResult;
   function resetState() {
     dragStartPoint = void 0;
+    dragResolve?.(dragResult);
+    dragResolve = void 0;
+    dragResult = void 0;
     draggingEdges.value = [];
     draggingIntersection.value = void 0;
     isDragging.value = false;
@@ -91,20 +98,32 @@ export function useFrames(win, handler) {
     dragDistance.value = -1;
     touchingFrames.value = [];
     frameDragFrameId.value = void 0;
+    eventContext.value = void 0;
     dragDirStore.reset();
     showDragging.value = false;
     forceRecalculateEdges();
   }
-  function dragStart(e, type, data) {
+  function dragStart(e, type, data, {
+    moveEvent = "pointermove",
+    endEvent = "pointerup",
+    context
+  } = {}) {
+    if (controller) {
+      controller.abort();
+    }
+    const promise = new Promise((resolve) => {
+      dragResolve = resolve;
+    });
     controller = new AbortController();
     controller.signal.addEventListener("abort", () => resetState());
     e.preventDefault();
-    window.addEventListener("pointermove", dragMove, { signal: controller.signal });
-    window.addEventListener("pointerup", dragEnd, { signal: controller.signal });
+    window.addEventListener(moveEvent, dragMove, { signal: controller.signal });
+    window.addEventListener(endEvent, dragEnd, { signal: controller.signal });
     const point = toWindowCoord(win.value, e);
     dragPoint.value = point;
     dragStartPoint = { ...point };
     dragDirStore.update(point);
+    eventContext.value = context;
     isDragging.value = type;
     showDragging.value = true;
     if (type === "frame") {
@@ -136,6 +155,7 @@ export function useFrames(win, handler) {
     }
     const res = handler.onDragChange("start", e, state.value, forceRecalculateEdges, cancel);
     showDragging.value = res.showDragging ?? true;
+    return promise;
   }
   function dragMove(e) {
     e.preventDefault();
@@ -169,10 +189,13 @@ export function useFrames(win, handler) {
       const point = toWindowCoord(win.value, e);
       dragPoint.value = point;
     }
-    const doApply = apply && handler.onDragApply(state.value, forceRecalculateEdges);
-    if (doApply) {
-      for (const frame of touchingFramesArrays.value.flat()) {
-        win.value.frames[frame.id] = frame;
+    if (apply) {
+      const applyResult = handler.onDragApply(state.value, forceRecalculateEdges);
+      dragResult = applyResult.result;
+      if (applyResult.apply) {
+        for (const frame of touchingFramesArrays.value.flat()) {
+          win.value.frames[frame.id] = frame;
+        }
       }
     }
     handler.onDragChange("end", e, state.value, forceRecalculateEdges, cancel);
@@ -213,6 +236,7 @@ export function useFrames(win, handler) {
     forceRecalculateEdges,
     state,
     showDragging,
-    frameDragFrameId
+    frameDragFrameId,
+    actionHandler: handler
   };
 }

package/dist/runtime/demo/tailwind.css

@@ -1 +1 @@
-@import "tailwindcss";@import "../../../playground/.nuxt/witchcraft-ui.css";@import "../../../playground/.nuxt/witchcraft-layout.css";@source "../../../src/runtime/demo";
+@import "tailwindcss";@import "../../../playground/.nuxt/witchcraft-ui.css";@import "../../../playground/.nuxt/witchcraft-layout.css";@source "../../../src/runtime/demo";button{cursor:pointer}

package/dist/runtime/drag/DragActionHandler.d.ts

@@ -48,7 +48,10 @@ export declare class DragActionHandler<TRawDragActions extends IDragAction[], TD
     onDragChange<T extends "start" | "move" | "end">(type: T, e: T extends "end" ? PointerEvent | undefined : PointerEvent, state: DragState, forceRecalculateEdges: () => void, cancel: (e: PointerEvent | KeyboardEvent | undefined, state: DragState) => void): DragChangeResult;
     setTextHints(type: "start" | "move" | "end"): void;
     annotateEdges(edges: Edge[], frames: LayoutFrame[]): void;
-    onDragApply(state: DragState, forceRecalculateEdges: () => void): boolean;
+    onDragApply(state: DragState, forceRecalculateEdges: () => void): {
+        apply: boolean;
+        result: any;
+    };
     cancel(e: PointerEvent | KeyboardEvent | undefined, state: DragState): void;
     static debugState(pluginName: string, type: "before" | "after" | string, state: DragState, pluginState?: Record<string, any>, 
     /** Object key to filter the state by, e.g. state.win.frames. If false is ignored. The idea is you pass this.debug and users can set this.debug to a string to filter. */

package/dist/runtime/drag/DragActionHandler.js

@@ -122,10 +122,10 @@ export class DragActionHandler {
     if (this.activeAction) {
       const res = this.actions[this.activeAction].onDragApply(state, forceRecalculateEdges);
       this.hooks.onEnd?.({ cancelled: false, applied: res });
-      return false;
+      return { apply: res, result: void 0 };
     }
     this.hooks.onEnd?.({ cancelled: false, applied: false });
-    return true;
+    return { apply: true, result: void 0 };
   }
   cancel(e, state) {
     if (this.activeAction) {

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;
   }