protect against nullish render

preactjs · Feb 14, 2024 · cc7f94c · cc7f94c
1 parent 238d580
commit cc7f94c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/hooks/src/index.js b/hooks/src/index.js
@@ -37,7 +37,7 @@ options._diff = vnode => {
 };
 
 options._root = (vnode, parentDom) => {
-	if (parentDom._children && parentDom._children._mask) {
+	if (vnode && parentDom._children && parentDom._children._mask) {
 		vnode._mask = parentDom._children._mask;
 	}
 

diff --git a/hooks/test/browser/useId.test.js b/hooks/test/browser/useId.test.js
@@ -456,4 +456,25 @@ describe('useId', () => {
 			'<div><div>My id is P0-0</div><div>My id is P0-1</div></div>'
 		);
 	});
+
+	it('should not crash for rendering null after a non-null render', () => {
+		const Id = () => {
+			const id = useId();
+			return <div>My id is {id}</div>;
+		};
+
+		const App = props => {
+			return (
+				<div>
+					<Id />
+					{props.secondId ? <Id /> : null}
+				</div>
+			);
+		};
+
+		render(createElement(App, { secondId: false }), scratch);
+		expect(scratch.innerHTML).to.equal('<div><div>My id is P0-0</div></div>');
+		render(null, scratch);
+		expect(scratch.innerHTML).to.equal('');
+	});
 });