@flowgram.ai/free-layout-core 0.2.17 → 0.2.18

package/dist/esm/index.js

@@ -694,6 +694,7 @@ var _WorkflowLineEntity = class _WorkflowLineEntity extends Entity2 {
     super(opts);
     this._processing = false;
     this._hasError = false;
+    this.stackIndex = 0;
     /**
      * 线条数据
      */
@@ -1134,7 +1135,7 @@ import {
   MouseTouchEvent,
   PlaygroundConfigEntity as PlaygroundConfigEntity5,
   PlaygroundDrag,
-  TransformData as TransformData9
+  TransformData as TransformData8
 } from "@flowgram.ai/core";
 
 // src/workflow-lines-manager.ts
@@ -1142,7 +1143,7 @@ import { last } from "lodash-es";
 import { inject as inject3, injectable as injectable3 } from "inversify";
 import { DisposableCollection, Emitter as Emitter3 } from "@flowgram.ai/utils";
 import { FlowNodeRenderData as FlowNodeRenderData2, FlowNodeTransformData as FlowNodeTransformData3 } from "@flowgram.ai/document";
-import { EntityManager as EntityManager2, PlaygroundConfigEntity as PlaygroundConfigEntity2, TransformData as TransformData6 } from "@flowgram.ai/core";
+import { EntityManager as EntityManager2, PlaygroundConfigEntity as PlaygroundConfigEntity2 } from "@flowgram.ai/core";
 
 // src/workflow-document-option.ts
 import { FlowNodeErrorData } from "@flowgram.ai/form-core";
@@ -1489,7 +1490,8 @@ var WorkflowLinesManager = class {
     const allPorts = this.entityManager.getEntities(WorkflowPortEntity).filter((port) => port.node.flowNodeType !== "root");
     const targetPort = allPorts.find((port) => port.isHovered(pos.x, pos.y));
     if (targetPort) {
-      const targetNode = this.document.getAllNodes().slice().reverse().filter((node) => targetPort.node?.parent?.id !== node.id).find((node) => node.getData(TransformData6).contains(pos.x, pos.y));
+      const containNodes = this.getContainNodesFromMousePos(pos);
+      const targetNode = last(containNodes);
       if (targetNode && targetNode !== targetPort.node) {
         return;
       }
@@ -1501,16 +1503,8 @@ var WorkflowLinesManager = class {
    * @param pos - 鼠标位置
    */
   getNodeFromMousePos(pos) {
-    const allNodes = this.document.getAllNodes().sort((a, b) => this.getNodeIndex(a) - this.getNodeIndex(b));
-    const containNodes = [];
     const { selection } = this.selectService;
-    const zoom = this.entityManager.getEntity(PlaygroundConfigEntity2)?.config?.zoom || 1;
-    allNodes.forEach((node) => {
-      const { bounds } = node.getData(FlowNodeTransformData3);
-      if (bounds.clone().pad(4 / zoom).contains(pos.x, pos.y)) {
-        containNodes.push(node);
-      }
-    });
+    const containNodes = this.getContainNodesFromMousePos(pos);
     if (selection?.length) {
       const filteredNodes = containNodes.filter(
         (node) => selection.some((_node) => node.id === _node.id)
@@ -1528,6 +1522,18 @@ var WorkflowLinesManager = class {
   registerData(line) {
     line.addData(WorkflowLineRenderData);
   }
+  /** 获取鼠标坐标位置的所有节点（stackIndex 从小到大排序） */
+  getContainNodesFromMousePos(pos) {
+    const allNodes = this.document.getAllNodes().sort((a, b) => this.getNodeIndex(a) - this.getNodeIndex(b));
+    const zoom = this.entityManager.getEntity(PlaygroundConfigEntity2)?.config?.zoom || 1;
+    const containNodes = allNodes.map((node) => {
+      const { bounds } = node.getData(FlowNodeTransformData3);
+      if (bounds.clone().pad(4 / zoom).contains(pos.x, pos.y)) {
+        return node;
+      }
+    }).filter(Boolean);
+    return containNodes;
+  }
   getNodeIndex(node) {
     const nodeRenderData = node.getData(FlowNodeRenderData2);
     return nodeRenderData.stackIndex;
@@ -1563,7 +1569,7 @@ import {
   injectPlaygroundContext,
   PlaygroundConfigEntity as PlaygroundConfigEntity4,
   PositionData,
-  TransformData as TransformData8
+  TransformData as TransformData7
 } from "@flowgram.ai/core";
 
 // src/layout/free-layout.ts
@@ -1577,7 +1583,7 @@ import {
   FlowDocumentProvider,
   FlowNodeTransformData as FlowNodeTransformData4
 } from "@flowgram.ai/document";
-import { PlaygroundConfigEntity as PlaygroundConfigEntity3, TransformData as TransformData7 } from "@flowgram.ai/core";
+import { PlaygroundConfigEntity as PlaygroundConfigEntity3, TransformData as TransformData6 } from "@flowgram.ai/core";
 var FREE_LAYOUT_KEY = "free-layout";
 var FreeLayout = class {
   constructor() {
@@ -1645,7 +1651,7 @@ var FreeLayout = class {
    */
   getInitScroll(contentSize) {
     const bounds = Rectangle7.enlarge(
-      this.document.getAllNodes().map((node) => node.getData(TransformData7).bounds)
+      this.document.getAllNodes().map((node) => node.getData(TransformData6).bounds)
     ).pad(30, 30);
     const viewport = this.playgroundConfig.getViewport(false);
     const zoom = SizeSchema2.fixSize(bounds, viewport);
@@ -1658,13 +1664,13 @@ var FreeLayout = class {
    * 获取默认输入点
    */
   getDefaultInputPoint(node) {
-    return node.getData(TransformData7).bounds.leftCenter;
+    return node.getData(TransformData6).bounds.leftCenter;
   }
   /**
    * 获取默认输出点
    */
   getDefaultOutputPoint(node) {
-    return node.getData(TransformData7).bounds.rightCenter;
+    return node.getData(TransformData6).bounds.rightCenter;
   }
   /**
    * 水平中心点
@@ -1818,7 +1824,7 @@ var WorkflowDocument = class extends FlowDocument {
     if (!position) {
       position = this.getNodeDefaultPosition(json.type);
     }
-    node.getData(TransformData8).update({
+    node.getData(TransformData7).update({
       position
     });
     if (formMeta && formData && !formData.formModel.initialized) {
@@ -1877,7 +1883,7 @@ var WorkflowDocument = class extends FlowDocument {
       );
     }
     if (subCanvas) {
-      const canvasTransform = subCanvas.canvasNode.getData(TransformData8);
+      const canvasTransform = subCanvas.canvasNode.getData(TransformData7);
       canvasTransform.update({
         position: subCanvas.parentNode.getNodeMeta()?.canvasPosition
       });
@@ -2346,7 +2352,7 @@ var WorkflowDragService = class {
     }
     let startPosition = this.getNodesPosition(selectedNodes);
     let startPositions = selectedNodes.map((node) => {
-      const transform = node.getData(TransformData9);
+      const transform = node.getData(TransformData8);
       return { x: transform.position.x, y: transform.position.y };
     });
     let dragSuccess = false;
@@ -2373,7 +2379,7 @@ var WorkflowDragService = class {
         });
         const positions = [];
         selectedNodes.forEach((node, index) => {
-          const transform = node.getData(TransformData9);
+          const transform = node.getData(TransformData8);
           const nodeStartPosition = startPositions[index];
           const newPosition = {
             x: nodeStartPosition.x + offset.x,
@@ -2507,7 +2513,7 @@ var WorkflowDragService = class {
   /**
    * 如果存在容器节点，且传入鼠标坐标，需要用容器的坐标减去传入的鼠标坐标
    */
-  adjustSubNodePosition(subNodeType, containerNode, mousePos, resetEmptyPos = true) {
+  adjustSubNodePosition(subNodeType, containerNode, mousePos) {
     if (!mousePos) {
       return { x: 0, y: 0 };
     }
@@ -2516,16 +2522,16 @@ var WorkflowDragService = class {
     }
     const isParentEmpty = !containerNode.children || containerNode.children.length === 0;
     const parentPadding = this.document.layout.getPadding(containerNode);
-    const parentTransform = containerNode.getData(TransformData9);
-    if (isParentEmpty && resetEmptyPos) {
+    const containerWorldTransform = containerNode.transform.transform.worldTransform;
+    if (isParentEmpty) {
       return {
         x: 0,
         y: parentPadding.top
       };
     } else {
       return {
-        x: mousePos.x - parentTransform.position.x,
-        y: mousePos.y - parentTransform.position.y
+        x: mousePos.x - containerWorldTransform.tx,
+        y: mousePos.y - containerWorldTransform.ty
       };
     }
   }
@@ -2898,11 +2904,11 @@ import { DisposableCollection as DisposableCollection3, Emitter as Emitter6 } fr
 
 // src/utils/layout-to-positions.ts
 import { FlowNodeTransformData as FlowNodeTransformData7 } from "@flowgram.ai/document";
-import { TransformData as TransformData10, startTween } from "@flowgram.ai/core";
+import { TransformData as TransformData9, startTween } from "@flowgram.ai/core";
 var layoutToPositions = async (nodes, nodePositionMap) => {
   const newNodePositionMap = {};
   nodes.forEach((node) => {
-    const transform = node.getData(TransformData10);
+    const transform = node.getData(TransformData9);
     const nodeTransform = node.getData(FlowNodeTransformData7);
     newNodePositionMap[node.id] = {
       x: transform.position.x,
@@ -2916,7 +2922,7 @@ var layoutToPositions = async (nodes, nodePositionMap) => {
       duration: 300,
       onUpdate: (v) => {
         nodes.forEach((node) => {
-          const transform = node.getData(TransformData10);
+          const transform = node.getData(TransformData9);
           const deltaX = (nodePositionMap[node.id].x - transform.position.x) * v.d / 100;
           const deltaY = (nodePositionMap[node.id].y - transform.bounds.height / 2 - transform.position.y) * v.d / 100;
           transform.update({
@@ -3000,7 +3006,7 @@ WorkflowResetLayoutService = __decorateClass([
 import { inject as inject8 } from "inversify";
 import { Emitter as Emitter7 } from "@flowgram.ai/utils";
 import { FlowOperationBaseServiceImpl } from "@flowgram.ai/document";
-import { TransformData as TransformData11 } from "@flowgram.ai/core";
+import { TransformData as TransformData10 } from "@flowgram.ai/core";
 var WorkflowOperationBaseServiceImpl = class extends FlowOperationBaseServiceImpl {
   constructor() {
     super(...arguments);
@@ -3012,7 +3018,7 @@ var WorkflowOperationBaseServiceImpl = class extends FlowOperationBaseServiceImp
     if (!node) {
       return;
     }
-    const transformData = node.getData(TransformData11);
+    const transformData = node.getData(TransformData10);
     const oldPosition = {
       x: transformData.position.x,
       y: transformData.position.y