@octaviaflow/core 3.0.18-beta.10 → 3.0.18-beta.11

package/dist/index.cjs

@@ -29749,7 +29749,7 @@ function findContainingGroup(point, nodes, exclude = []) {
   for (let i = nodes.length - 1; i >= 0; i--) {
     const n = nodes[i];
     if (exclude.includes(n.id)) continue;
-    if (n.type !== "group") continue;
+    if (n.type !== "group" && n.type !== "forEach") continue;
     if (n.data && typeof n.data === "object" && n.data.collapsed) {
       continue;
     }
@@ -30920,6 +30920,8 @@ function FlowCanvas2(props) {
     reparentOnDrag = false,
     autoResizeContainers = false,
     containerAutoResizePadding = 32,
+    containerMinWidth = 320,
+    containerMinHeight = 200,
     height = "100%",
     width = "100%",
     className,
@@ -31056,7 +31058,9 @@ function FlowCanvas2(props) {
         id: d.id,
         startPosition: d.position
       }));
-      const wantsReparent = altKey || reparentOnDragRef.current;
+      const evaluateReparent = altKey || reparentOnDragRef.current;
+      const hasParent = !!node.parentId;
+      const skipClamp = altKey || reparentOnDragRef.current && !hasParent;
       dragRef.current = {
         pointerId,
         nodeId,
@@ -31064,7 +31068,8 @@ function FlowCanvas2(props) {
         startClientY: clientY,
         startPosition: node.position,
         descendants: kids,
-        altDetach: wantsReparent,
+        skipClamp,
+        evaluateReparent,
         rafScheduled: false,
         nextDelta: null
       };
@@ -31124,6 +31129,8 @@ function FlowCanvas2(props) {
   const reparentOnDragRef = (0, import_react154.useRef)(reparentOnDrag);
   const autoResizeContainersRef = (0, import_react154.useRef)(autoResizeContainers);
   const containerAutoResizePaddingRef = (0, import_react154.useRef)(containerAutoResizePadding);
+  const containerMinWidthRef = (0, import_react154.useRef)(containerMinWidth);
+  const containerMinHeightRef = (0, import_react154.useRef)(containerMinHeight);
   (0, import_react154.useEffect)(() => {
     edgesRef.current = edges;
   }, [edges]);
@@ -31157,6 +31164,12 @@ function FlowCanvas2(props) {
   (0, import_react154.useEffect)(() => {
     containerAutoResizePaddingRef.current = containerAutoResizePadding;
   }, [containerAutoResizePadding]);
+  (0, import_react154.useEffect)(() => {
+    containerMinWidthRef.current = containerMinWidth;
+  }, [containerMinWidth]);
+  (0, import_react154.useEffect)(() => {
+    containerMinHeightRef.current = containerMinHeight;
+  }, [containerMinHeight]);
   const onNodesChangeRef = (0, import_react154.useRef)(onNodesChange);
   const onConnectRef = (0, import_react154.useRef)(onConnect);
   const onConnectEndRef = (0, import_react154.useRef)(onConnectEnd);
@@ -31201,7 +31214,7 @@ function FlowCanvas2(props) {
               x: d.startPosition.x + delta.dx,
               y: d.startPosition.y + delta.dy
             };
-            const clamped = d.altDetach ? proposed : clampToParentExtent(dragNode, proposed, nodesRef.current);
+            const clamped = d.skipClamp ? proposed : clampToParentExtent(dragNode, proposed, nodesRef.current);
             const isContainer = dragNode.type === "group" || dragNode.type === "forEach";
             const gap = isContainer ? subflowCollisionGapRef.current : nodeCollisionGapRef.current;
             const excludeIds = /* @__PURE__ */ new Set([d.nodeId, ...d.descendants.map((kid) => kid.id)]);
@@ -31253,7 +31266,7 @@ function FlowCanvas2(props) {
               y: Math.round(proposed.y / g) * g
             };
           }
-          const clamped = drag.altDetach ? proposed : clampToParentExtent(dragNode, proposed, nodesRef.current);
+          const clamped = drag.skipClamp ? proposed : clampToParentExtent(dragNode, proposed, nodesRef.current);
           const isContainer = dragNode.type === "group" || dragNode.type === "forEach";
           const gap = isContainer ? subflowCollisionGapRef.current : nodeCollisionGapRef.current;
           const excludeIds = /* @__PURE__ */ new Set([
@@ -31276,7 +31289,7 @@ function FlowCanvas2(props) {
               )
             );
           }
-          if (drag.altDetach) {
+          if (drag.evaluateReparent) {
             const targetGroup = findContainingGroup(
               {
                 x: finalPos.x + (dragNode.width ?? 0) / 2,
@@ -31291,8 +31304,10 @@ function FlowCanvas2(props) {
                 ...dragNode,
                 position: finalPos,
                 parentId: nextParentId,
-                // Preserve extent only when staying in a group.
-                extent: nextParentId ? dragNode.extent : void 0
+                // Adopting into a container always pins the child with
+                // `extent: 'parent'` so it's clamped from the next drag
+                // on. Detaching clears it.
+                extent: nextParentId ? "parent" : void 0
               };
               changes.push(change.node.replace(drag.nodeId, updated));
             }
@@ -31303,7 +31318,9 @@ function FlowCanvas2(props) {
               // Projected children: apply the position + reparent
               // changes we just built before measuring bboxes.
               changes,
-              containerAutoResizePaddingRef.current
+              containerAutoResizePaddingRef.current,
+              containerMinWidthRef.current,
+              containerMinHeightRef.current
             );
             for (const c2 of containerChanges) changes.push(c2);
           }
@@ -31389,6 +31406,25 @@ function FlowCanvas2(props) {
       window.removeEventListener("pointercancel", onPointerCancel);
     };
   }, [store]);
+  (0, import_react154.useEffect)(() => {
+    if (!autoResizeContainers || draggingId) return;
+    const resizeChanges = computeContainerAutoResize(
+      nodes,
+      [],
+      containerAutoResizePadding,
+      containerMinWidth,
+      containerMinHeight
+    );
+    if (resizeChanges.length > 0) onNodesChange?.(resizeChanges);
+  }, [
+    nodes,
+    draggingId,
+    autoResizeContainers,
+    containerAutoResizePadding,
+    containerMinWidth,
+    containerMinHeight,
+    onNodesChange
+  ]);
   const panRef = (0, import_react154.useRef)(null);
   const onCanvasPointerDown = (e) => {
     if (e.button !== 0) return;
@@ -31851,7 +31887,9 @@ function FlowCanvas2(props) {
 function onEdgesChangeRef(id, cb) {
   cb?.([change.edge.remove(id)]);
 }
-function computeContainerAutoResize(nodes, pending, padding) {
+var CONTAINER_DROP_HEADROOM_W = 220;
+var CONTAINER_DROP_HEADROOM_H = 2 * 128;
+function computeContainerAutoResize(nodes, pending, padding, minWidth, minHeight) {
   const projected = /* @__PURE__ */ new Map();
   for (const n of nodes) projected.set(n.id, n);
   for (const c of pending) {
@@ -31872,7 +31910,14 @@ function computeContainerAutoResize(nodes, pending, padding) {
     for (const n of projected.values()) {
       if (n.parentId === parent.id) children.push(n);
     }
-    if (children.length === 0) continue;
+    if (children.length === 0) {
+      const curW2 = parent.width ?? 480;
+      const curH2 = parent.height ?? 240;
+      if (curW2 !== minWidth || curH2 !== minHeight) {
+        out.push(change.node.dimensions(parent.id, { width: minWidth, height: minHeight }));
+      }
+      continue;
+    }
     let minX = Number.POSITIVE_INFINITY;
     let minY = Number.POSITIVE_INFINITY;
     let maxX = Number.NEGATIVE_INFINITY;
@@ -31887,12 +31932,12 @@ function computeContainerAutoResize(nodes, pending, padding) {
     }
     const targetX = minX - padding;
     const targetY = minY - padding - HEADER;
-    const targetW = maxX - minX + padding * 2;
-    const targetH = maxY - minY + padding * 2 + HEADER;
     const curW = parent.width ?? 480;
     const curH = parent.height ?? 240;
-    const nextW = Math.max(curW, targetW);
-    const nextH = Math.max(curH, targetH);
+    const fitW = maxX - minX + padding * 2 + CONTAINER_DROP_HEADROOM_W;
+    const fitH = maxY - minY + padding * 2 + HEADER + CONTAINER_DROP_HEADROOM_H;
+    const nextW = Math.max(minWidth, fitW);
+    const nextH = Math.max(minHeight, fitH);
     const positionDirty = parent.position.x !== targetX || parent.position.y !== targetY;
     const sizeDirty = curW !== nextW || curH !== nextH;
     if (positionDirty) {