fix: fix remove and replace

smooth-code · Sep 1, 2017 · 0ff5472 · 0ff5472
1 parent 6be2b9f
commit 0ff5472
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/packages/h2x-traverse/src/NodePath.js b/packages/h2x-traverse/src/NodePath.js
@@ -53,7 +53,7 @@ class NodePath {
     this.shouldStop = true
     this.node = node
     this.container[this.key] = node
-    this.context.visit(this.container, this.key)
+    this.requeue()
   }
 
   remove() {
@@ -68,6 +68,11 @@ class NodePath {
       this.container[this.key] = null
     }
     this.node = null
+    this.requeue()
+  }
+
+  requeue() {
+    this.context.visit(this.parent, this.listKey)
   }
 
   _call(fns) {

diff --git a/packages/h2x-traverse/src/TraversalContext.js b/packages/h2x-traverse/src/TraversalContext.js
@@ -20,14 +20,9 @@ class TraversalContext {
     if (container.length === 0) return false
     let shouldStop = false
 
-    const paths = []
-
     Array.from(container).forEach((value, key) => {
+      if (shouldStop) return
       const nodePath = this.create(parent, container, key, listKey)
-      paths.push(nodePath)
-    })
-
-    paths.forEach(nodePath => {
       if (nodePath && nodePath.visit()) shouldStop = true
     })
 

diff --git a/packages/h2x-traverse/src/index.test.js b/packages/h2x-traverse/src/index.test.js
@@ -112,6 +112,9 @@ describe('traverse', () => {
       if (path.node.tagName === 'DIV') {
         path.replace(path.node.ownerDocument.createElement('header'))
       }
+
+      // Bug with visiting container instead of parent
+      expect(path.container !== path.parent).toBe(true)
     })
     const ast = parse(`<div foo bar></div>`)
     traverse(ast, {
@@ -130,13 +133,13 @@ describe('traverse', () => {
       }
     })
 
-    const ast = parse(`<header><div></div><span></span></header>`)
+    const ast = parse(`<header><div></div><span></span><span></span></header>`)
 
     traverse(ast, { enter })
-    expect(enter).toHaveBeenCalledTimes(3)
+    expect(enter).toHaveBeenCalledTimes(4)
 
     traverse(ast, { enter })
-    expect(enter).toHaveBeenCalledTimes(5)
+    expect(enter).toHaveBeenCalledTimes(7)
   })
 
   it('should be possible to remove attribute', () => {