feat(nodes): calculate postions based on current transform

xyflow · Aug 19, 2019 · 466e05b · 466e05b
1 parent 59cd72d
commit 466e05b
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 17 deletions.
diff --git a/dist/ReactGraph.js b/dist/ReactGraph.js
@@ -29834,7 +29834,18 @@
     return "react-graph__edge-".concat(e.source, "-").concat(e.target);
   };
 
-  var parseElement = function parseElement(e) {
+  var pointToRendererPoint = function pointToRendererPoint(_ref, transform) {
+    var x = _ref.x,
+        y = _ref.y;
+    var rendererX = x * (1 / [transform[2]]) - transform[0];
+    var rendererY = y * (1 / [transform[2]]) - transform[1];
+    return {
+      x: rendererX,
+      y: rendererY
+    };
+  };
+
+  var parseElement = function parseElement(e, transform) {
     if (isEdge(e)) {
       return _objectSpread2({}, e, {
         type: e.type || 'default',
@@ -29846,7 +29857,7 @@
       id: e.id.toString(),
       type: e.type || 'default',
       __rg: {
-        position: e.position,
+        position: pointToRendererPoint(e.position, transform),
         width: null,
         height: null,
         handleBounds: {}
@@ -30161,7 +30172,7 @@
 
     React.useEffect(function () {
       var nodes = elements.filter(isNode);
-      var edges = elements.filter(isEdge).map(parseElement);
+      var edges = elements.filter(isEdge).map(parseElement, state.transform);
       var nextNodes = nodes.map(function (propNode) {
         var existingNode = state.nodes.find(function (n) {
           return n.id === propNode.id;
@@ -30174,7 +30185,7 @@
           });
         }
 
-        return parseElement(propNode);
+        return parseElement(propNode, state.transform);
       });
       var nodesChanged = !lodash_isequal(state.nodes, nextNodes);
       var edgesChanged = !lodash_isequal(state.edges, edges);

diff --git a/example/SimpleGraph.js b/example/SimpleGraph.js
@@ -112,7 +112,7 @@ class App extends PureComponent {
     this.setState(prevState => ({
       ...prevState,
       elements: prevState.elements.concat({
-        id: prevState.elements.length + 1,
+        id: (prevState.elements.length + 1).toString(),
         data: { label: 'Added node' },
         position: { x: Math.random() * window.innerWidth, y: Math.random() * window.innerHeight }
       })

diff --git a/example/build/example.e31bb0bc.js b/example/build/example.e31bb0bc.js
@@ -37638,7 +37638,18 @@ var getEdgeId = function getEdgeId(e) {
   return "react-graph__edge-".concat(e.source, "-").concat(e.target);
 };
 
-var parseElement = function parseElement(e) {
+var pointToRendererPoint = function pointToRendererPoint(_ref, transform) {
+  var x = _ref.x,
+      y = _ref.y;
+  var rendererX = x * (1 / [transform[2]]) - transform[0];
+  var rendererY = y * (1 / [transform[2]]) - transform[1];
+  return {
+    x: rendererX,
+    y: rendererY
+  };
+};
+
+var parseElement = function parseElement(e, transform) {
   if (isEdge(e)) {
     return _objectSpread({}, e, {
       type: e.type || 'default',
@@ -37650,7 +37661,7 @@ var parseElement = function parseElement(e) {
     id: e.id.toString(),
     type: e.type || 'default',
     __rg: {
-      position: e.position,
+      position: pointToRendererPoint(e.position, transform),
       width: null,
       height: null,
       handleBounds: {}
@@ -38141,7 +38152,7 @@ var Provider = function Provider(props) {
 
   (0, _react.useEffect)(function () {
     var nodes = elements.filter(_graphUtils.isNode);
-    var edges = elements.filter(_graphUtils.isEdge).map(_graphUtils.parseElement);
+    var edges = elements.filter(_graphUtils.isEdge).map(_graphUtils.parseElement, state.transform);
     var nextNodes = nodes.map(function (propNode) {
       var existingNode = state.nodes.find(function (n) {
         return n.id === propNode.id;
@@ -38154,7 +38165,7 @@ var Provider = function Provider(props) {
         });
       }
 
-      return (0, _graphUtils.parseElement)(propNode);
+      return (0, _graphUtils.parseElement)(propNode, state.transform);
     });
     var nodesChanged = !(0, _lodash.default)(state.nodes, nextNodes);
     var edgesChanged = !(0, _lodash.default)(state.edges, edges);
@@ -42750,7 +42761,7 @@ function (_PureComponent) {
       this.setState(function (prevState) {
         return _objectSpread({}, prevState, {
           elements: prevState.elements.concat({
-            id: prevState.elements.length + 1,
+            id: (prevState.elements.length + 1).toString(),
             data: {
               label: 'Added node'
             },
@@ -42918,7 +42929,7 @@ var parent = module.bundle.parent;
 if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') {
   var hostname = "" || location.hostname;
   var protocol = location.protocol === 'https:' ? 'wss' : 'ws';
-  var ws = new WebSocket(protocol + '://' + hostname + ':' + "52012" + '/');
+  var ws = new WebSocket(protocol + '://' + hostname + ':' + "61901" + '/');
 
   ws.onmessage = function (event) {
     checkedAssets = {};

diff --git a/example/build/example.e31bb0bc.js.map b/example/build/example.e31bb0bc.js.map
diff --git a/example/build/index.js b/example/build/index.js
diff --git a/src/GraphContext/index.js b/src/GraphContext/index.js
@@ -18,7 +18,7 @@ export const Provider = (props) => {
 
   useEffect(() => {
     const nodes = elements.filter(isNode);
-    const edges = elements.filter(isEdge).map(parseElement);
+    const edges = elements.filter(isEdge).map(parseElement, state.transform);
 
     const nextNodes = nodes.map(propNode => {
       const existingNode = state.nodes.find(n => n.id === propNode.id);
@@ -33,7 +33,7 @@ export const Provider = (props) => {
         };
       }
 
-      return parseElement(propNode);
+      return parseElement(propNode, state.transform);
     });
 
     const nodesChanged = !isEqual(state.nodes, nextNodes);

diff --git a/src/graph-utils.js b/src/graph-utils.js
@@ -25,7 +25,17 @@ export const removeElements = (elements, elementsToRemove) => {
 
 const getEdgeId = (e) => `react-graph__edge-${e.source}-${e.target}`;
 
-export const parseElement = (e) => {
+const pointToRendererPoint = ({ x, y }, transform) => {
+  const rendererX = x * (1 / [transform[2]]) - transform[0];
+  const rendererY = y * (1 / [transform[2]]) - transform[1];
+
+  return {
+    x: rendererX,
+    y: rendererY
+  };
+}
+
+export const parseElement = (e, transform) => {
   if (isEdge(e)) {
     return {
       ...e,
@@ -39,7 +49,7 @@ export const parseElement = (e) => {
     id: e.id.toString(),
     type: e.type || 'default',
     __rg: {
-      position: e.position,
+      position: pointToRendererPoint(e.position, transform),
       width: null,
       height: null,
       handleBounds : {}