From 94a3f8767b1b2be89836dba77f546a5bd673be70 Mon Sep 17 00:00:00 2001
From: Sylvain Prat <sylvain.prat@gmail.com>
Date: Mon, 11 Jan 2016 21:53:25 +0100
Subject: [PATCH] Passing test "can be replaced and removed" for thunk

---
 snabbdom.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/snabbdom.js b/snabbdom.js
index 8010ffc..d835791 100644
--- a/snabbdom.js
+++ b/snabbdom.js
@@ -27,9 +27,13 @@ function createKeyToOldIdx(children, beginIdx, endIdx) {
   return map;
 }
 
-function createRmCb(childElm, listeners) {
+function createRmCb(child, listeners) {
+  var elm;
+  while (isUndef(elm = child.elm)) child = child.data.vnode;
   return function() {
-    if (--listeners === 0) childElm.parentElement.removeChild(childElm);
+    if (--listeners === 0) {
+        elm.parentElement.removeChild(elm);
+    }
   };
 }
 
@@ -88,15 +92,16 @@ function init(modules) {
   }
 
   function invokeDestroyHook(vnode) {
-    var i = vnode.data, j;
-    if (isDef(i)) {
-      if (isDef(i = i.hook) && isDef(i = i.destroy)) i(vnode);
+    var i, j, data = vnode.data;
+    if (isDef(data)) {
+      if (isDef(i = data.hook) && isDef(i = i.destroy)) i(vnode);
       for (i = 0; i < cbs.destroy.length; ++i) cbs.destroy[i](vnode);
       if (isDef(i = vnode.children)) {
         for (j = 0; j < vnode.children.length; ++j) {
           invokeDestroyHook(vnode.children[j]);
         }
       }
+      if (isDef(i = data.vnode)) invokeDestroyHook(i);
     }
   }
 
@@ -107,7 +112,7 @@ function init(modules) {
         if (isDef(ch.sel)) {
           invokeDestroyHook(ch);
           listeners = cbs.remove.length + 1;
-          rm = createRmCb(ch.elm, listeners);
+          rm = createRmCb(ch, listeners);
           for (i = 0; i < cbs.remove.length; ++i) cbs.remove[i](ch, rm);
           if (isDef(i = ch.data) && isDef(i = i.hook) && isDef(i = i.remove)) {
             i(ch, rm);