Respect 'nodeIcons' props for overriding node icons

updateIcon() function is deprecated
bubdm · Jun 26, 2017 · 7a2ed4f · 7a2ed4f
1 parent daada31
commit 7a2ed4f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/examples/demo-full.html b/examples/demo-full.html
@@ -88,6 +88,7 @@
       var appState = {
         graph: new fbpGraph.Graph(),
         library: {},
+        iconOverrides: {},
         theme: 'dark'
       };
 
@@ -125,6 +126,7 @@
           height: window.innerWidth,
           graph: appState.graph,
           library: appState.library,
+          nodeIcons: appState.iconOverrides,
           onPanScale: renderNav,
         }
 
@@ -166,13 +168,12 @@
       // Simulate node icon updates
       var iconKeys = Object.keys(TheGraph.FONT_AWESOME);
       window.setInterval(function () {
-        if (!editor.graph) { return; }
-
         var nodes = appState.graph.nodes;
         if (nodes.length>0) {
           var randomNodeId = nodes[Math.floor(Math.random()*nodes.length)].id;
           var randomIcon = iconKeys[Math.floor(Math.random()*iconKeys.length)];
-          editor.updateIcon(randomNodeId, randomIcon);
+          appState.iconOverrides[randomNodeId] = randomIcon;
+          renderApp();
         }
       }, 1000);
 

diff --git a/the-graph/the-graph-app.js b/the-graph/the-graph-app.js
@@ -138,6 +138,7 @@ module.exports.register = function (context) {
       width: null,
       height: null,
       readonly: false,
+      nodeIcons: {},
       minZoom: 0.15,
       maxZoom: 15.0,
       offsetX: 0.0,
@@ -606,6 +607,7 @@ module.exports.register = function (context) {
         scale: this.state.scale,
         app: this,
         library: this.props.library,
+        nodeIcons: this.props.nodeIcons,
         onNodeSelection: this.props.onNodeSelection,
         onEdgeSelection: this.props.onEdgeSelection,
         showContext: this.showContext,

diff --git a/the-graph/the-graph-graph.js b/the-graph/the-graph-graph.js
@@ -89,6 +89,7 @@ module.exports.register = function (context) {
             app: null,
             offsetX: 0,
             offsetY: 0,
+            nodeIcons: {}, // allows overriding icon of a node
         };
     },
     getInitialState: function() {
@@ -112,6 +113,7 @@ module.exports.register = function (context) {
     },
     componentWillReceiveProps: function(nextProps) {
       this.subscribeGraph(this.props.graph, nextProps.graph);
+      this.markDirty();
     },
     subscribeGraph: function(previous, next) {
       if (previous) {
@@ -394,9 +396,9 @@ module.exports.register = function (context) {
       });
       this.markDirty();
     },
-    updatedIcons: {},
     updateIcon: function (nodeId, icon) {
-      this.updatedIcons[nodeId] = icon;
+      // FIXME: deprecated function, to be removed
+      this.props.nodeIcons[nodeId] = icon;
       this.markDirty();
     },
     dirty: false,
@@ -477,8 +479,8 @@ module.exports.register = function (context) {
         }
         var icon = "cog";
         var iconsvg = "";
-        if (self.updatedIcons[key]) {
-          icon = self.updatedIcons[key];
+        if (self.props.nodeIcons[key]) {
+          icon = self.props.nodeIcons[key];
         } else if (componentInfo && componentInfo.icon) {
           icon = componentInfo.icon;
         } else if (componentInfo && componentInfo.iconsvg) {