@logicflow/core 2.0.9 → 2.0.10

package/src/view/node/BaseNode.tsx

@@ -80,6 +80,13 @@ export abstract class BaseNode<P extends IProps = IProps> extends Component<
     if (this.modelDisposer) {
       this.modelDisposer()
     }
+
+    // 以下是 mobx-preact 中 componentWillUnmount 的回调逻辑，但是不知道出于什么考虑，mobx-preact 没有混入这一段逻辑
+    // @ts-ignore
+    if (this.render.$mobx) {
+      // @ts-ignore
+      this.render.$mobx.dispose()
+    }
   }
 
   componentDidMount() {}
@@ -234,7 +241,7 @@ export abstract class BaseNode<P extends IProps = IProps> extends Component<
   onDragging = ({ event }: IDragParams) => {
     const { model, graphModel } = this.props
     const {
-      editConfigModel: { stopMoveGraph, autoExpand },
+      editConfigModel: { stopMoveGraph, autoExpand, snapGrid },
       transformModel,
       selectNodes,
       width,
@@ -254,9 +261,9 @@ export abstract class BaseNode<P extends IProps = IProps> extends Component<
     // 2. 考虑鼠标位置不再节点中心
     x = x + (this.moveOffset?.dx ?? 0)
     y = y + (this.moveOffset?.dy ?? 0)
-    // 将x, y移动到grid上
-    x = snapToGrid(x, gridSize)
-    y = snapToGrid(y, gridSize)
+    // 校准坐标
+    x = snapToGrid(x, gridSize, snapGrid)
+    y = snapToGrid(y, gridSize, snapGrid)
     if (!width || !height) {
       graphModel.moveNode2Coordinate(model.id, x, y)
       return
@@ -371,7 +378,10 @@ export abstract class BaseNode<P extends IProps = IProps> extends Component<
     } else {
       graphModel.selectNodeById(model.id, isMultiple)
       eventOptions.isSelected = true
-      this.toFront()
+      // 静默模式下点击节点不变更节点层级
+      if (!editConfigModel.isSilentMode) {
+        this.toFront()
+      }
     }
 
     // 不是双击的，默认都是单击
@@ -392,6 +402,7 @@ export abstract class BaseNode<P extends IProps = IProps> extends Component<
   handleContextMenu = (ev: MouseEvent) => {
     ev.preventDefault()
     const { model, graphModel } = this.props
+    const { editConfigModel } = graphModel
     // 节点数据，多为事件对象数据抛出
     const nodeData = model.getData()
 
@@ -412,7 +423,10 @@ export abstract class BaseNode<P extends IProps = IProps> extends Component<
       e: ev,
       position,
     })
-    this.toFront()
+    // 静默模式下点击节点不变更节点层级
+    if (!editConfigModel.isSilentMode) {
+      this.toFront()
+    }
   }
 
   handleMouseDown = (ev: MouseEvent) => {

package/src/view/node/HtmlNode.tsx

@@ -70,6 +70,7 @@ export class HtmlNode<
   }
 
   componentWillUnmount() {
+    super.componentWillUnmount()
     this.rootEl.innerHTML = ''
   }
 

package/src/view/overlay/CanvasOverlay.tsx

@@ -65,8 +65,9 @@ export class CanvasOverlay extends Component<IProps, IState> {
       graphModel,
     } = this.props
     const { deltaX: eX, deltaY: eY } = ev
+    const { stopScrollGraph, stopZoomGraph } = editConfigModel
     // 如果没有禁止滚动移动画布, 并且当前触发的时候ctrl键、cmd键没有按住, 那么移动画布
-    if (!editConfigModel.stopScrollGraph && !ev.ctrlKey && !ev.metaKey) {
+    if (!stopScrollGraph && !ev.ctrlKey && !ev.metaKey) {
       ev.preventDefault()
       this.stepScrollX += eX
       this.stepScrollY += eY
@@ -85,7 +86,7 @@ export class CanvasOverlay extends Component<IProps, IState> {
       return
     }
     // 如果没有禁止缩放画布，那么进行缩放. 在禁止缩放画布后，按住 ctrl、cmd 键也不能缩放了。
-    if (!editConfigModel.stopZoomGraph) {
+    if (!stopZoomGraph) {
       ev.preventDefault()
       const position = graphModel.getPointByClient({
         x: ev.clientX,
@@ -133,11 +134,11 @@ export class CanvasOverlay extends Component<IProps, IState> {
         gridSize,
       },
     } = this.props
+    const { adjustEdge, adjustNodePosition, stopMoveGraph } = editConfigModel
     const target = ev.target as HTMLElement
-    const isFrozenElement =
-      !editConfigModel.adjustEdge && !editConfigModel.adjustNodePosition
+    const isFrozenElement = !adjustEdge && !adjustNodePosition
     if (target.getAttribute('name') === 'canvas-overlay' || isFrozenElement) {
-      if (editConfigModel.stopMoveGraph !== true) {
+      if (stopMoveGraph !== true) {
         this.stepDrag.setStep(gridSize * SCALE_X)
         this.stepDrag.handleMouseDown(ev)
       } else {

package/src/view/text/BaseText.tsx

@@ -80,6 +80,7 @@ export class BaseText<
     } = graphModel
 
     if (draggable ?? nodeTextDraggable) {
+      e.stopPropagation()
       this.stepperDrag.model = model
       this.stepperDrag.handleMouseDown(e)
     }