Support passing in node size for nodes in a global graph. Stop trying…

… to figure out which node in the entry node for sizing.
Netflix · Nov 28, 2016 · 5a115a2 · 5a115a2
1 parent fc9ebf3
commit 5a115a2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/global/globalNode.js b/src/global/globalNode.js
@@ -21,7 +21,7 @@ import NodeViewDetailed from '../base/nodeViewDetailed';
 class GlobalNode extends Node {
   constructor (node) {
     super(node, 'global');
-    this.size = 120;
+    this.size = node.size || 120;
     this.refreshLoaded();
   }
 

diff --git a/src/layouts/ringCenterLayout.js b/src/layouts/ringCenterLayout.js
@@ -17,17 +17,16 @@
  */
 import _ from 'lodash';
 
-function updatePosition (node, nodeCount, nodeIndex, orbitSize, nodeSize) {
+function updatePosition (node, nodeCount, nodeIndex, orbitSize) {
   const rotationAdjustment = nodeCount % 2 === 0 ? Math.PI / 4 : (5 / 6) * Math.PI;
-  node.size = nodeSize;
   const adjustment = (((2 * Math.PI) * nodeIndex) / nodeCount) + rotationAdjustment;
   node.updatePosition({
     x: ((orbitSize / 2) * Math.cos(adjustment)),
     y: ((orbitSize / 2) * Math.sin(adjustment))
   });
 }
 
-function positionNodes (nodes, orbitSize, nodeSize) {
+function positionNodes (nodes, orbitSize) {
   let nodeIndex = 0;
   const nodeCount = Object.keys(nodes).length - 1;
 
@@ -40,9 +39,8 @@ function positionNodes (nodes, orbitSize, nodeSize) {
     const node = nodeMap[nodeName];
     if (!node.isEntryNode()) {
       nodeIndex++;
-      updatePosition(node, nodeCount, nodeIndex, orbitSize, nodeSize);
+      updatePosition(node, nodeCount, nodeIndex, orbitSize);
     } else {
-      node.size = nodeSize * 1.25;
       node.updatePosition({ x: 0, y: 0 });
     }
   });
@@ -74,11 +72,11 @@ class RingCenterLayout {
 
     if (Object.keys(graph.nodes).length > 0) {
       // Position the nodes based on the current orbitSize
-      positionNodes(graph.nodes, orbitSize, nodeSize);
+      positionNodes(graph.nodes, orbitSize);
       // Now that the nodes are positioned, adjust orbit size accordingly so the nodes all fit
       orbitSize = recalculateOrbitSize(graph.nodes, maxDimension, nodeSize);
       // Position again with the proper orbitSize
-      positionNodes(graph.nodes, orbitSize, nodeSize);
+      positionNodes(graph.nodes, orbitSize);
       centerNodesVertically(graph.nodes);
     }