Fix #69

Instead of keeping parent info of all children at initialization, we keep info of only removed ones. This fixes the error on the newly added nodes.
iVis-at-Bilkent · Jul 26, 2019 · 5385d84 · 5385d84
1 parent cdde6f6
commit 5385d84
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 17 deletions.
diff --git a/cytoscape-expand-collapse.js b/cytoscape-expand-collapse.js
diff --git a/src/expandCollapseUtilities.js b/src/expandCollapseUtilities.js
@@ -26,7 +26,13 @@ return {
     node.removeClass('cy-expand-collapse-collapsed-node');
 
     node.trigger("expandcollapse.beforeexpand");
-    node._private.data.collapsedChildren.restore();
+    var restoredNodes = node._private.data.collapsedChildren;
+    restoredNodes.restore();
+    var parentData = cy.scratch('_cyExpandCollapse').parentData;
+    for(var i = 0; i < restoredNodes.length; i++){
+      delete parentData[restoredNodes[i].id()];
+    }
+    cy.scratch('_cyExpandCollapse').parentData = parentData;
     this.repairEdges(node);
     node._private.data.collapsedChildren = null;
 
@@ -554,6 +560,9 @@ return {
     for (var i = 0; i < children.length; i++) {
       var child = children[i];
       this.removeChildren(child, root);
+      var parentData = cy.scratch('_cyExpandCollapse').parentData;
+      parentData[child.id()] = child.parent();
+      cy.scratch('_cyExpandCollapse').parentData = parentData;
       var removedChild = child.remove();
       if (root._private.data.collapsedChildren == null) {
         root._private.data.collapsedChildren = removedChild;

diff --git a/src/index.js b/src/index.js
@@ -181,8 +181,13 @@
       };
 
       api.getParent = function(nodeId) {
-        var parentData = getScratch(cy, 'parentData');
-        return parentData[nodeId];
+        if(cy.getElementById(nodeId)[0] === undefined){
+          var parentData = getScratch(cy, 'parentData');
+          return parentData[nodeId];
+        }
+        else{
+          return cy.getElementById(nodeId).parent();
+        }
       };
 
       // This method works problematic TODO fix related bugs and expose it
@@ -252,11 +257,6 @@
         setScratch(cy, 'options', options);
 
         var parentData = {};
-        var children = cy.nodes(':child');
-        for(var i = 0; i < children.length; i++){
-          var node = children[i];
-          parentData[node.id()] = node.parent();
-        }
         setScratch(cy, 'parentData', parentData); 
       }