@flowgram.ai/fixed-layout-core 0.1.30 → 0.2.0

package/dist/esm/index.js

@@ -27,7 +27,7 @@ import {
   FlowScrollLimitLayer
 } from "@flowgram.ai/renderer";
 import {
-  FlowNodeRenderData as FlowNodeRenderData3,
+  FlowNodeRenderData as FlowNodeRenderData4,
   FlowNodeTransformData as FlowNodeTransformData3,
   FlowNodeTransitionData
 } from "@flowgram.ai/document";
@@ -166,8 +166,8 @@ var BlockRegistry = {
     const hasBranchDraggingAdder = currentTransform && currentTransform.entity.isInlineBlock && transition.renderData.draggable;
     if (hasBranchDraggingAdder) {
       if (isVertical) {
-        const currentOffsetRightX = currentTransform.firstChild?.bounds?.right || 0;
-        const nextOffsetLeftX = currentTransform.next?.firstChild?.bounds?.left || 0;
+        const currentOffsetRightX = currentTransform.firstChild ? currentTransform.firstChild.bounds.right : currentTransform.bounds.right;
+        const nextOffsetLeftX = (currentTransform.next?.firstChild ? currentTransform.next?.firstChild.bounds?.left : currentTransform.next?.bounds?.left) || 0;
         const currentInputPointY = currentTransform.inputPoint.y;
         if (currentTransform?.next) {
           lines.push({
@@ -181,8 +181,8 @@ var BlockRegistry = {
           });
         }
       } else {
-        const currentOffsetRightY = currentTransform.firstChild?.bounds?.bottom || 0;
-        const nextOffsetLeftY = currentTransform.next?.firstChild?.bounds?.top || 0;
+        const currentOffsetBottomX = currentTransform.firstChild ? currentTransform.firstChild.bounds.bottom : currentTransform.bounds.bottom;
+        const nextOffsetTopX = (currentTransform.next?.firstChild ? currentTransform.next?.firstChild.bounds?.top : currentTransform.next?.bounds?.top) || 0;
         const currentInputPointX = currentTransform.inputPoint.x;
         if (currentTransform?.next) {
           lines.push({
@@ -190,7 +190,7 @@ var BlockRegistry = {
             from: currentTransform.parent.inputPoint,
             to: {
               x: currentInputPointX,
-              y: (currentOffsetRightY + nextOffsetLeftY) / 2
+              y: (currentOffsetBottomX + nextOffsetTopX) / 2
             },
             side: LABEL_SIDE_TYPE.NORMAL_BRANCH
           });
@@ -232,8 +232,8 @@ var BlockRegistry = {
     const hasBranchDraggingAdder = currentTransform && currentTransform.entity.isInlineBlock && transition.renderData.draggable;
     if (hasBranchDraggingAdder) {
       if (isVertical) {
-        const currentOffsetRightX = currentTransform.firstChild?.bounds?.right || 0;
-        const nextOffsetLeftX = currentTransform.next?.firstChild?.bounds?.left || 0;
+        const currentOffsetRightX = currentTransform.firstChild ? currentTransform.firstChild.bounds.right : currentTransform.bounds.right;
+        const nextOffsetLeftX = (currentTransform.next?.firstChild ? currentTransform.next.firstChild.bounds?.left : currentTransform.next?.bounds?.left) || 0;
         const currentInputPointY = currentTransform.inputPoint.y;
         if (currentTransform?.next) {
           draggingLabel.push({
@@ -249,17 +249,17 @@ var BlockRegistry = {
           });
         }
       } else {
-        const currentOffsetRightY = currentTransform.firstChild?.bounds?.bottom || 0;
-        const nextOffsetLeftY = currentTransform.next?.firstChild?.bounds?.top || 0;
+        const currentOffsetBottomX = currentTransform.firstChild ? currentTransform.firstChild.bounds.bottom : currentTransform.bounds.bottom;
+        const nextOffsetTopX = (currentTransform.next?.firstChild ? currentTransform.next.firstChild.bounds?.top : currentTransform.next?.bounds?.top) || 0;
         const currentInputPointX = currentTransform.inputPoint.x;
         if (currentTransform?.next) {
           draggingLabel.push({
             offset: {
               x: currentInputPointX,
-              y: (currentOffsetRightY + nextOffsetLeftY) / 2
+              y: (currentOffsetBottomX + nextOffsetTopX) / 2
             },
             type: FlowTransitionLabelEnum2.BRANCH_DRAGGING_LABEL,
-            width: nextOffsetLeftY - currentOffsetRightY,
+            width: nextOffsetTopX - currentOffsetBottomX,
             props: {
               side: LABEL_SIDE_TYPE.NORMAL_BRANCH
             }
@@ -1526,7 +1526,8 @@ var BreakRegistry = {
 import {
   FlowNodeBaseType as FlowNodeBaseType19,
   FlowTransitionLineEnum as FlowTransitionLineEnum6,
-  LABEL_SIDE_TYPE as LABEL_SIDE_TYPE2
+  LABEL_SIDE_TYPE as LABEL_SIDE_TYPE2,
+  FlowTransitionLabelEnum as FlowTransitionLabelEnum13
 } from "@flowgram.ai/document";
 var InputRegistry = {
   type: FlowNodeBaseType19.INPUT,
@@ -1534,39 +1535,41 @@ var InputRegistry = {
   meta: {
     hidden: false
   },
-  getLines(transition) {
+  getLines(transition, layout) {
     const currentTransform = transition.transform;
     const { isVertical } = transition.entity;
     const lines = [];
     const hasBranchDraggingAdder = currentTransform && currentTransform.entity.isInlineBlock && transition.renderData.draggable;
     if (hasBranchDraggingAdder) {
       if (isVertical) {
-        const currentOffsetRightX = currentTransform.firstChild?.bounds?.right || 0;
-        const nextOffsetLeftX = currentTransform.next?.firstChild?.bounds?.left || 0;
-        const currentInputPointY = currentTransform.inputPoint.y;
+        const currentOffsetRightX = currentTransform.firstChild ? currentTransform.firstChild.bounds.right : currentTransform.bounds.right;
+        const nextOffsetLeftX = (currentTransform.next?.firstChild ? currentTransform.next?.firstChild.bounds?.left : currentTransform.next?.bounds?.left) || 0;
+        const currentInputPointY = currentTransform.outputPoint.y;
         if (currentTransform?.next) {
           lines.push({
-            type: FlowTransitionLineEnum6.DRAGGING_LINE,
-            from: currentTransform.parent.inputPoint,
-            to: {
+            type: FlowTransitionLineEnum6.MERGE_LINE,
+            isDraggingLine: true,
+            from: {
               x: (currentOffsetRightX + nextOffsetLeftX) / 2,
               y: currentInputPointY
             },
+            to: currentTransform.parent.outputPoint,
             side: LABEL_SIDE_TYPE2.NORMAL_BRANCH
           });
         }
       } else {
-        const currentOffsetRightY = currentTransform.firstChild?.bounds?.bottom || 0;
-        const nextOffsetLeftY = currentTransform.next?.firstChild?.bounds?.top || 0;
-        const currentInputPointX = currentTransform.inputPoint.x;
+        const currentOffsetBottomX = currentTransform.firstChild ? currentTransform.firstChild.bounds.bottom : currentTransform.bounds.bottom;
+        const nextOffsetTopX = (currentTransform.next?.firstChild ? currentTransform.next?.firstChild.bounds?.top : currentTransform.next?.bounds?.top) || 0;
+        const currentInputPointX = currentTransform.outputPoint.x;
         if (currentTransform?.next) {
           lines.push({
-            type: FlowTransitionLineEnum6.DRAGGING_LINE,
-            from: currentTransform.parent.inputPoint,
-            to: {
+            type: FlowTransitionLineEnum6.MERGE_LINE,
+            isDraggingLine: true,
+            from: {
               x: currentInputPointX,
-              y: (currentOffsetRightY + nextOffsetLeftY) / 2
+              y: (currentOffsetBottomX + nextOffsetTopX) / 2
             },
+            to: currentTransform.parent.outputPoint,
             side: LABEL_SIDE_TYPE2.NORMAL_BRANCH
           });
         }
@@ -1582,8 +1585,49 @@ var InputRegistry = {
     }
     return lines;
   },
-  getLabels() {
-    return [];
+  getLabels(transition) {
+    const currentTransform = transition.transform;
+    const { isVertical } = transition.entity;
+    const draggingLabel = [];
+    const hasBranchDraggingAdder = currentTransform && currentTransform.entity.isInlineBlock && transition.renderData.draggable;
+    if (hasBranchDraggingAdder) {
+      if (isVertical) {
+        const currentOffsetRightX = currentTransform.firstChild ? currentTransform.firstChild.bounds.right : currentTransform.bounds.right;
+        const nextOffsetLeftX = (currentTransform.next?.firstChild ? currentTransform.next.firstChild.bounds?.left : currentTransform.next?.bounds?.left) || 0;
+        const currentInputPointY = currentTransform.outputPoint.y;
+        if (currentTransform?.next) {
+          draggingLabel.push({
+            offset: {
+              x: (currentOffsetRightX + nextOffsetLeftX) / 2,
+              y: currentInputPointY
+            },
+            type: FlowTransitionLabelEnum13.BRANCH_DRAGGING_LABEL,
+            width: nextOffsetLeftX - currentOffsetRightX,
+            props: {
+              side: LABEL_SIDE_TYPE2.NORMAL_BRANCH
+            }
+          });
+        }
+      } else {
+        const currentOffsetBottomX = currentTransform.firstChild ? currentTransform.firstChild.bounds.bottom : currentTransform.bounds.bottom;
+        const nextOffsetTopX = (currentTransform.next?.firstChild ? currentTransform.next.firstChild.bounds?.top : currentTransform.next?.bounds?.top) || 0;
+        const currentInputPointX = currentTransform.outputPoint.x;
+        if (currentTransform?.next) {
+          draggingLabel.push({
+            offset: {
+              x: currentInputPointX,
+              y: (currentOffsetBottomX + nextOffsetTopX) / 2
+            },
+            type: FlowTransitionLabelEnum13.BRANCH_DRAGGING_LABEL,
+            width: nextOffsetTopX - currentOffsetBottomX,
+            props: {
+              side: LABEL_SIDE_TYPE2.NORMAL_BRANCH
+            }
+          });
+        }
+      }
+    }
+    return [...draggingLabel];
   }
 };
 
@@ -1599,20 +1643,62 @@ var OuputRegistry = {
 };
 
 // src/activities/multi-outputs.ts
-import { FlowNodeBaseType as FlowNodeBaseType21, FlowNodeSplitType as FlowNodeSplitType4 } from "@flowgram.ai/document";
+import {
+  FlowLayoutDefault as FlowLayoutDefault7,
+  FlowNodeSplitType as FlowNodeSplitType4,
+  FlowNodeBaseType as FlowNodeBaseType21
+} from "@flowgram.ai/document";
 var MultiOuputsRegistry = {
   type: FlowNodeBaseType21.MULTI_OUTPUTS,
   extend: FlowNodeSplitType4.SIMPLE_SPLIT,
+  meta: {
+    isNodeEnd: true
+  },
   getLines: (transition, layout) => {
     if (transition.entity.parent?.flowNodeType === FlowNodeBaseType21.INLINE_BLOCKS) {
       return BlockRegistry.getLines(transition, layout);
     }
     return [];
-  }
+  },
+  getLabels: (transition, layout) => [
+    ...DynamicSplitRegistry.getLabels(transition, layout),
+    ...BlockRegistry.getLabels(transition, layout)
+  ],
+  getOutputPoint(transform, layout) {
+    const isVertical = FlowLayoutDefault7.isVertical(layout);
+    const lastChildOutput = transform.lastChild?.outputPoint;
+    if (isVertical) {
+      return {
+        x: lastChildOutput ? lastChildOutput.x : transform.bounds.center.x,
+        y: transform.bounds.bottom
+      };
+    }
+    return {
+      x: transform.bounds.right,
+      y: lastChildOutput ? lastChildOutput.y : transform.bounds.center.y
+    };
+  },
+  extendChildRegistries: [
+    {
+      type: FlowNodeBaseType21.BLOCK_ICON,
+      meta: {
+        // isNodeEnd: true
+      }
+    }
+  ]
 };
 
 // src/activities/multi-inputs.ts
-import { FlowNodeBaseType as FlowNodeBaseType22, FlowNodeSplitType as FlowNodeSplitType5 } from "@flowgram.ai/document";
+import { Point as Point6 } from "@flowgram.ai/utils";
+import { FlowRendererKey as FlowRendererKey4 } from "@flowgram.ai/renderer";
+import {
+  FlowNodeBaseType as FlowNodeBaseType22,
+  FlowNodeRenderData as FlowNodeRenderData3,
+  FlowTransitionLabelEnum as FlowTransitionLabelEnum14,
+  FlowNodeSplitType as FlowNodeSplitType5,
+  getDefaultSpacing as getDefaultSpacing8,
+  ConstantKeys as ConstantKeys7
+} from "@flowgram.ai/document";
 var MultiInputsRegistry = {
   type: FlowNodeBaseType22.MULTI_INPUTS,
   extend: FlowNodeSplitType5.SIMPLE_SPLIT,
@@ -1620,7 +1706,8 @@ var MultiInputsRegistry = {
     {
       type: FlowNodeBaseType22.BLOCK_ICON,
       meta: {
-        hidden: true
+        hidden: true,
+        spacing: 0
       },
       getLines() {
         return [];
@@ -1631,8 +1718,52 @@ var MultiInputsRegistry = {
     },
     {
       type: FlowNodeBaseType22.INLINE_BLOCKS,
-      getLabels() {
-        return [];
+      meta: {
+        inlineSpacingPre: 0
+      },
+      getLabels(transition) {
+        const isVertical = transition.entity.isVertical;
+        const currentTransform = transition.transform;
+        const spacing = getDefaultSpacing8(
+          transition.entity,
+          ConstantKeys7.INLINE_BLOCKS_PADDING_BOTTOM
+        );
+        if (currentTransform.collapsed || transition.entity.childrenLength === 0) {
+          return [
+            {
+              type: FlowTransitionLabelEnum14.CUSTOM_LABEL,
+              renderKey: FlowRendererKey4.BRANCH_ADDER,
+              offset: Point6.move(
+                currentTransform.outputPoint,
+                isVertical ? { y: spacing } : { x: spacing }
+              ),
+              props: {
+                // 激活状态
+                activated: transition.entity.getData(FlowNodeRenderData3).activated,
+                transform: currentTransform,
+                // 传给外部使用的 node 信息
+                node: currentTransform.originParent?.entity
+              }
+            }
+          ];
+        }
+        return [
+          {
+            type: FlowTransitionLabelEnum14.CUSTOM_LABEL,
+            renderKey: FlowRendererKey4.BRANCH_ADDER,
+            offset: Point6.move(
+              currentTransform.outputPoint,
+              isVertical ? { y: -spacing / 2 } : { x: -spacing / 2 }
+            ),
+            props: {
+              // 激活状态
+              activated: transition.entity.getData(FlowNodeRenderData3).activated,
+              transform: currentTransform,
+              // 传给外部使用的 node 信息
+              node: currentTransform.originParent?.entity
+            }
+          }
+        ];
       }
     }
   ],
@@ -1683,7 +1814,7 @@ var FlowRegisters = class {
       OuputRegistry
     );
     document.registerNodeDatas(
-      FlowNodeRenderData3,
+      FlowNodeRenderData4,
       // 渲染节点相关数据
       FlowNodeTransitionData,
       // 线条绘制数据