Merge 6c38ced into d63b740

src/diff/index.js

@@ -310,7 +310,10 @@ export function unmount(vnode, ancestorComponent, skipRemove) {
 		applyRef(r, null, ancestorComponent);
 	}
 
-	if (!skipRemove && vnode._lastDomChild==null && (skipRemove = ((r = vnode._dom)!=null))) removeNode(r);
+	let dom;
+	if (!skipRemove && vnode._lastDomChild==null) {
+		skipRemove = (dom = vnode._dom)!=null;
+	}
 
 	vnode._dom = vnode._lastDomChild = null;
 
@@ -332,6 +335,8 @@ export function unmount(vnode, ancestorComponent, skipRemove) {
 			unmount(r[i], ancestorComponent, skipRemove);
 		}
 	}
+
+	if (dom!=null) removeNode(dom);
 }
 
 /** The `.render()` method for a PFC backing instance. */

test/browser/lifecycle.test.js

@@ -510,7 +510,7 @@ describe('Lifecycle methods', () => {
 			expect(stateArg).to.deep.equal({
 				value: 3
 			});
-			
+
 			// New Props (see #1446)
 			// 4 -> 5 in gDSFP
 			render(<Foo foo="baz" />, scratch);
@@ -1384,6 +1384,21 @@ describe('Lifecycle methods', () => {
 			render(<div />, scratch);
 			expect(Bar.prototype.componentWillUnmount, 'when removed').to.have.been.calledOnce;
 		});
+
+		it('should only remove dom after componentWillUnmount was called', () => {
+			class Foo extends Component {
+				componentWillUnmount() {
+					expect(document.getElementById('foo')).to.not.equal(null);
+				}
+
+				render() {
+					return <div id="foo" />;
+				}
+			}
+
+		 render(<Foo />, scratch);
+		 render(null, scratch);
+		});
 	});