Added test cases and installed upgraded fragdom

adrianhelvik · Nov 3, 2019 · 77e8693 · 77e8693
1 parent 74990b1
commit 77e8693
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@adrianhelvik/vdom",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "main": "dist/index.js",
   "module": "src/index.js",
   "author": "Adrian Helvik <adrian.helvik@specifique.no>",

diff --git a/src/applyDiff.js b/src/applyDiff.js
@@ -22,13 +22,14 @@ export default function applyDiff(container, diff, options = {}) {
     const node = lookup(container, path)
 
     switch (action.type) {
-      case 'replace node':
+      case 'replace node': {
         unmountComponentAtNode(node.childNodes[index])
-        node.replaceChild(
-          createNode(action.node, pendingComponents),
-          node.childNodes[index],
-        )
+        const newChild = createNode(action.node, pendingComponents)
+        const oldChild = node.childNodes[index]
+
+        node.replaceChild(newChild, oldChild)
         break
+      }
       case 'insert node':
         node.appendChild(createNode(action.node, pendingComponents))
         break

diff --git a/src/applyDiff.spec.js b/src/applyDiff.spec.js
@@ -7,6 +7,7 @@ import applyDiff from './applyDiff.js'
 jest.useFakeTimers()
 
 let container
+let fragContainer
 let prev = null
 let render = template => {
   applyDiff(container, createDiff(prev, template))
@@ -15,6 +16,7 @@ let render = template => {
 
 beforeEach(() => {
   container = window.document.createElement('div')
+  fragContainer = fragdom.wrap(container)
 })
 
 afterEach(() => {
@@ -35,6 +37,32 @@ describe('directly', () => {
     expect(container.innerHTML).toBe('<span></span>')
   })
 
+  it('can replace a text node inside an element in a fragment', () => {
+    applyDiff(container, createDiff(null, [<div>Hi "{'a'}"</div>]))
+    let d
+    applyDiff(
+      container,
+      (d = createDiff(
+        <>
+          <div>Hi "{'a'}"</div>
+        </>,
+        <>
+          <div>Hi "{'b'}"</div>
+        </>,
+      )),
+    )
+    expect(
+      fragContainer.childNodes[0].childNodes[0].childNodes[1].textContent,
+    ).toBe('b')
+
+    try {
+      expect(container.innerHTML).toBe('<div>Hi "b"</div>')
+    } catch (e) {
+      e.message = `[caused by fragdom] ${e.message}`
+      throw e
+    }
+  })
+
   it('can remove an element', () => {
     applyDiff(container, createDiff(null, <div />))
     applyDiff(container, createDiff(<div />, null))

diff --git a/src/bugfixes.spec.js b/src/bugfixes.spec.js
@@ -3,6 +3,8 @@ import createElement from './createElement'
 import createDiff from './createDiff'
 import applyDiff from './applyDiff'
 
+const { Fragment } = createElement
+
 const prevTemplates = new WeakMap()
 const mount = (curr, target) => {
   let prev = prevTemplates.get(target)
@@ -14,7 +16,7 @@ const mount = (curr, target) => {
   applyDiff(target, diff)
 }
 
-test('repro', () => {
+test('repro 1', () => {
   const root = document.createElement('div')
 
   mount([<div class="todoName">By "{''}"</div>], root)