refactor(edges): only redraw moved edges

xyflow · Jul 31, 2019 · 6e71591 · 6e71591
1 parent ec7231e
commit 6e71591
Show file tree

Hide file tree

Showing 9 changed files with 436 additions and 403 deletions.
diff --git a/dist/ReactGraph.js b/dist/ReactGraph.js
diff --git a/example/build/example.e31bb0bc.js b/example/build/example.e31bb0bc.js
diff --git a/example/build/example.e31bb0bc.js.map b/example/build/example.e31bb0bc.js.map
diff --git a/src/EdgeRenderer/EdgeTypes/wrapEdge.js b/src/EdgeRenderer/EdgeTypes/wrapEdge.js
@@ -1,16 +1,17 @@
-import React, { useContext, memo } from 'react';
+import React, {  memo } from 'react';
 import cx from 'classnames';
 
-import { GraphContext } from '../../GraphContext';
 import { setSelectedElements } from '../../state/actions';
 import { isEdge } from '../../graph-utils';
 
 const isInput = e => ['INPUT', 'SELECT', 'TEXTAREA'].includes(e.target.nodeName);
 
 export default EdgeComponent => memo((props) => {
-  const { state, dispatch } = useContext(GraphContext);
-  const { source, target, animated, type, onClick } = props;
-  const selected = state.selectedElements
+  const {
+    source, target, animated, type,
+    dispatch, selectedElements, onClick
+  } = props;
+  const selected = selectedElements
     .filter(e => isEdge(e))
     .find(e => e.source === source && e.target === target);
   const edgeClasses = cx('react-graph__edge', { selected, animated: animated });

diff --git a/src/EdgeRenderer/index.js b/src/EdgeRenderer/index.js
@@ -1,73 +1,78 @@
-import React, { PureComponent } from 'react';
+import React, { memo, useContext } from 'react';
 
-import { Consumer } from '../GraphContext';
+import { GraphContext } from '../GraphContext';
 import ConnectionLine from '../ConnectionLine';
 
-class EdgeRenderer extends PureComponent {
-  renderEdge(e, nodes, onElementClick) {
-    const edgeType = e.type || 'default';
-    const sourceNode = nodes.find(n => n.id === e.source);
-    const targetNode = nodes.find(n => n.id === e.target);
+function renderEdge(e, props, graphContext) {
+  const edgeType = e.type || 'default';
+  const sourceNode = graphContext.state.nodes.find(n => n.id === e.source);
+  const targetNode = graphContext.state.nodes.find(n => n.id === e.target);
 
-    if (!sourceNode) {
-      throw new Error(`couldn't create edge for source id: ${e.source}`);
-    }
+  if (!sourceNode) {
+    throw new Error(`couldn't create edge for source id: ${e.source}`);
+  }
 
-    if (!targetNode) {
-      throw new Error(`couldn't create edge for target id: ${e.target}`);
-    }
+  if (!targetNode) {
+    throw new Error(`couldn't create edge for target id: ${e.target}`);
+  }
 
-    const EdgeComponent = this.props.edgeTypes[edgeType] || this.props.edgeTypes.default;
+  const EdgeComponent = props.edgeTypes[edgeType] || props.edgeTypes.default;
 
-    return (
-      <EdgeComponent
-        key={`${e.source}-${e.target}`}
-        sourceNode={sourceNode}
-        targetNode={targetNode}
-        onClick={onElementClick}
-        {...e}
-      />
-    );
-  }
+  return (
+    <EdgeComponent
+      key={`${e.source}-${e.target}`}
+      type={e.type}
+      sourceNode={sourceNode}
+      targetNode={targetNode}
+      onClick={props.onElementClick}
+      selectedElements={graphContext.state.selectedElements}
+      dispatch={graphContext.dispatch}
+      animated={e.animated}
+      style={e.style}
+      source={e.source}
+      target={e.target}
+      sourceNodeX={sourceNode.__rg.position.x}
+      sourceNodeY={sourceNode.__rg.position.y}
+      targetNodeX={targetNode.__rg.position.x}
+      targeteNodeY={targetNode.__rg.position.y}
+    />
+  );
+}
 
-  render() {
-    const {
-      width, height, onElementClick,
-      connectionLineStyle, connectionLineType
-    } = this.props;
+const EdgeRenderer = memo((props) => {
+  const graphContext = useContext(GraphContext);
+  const {
+    width, height, connectionLineStyle, connectionLineType
+  } = props;
 
-    if (!width) {
-      return null;
-    }
+  if (!width) {
+    return null;
+  }
+
+  const { transform, edges, nodes, connectionSourceId, connectionPosition } = graphContext.state;
+  const transformStyle = `translate(${transform[0]},${transform[1]}) scale(${transform[2]})`;
 
-    return (
-      <Consumer>
-        {({ state }) => (
-          <svg
-            width={width}
-            height={height}
-            className="react-graph__edges"
-          >
-            <g
-              transform={`translate(${state.transform[0]},${state.transform[1]}) scale(${state.transform[2]})`}
-            >
-              {state.edges.map(e => this.renderEdge(e, state.nodes, onElementClick))}
-              {state.connectionSourceId && (
-                <ConnectionLine
-                  nodes={state.nodes}
-                  connectionSourceId={state.connectionSourceId}
-                  connectionPosition={state.connectionPosition}
-                  transform={state.transform}
-                  connectionLineStyle={connectionLineStyle}
-                  connectionLineType={connectionLineType}
-                />
-              )}
-            </g>
-          </svg>
+  return (
+    <svg
+      width={width}
+      height={height}
+      className="react-graph__edges"
+    >
+      <g transform={transformStyle}>
+        {edges.map(e => renderEdge(e, props, graphContext))}
+        {connectionSourceId && (
+          <ConnectionLine
+            nodes={nodes}
+            connectionSourceId={connectionSourceId}
+            connectionPosition={connectionPosition}
+            transform={transform}
+            connectionLineStyle={connectionLineStyle}
+            connectionLineType={connectionLineType}
+          />
         )}
-      </Consumer>
-    );
-  }
-}
+      </g>
+    </svg>
+  );
+});
 
 export default EdgeRenderer;
diff --git a/src/NodeRenderer/HandleTypes/BaseHandle.js b/src/NodeRenderer/HandleTypes/BaseHandle.js
@@ -1,8 +1,6 @@
-import React, { memo, useContext } from 'react';
+import React, { memo } from 'react';
 import cx from 'classnames';
 
-import NodeIdContext from '../NodeIdContext'
-import { GraphContext } from '../../GraphContext';
 import { setConnecting, setConnectionPos } from '../../state/actions';
 
 function onMouseDown(evt, { nodeId, dispatch, onConnect, isTarget }) {
@@ -37,9 +35,7 @@ function onMouseDown(evt, { nodeId, dispatch, onConnect, isTarget }) {
   document.addEventListener('mouseup', onMouseUp)
 }
 
-export default memo(({ source, target, className = null, ...rest }) => {
-  const nodeId = useContext(NodeIdContext);
-  const { dispatch, onConnect } = useContext(GraphContext);
+export default memo(({ source, target, nodeId, onConnect, dispatch, className = null, ...rest }) => {
   const handleClasses = cx(
     'react-graph__handle',
     className,

diff --git a/src/NodeRenderer/HandleTypes/SourceHandle.js b/src/NodeRenderer/HandleTypes/SourceHandle.js
@@ -1,5 +1,20 @@
-import React from 'react';
+import React, { memo, useContext } from 'react';
 
 import BaseHandle from './BaseHandle';
+import NodeIdContext from '../NodeIdContext'
+import { GraphContext } from '../../GraphContext';
 
-export default props => <BaseHandle source {...props} />;
+export default memo((props) => {
+  const nodeId = useContext(NodeIdContext);
+  const { dispatch, onConnect } = useContext(GraphContext);
+
+  return (
+    <BaseHandle
+      source
+      nodeId={nodeId}
+      dispatch={dispatch}
+      onConnect={onConnect}
+      {...props}
+    />
+  );
+});
diff --git a/src/NodeRenderer/HandleTypes/TargetHandle.js b/src/NodeRenderer/HandleTypes/TargetHandle.js
@@ -1,6 +1,21 @@
-import React from 'react';
+import React, { memo, useContext } from 'react';
 
 import BaseHandle from './BaseHandle';
+import { GraphContext } from '../../GraphContext';
+import NodeIdContext from '../NodeIdContext'
 
-export default props => <BaseHandle target {...props} />;
+export default memo((props) => {
+  const nodeId = useContext(NodeIdContext);
+  const { dispatch, onConnect } = useContext(GraphContext);
+
+  return (
+    <BaseHandle
+      target
+      nodeId={nodeId}
+      dispatch={dispatch}
+      onConnect={onConnect}
+      {...props}
+    />
+  );
+});
 
diff --git a/src/NodeRenderer/index.js b/src/NodeRenderer/index.js
@@ -32,13 +32,12 @@ function renderNode(d, props, graphContext) {
 const NodeRenderer = memo((props) => {
   const graphContext = useContext(GraphContext);
   const { transform, nodes } = graphContext.state;
+  const transformStyle = { transform : `translate(${transform[0]}px,${transform[1]}px) scale(${transform[2]})` };
 
   return (
     <div
       className="react-graph__nodes"
-      style={{
-        transform: `translate(${transform[0]}px,${transform[1]}px) scale(${transform[2]})`
-      }}
+      style={transformStyle}
     >
       {nodes.map(d => renderNode(d, props, graphContext))}
     </div>