cy.json({...}) fails to add edges involving new nodes #2210

cytoscape · Nov 2, 2018 · 5efe5d1 · 5efe5d1
1 parent b7a889b
commit 5efe5d1
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/src/core/index.js b/src/core/index.js
@@ -297,6 +297,8 @@ util.extend( corefn, {
         let idInJson = {};
 
         let updateEles = function( jsons, gr ){
+          let toAdd = [];
+
           for( let i = 0; i < jsons.length; i++ ){
             let json = jsons[ i ];
             let id = json.data.id;
@@ -308,12 +310,14 @@ util.extend( corefn, {
               ele.json( json );
             } else { // otherwise should be added
               if( gr ){
-                cy.add( util.extend( { group: gr }, json ) );
+                toAdd.push( util.extend( { group: gr }, json ) );
               } else {
-                cy.add( json );
+                toAdd.push( json );
               }
             }
           }
+
+          cy.add( toAdd );
         };
 
         if( is.array( obj.elements ) ){ // elements: []

diff --git a/test/core-graph-manipulation.js b/test/core-graph-manipulation.js
@@ -340,6 +340,25 @@ describe('Core graph manipulation', function(){
       expect( cb ).to.equal(1);
     });
 
+    it('cy.json() adds elements with preceding edge', function(){
+      var cb = 0;
+      cy.on('add', function(){ cb++; });
+
+      cy.json({
+        elements: [
+          { data: { id: "ab", source: "a", target: "b" } },
+          { data: { id: "a" } },
+          { data: { id: "b" } }
+        ]
+      });
+
+      expect( cy.$('#a').length ).to.equal(1);
+      expect( cy.$('#b').length ).to.equal(1);
+      expect( cy.$('#ab').length ).to.equal(1);
+
+      expect( cb ).to.equal(3);
+    });
+
     it('cy.json() removes element', function(){
       var cb = 0;
       cy.on('remove', function(){ cb++; });