Merge pull request #2956 from preactjs/hydration-comment

preactjs · Jan 24, 2021 · 47c521d · 47c521d
2 parents 359ad4f + 5583b46
commit 47c521d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/diff/index.js b/src/diff/index.js
@@ -318,7 +318,13 @@ function diffElementNodes(
 			//
 			// Note: This takes advantage of Text nodes having `.localName=undefined`,
 			// which is loosely equal to Text VNodes' `.type=null`. Elements use string equality.
-			if (child != null && (dom == child || child.localName == nodeType)) {
+			if (
+				child != null &&
+				((nodeType === null
+					? child.nodeType === 3
+					: child.localName === nodeType) ||
+					dom == child)
+			) {
 				dom = child;
 				excessDomChildren[i] = null;
 				break;

diff --git a/test/browser/hydrate.test.js b/test/browser/hydrate.test.js
@@ -445,4 +445,10 @@ describe('hydrate()', () => {
 			'<p class="hi">hello baz</p><p class="hi">hello bar</p>'
 		);
 	});
+
+	it('should skip comment nodes', () => {
+		scratch.innerHTML = '<p>hello <!-- c -->foo</p>';
+		hydrate(<p>hello {'foo'}</p>, scratch);
+		expect(scratch.innerHTML).to.equal('<p>hello foo</p>');
+	});
 });