Merge 89a0df5 into a109fb9

src/component.js

@@ -107,10 +107,11 @@ export function getDomSibling(vnode, childIndex) {
 	for (; childIndex < vnode._children.length; childIndex++) {
 		sibling = vnode._children[childIndex];
 
-		if (sibling != null) {
-			return typeof sibling.type !== 'function'
-				? sibling._dom
-				: getDomSibling(sibling, 0);
+		if (sibling != null && sibling._dom != null) {
+			// Since updateParentDomPointers keeps _dom pointer correct,
+			// we can rely on _dom to tell us if this subtree contains a
+			// rendered DOM node, and what the first rendered DOM node is
+			return sibling._dom;
 		}
 	}
 

src/diff/children.js

@@ -2,6 +2,7 @@ import { diff, unmount, applyRef } from './index';
 import { coerceToVNode } from '../create-element';
 import { EMPTY_OBJ, EMPTY_ARR } from '../constants';
 import { removeNode } from '../util';
+import { getDomSibling } from '../component';
 
 /**
  * Diff the children of a virtual node
@@ -36,14 +37,14 @@ export function diffChildren(parentDom, newParentVNode, oldParentVNode, context,
 	// for this purpose, because `null` is a valid value for `oldDom` which can mean to skip to this logic
 	// (e.g. if mounting a new tree in which the old DOM should be ignored (usually for Fragments).
 	if (oldDom == EMPTY_OBJ) {
-		oldDom = null;
-		if (excessDomChildren!=null) {
+		if (excessDomChildren != null) {
 			oldDom = excessDomChildren[0];
 		}
+		else if (oldChildrenLength) {
+			oldDom = getDomSibling(oldParentVNode, 0);
+		}
 		else {
-			for (i = 0; !oldDom && i < oldChildrenLength; i++) {
-				oldDom = oldChildren[i] && oldChildren[i]._dom;
-			}
+			oldDom = null;
 		}
 	}