prepend element of different tag type

mbasso · May 1, 2017 · ad8e90f · ad8e90f
1 parent 30db182
commit ad8e90f
Show file tree

Hide file tree

Showing 7 changed files with 1,348 additions and 1,283 deletions.
diff --git a/compiled/asm-dom.bc b/compiled/asm-dom.bc
diff --git a/compiled/asm-dom.o b/compiled/asm-dom.o
diff --git a/compiled/asmjs/asm-dom.asm.js b/compiled/asmjs/asm-dom.asm.js
diff --git a/compiled/wasm/asm-dom.asm.js b/compiled/wasm/asm-dom.asm.js
diff --git a/compiled/wasm/asm-dom.wasm b/compiled/wasm/asm-dom.wasm
diff --git a/src/cpp/Main/main.cpp b/src/cpp/Main/main.cpp
@@ -21,9 +21,8 @@ bool sameVnode(const VNode* __restrict__ const vnode1, const VNode* __restrict__
 };
 
 std::map<std::string, int>* createKeyToOldIdx(const std::vector<VNode*>& children, const int beginIdx, const int endIdx) {
-  std::size_t i = beginIdx;
 	std::map<std::string, int>* map = new std::map<std::string, int>();
-  for (; i <= endIdx; ++i) {
+  for (int i = beginIdx; i <= endIdx; ++i) {
     if (!children[i]->key.empty()) {
 			map->insert(std::make_pair(children[i]->key, i));
 		}
@@ -113,10 +112,10 @@ void updateChildren(
 	std::vector<VNode*>& oldCh,
 	std::vector<VNode*>& newCh
 ) {
-	std::size_t oldStartIdx = 0;
-	std::size_t newStartIdx = 0;
-	std::size_t oldEndIdx = oldCh.size() - 1;
-	std::size_t newEndIdx = newCh.size() - 1;
+	int oldStartIdx = 0;
+	int newStartIdx = 0;
+	int oldEndIdx = oldCh.size() - 1;
+	int newEndIdx = newCh.size() - 1;
 	VNode* oldStartVnode = oldCh[0];
 	VNode* oldEndVnode = oldCh[oldEndIdx];
 	VNode* newStartVnode = newCh[0];
@@ -170,8 +169,6 @@ void updateChildren(
 					}, parentElm, createElm(newStartVnode), oldStartVnode->elm);
 				} else {
 					patchVnode(elmToMove, newStartVnode);
-					deleteVNode(elmToMove);
-					elmToMove = NULL;
 					oldKeyToIdx->erase(newStartVnode->key);
 					EM_ASM_({
 						window['asmDomHelpers']['domApi']['insertBefore']($0, $1, $2);
@@ -191,6 +188,7 @@ void updateChildren(
 		removeVnodes(oldCh, oldStartIdx, oldEndIdx);
 	}
 	delete oldKeyToIdx;
+	oldKeyToIdx = NULL;
 };
 
 void patchVnode(VNode* __restrict__ const oldVnode, VNode* __restrict__ const vnode) {

diff --git a/test/patch.spec.js b/test/patch.spec.js
@@ -611,7 +611,6 @@ describe('patch', function testPatch() {
     vdom.deleteVNode(vnode2);
   });
 
-  /*
   it('should prepend element of different tag type', () => {
     const vnode1 = h('div', [h('span', 'World')]);
     const vnode2 = h('div', [h('div', 'Hello'), h('span', 'World')]);
@@ -624,7 +623,6 @@ describe('patch', function testPatch() {
     expect(map(inner, elm.children)).toEqual(['Hello', 'World']);
     vdom.deleteVNode(vnode2);
   });
-  */
 
   it('should remove elements', () => {
     const vnode1 = h('div', [h('span', 'One'), h('span', 'Two'), h('span', 'Three')]);