From 698c17b90365e875e7308d9ef58974cb7b2cce2d Mon Sep 17 00:00:00 2001
From: jdecroock <decroockjovi@gmail.com>
Date: Sat, 12 Oct 2024 09:32:17 +0200
Subject: [PATCH 1/2] We should not always set to hydration

---
 .../test/browser/suspense-hydration.test.js   |  1 +
 compat/test/browser/suspense.test.js          | 19 +++++++++++++++++++
 src/diff/index.js                             |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/compat/test/browser/suspense-hydration.test.js b/compat/test/browser/suspense-hydration.test.js
index b364cf41c6..82d01251cf 100644
--- a/compat/test/browser/suspense-hydration.test.js
+++ b/compat/test/browser/suspense-hydration.test.js
@@ -15,6 +15,7 @@ import {
 } from '../../../test/_util/helpers';
 import { ul, li, div } from '../../../test/_util/dom';
 import { createLazy, createSuspenseLoader } from './suspense-utils';
+import { render } from 'preact';
 
 /* eslint-env browser, mocha */
 describe('suspense hydration', () => {
diff --git a/compat/test/browser/suspense.test.js b/compat/test/browser/suspense.test.js
index a7d3c8b7a5..5c7ad45294 100644
--- a/compat/test/browser/suspense.test.js
+++ b/compat/test/browser/suspense.test.js
@@ -299,6 +299,25 @@ describe('suspense', () => {
 		});
 	});
 
+	it('should not duplicate DOM when suspending while rendering', () => {
+		scratch.innerHTML = '<div>Hello</div>';
+
+		const [Lazy, resolve] = createLazy();
+		render(
+			<Suspense>
+				<Lazy />
+			</Suspense>,
+			scratch
+		);
+		rerender(); // Flush rerender queue to mimic what preact will really do
+		expect(scratch.innerHTML).to.equal('');
+
+		return resolve(() => <div>Hello</div>).then(() => {
+			rerender();
+			expect(scratch.innerHTML).to.equal('<div>Hello</div>');
+		});
+	});
+
 	it('should suspend when a promise is thrown', () => {
 		class ClassWrapper extends Component {
 			render(props) {
diff --git a/src/diff/index.js b/src/diff/index.js
index 287f94344d..ae2d77ffc2 100644
--- a/src/diff/index.js
+++ b/src/diff/index.js
@@ -275,7 +275,7 @@ export function diff(
 			if (isHydrating || excessDomChildren != null) {
 				newVNode._flags |= isHydrating
 					? MODE_HYDRATE | MODE_SUSPENDED
-					: MODE_HYDRATE;
+					: MODE_SUSPENDED;
 
 				while (oldDom && oldDom.nodeType === 8 && oldDom.nextSibling) {
 					oldDom = oldDom.nextSibling;

From de884cad34ea0180173a14d4653fc05baa60861a Mon Sep 17 00:00:00 2001
From: Jovi De Croock <decroockjovi@gmail.com>
Date: Sat, 12 Oct 2024 09:44:46 +0200
Subject: [PATCH 2/2] Update compat/test/browser/suspense-hydration.test.js

---
 compat/test/browser/suspense-hydration.test.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/compat/test/browser/suspense-hydration.test.js b/compat/test/browser/suspense-hydration.test.js
index 82d01251cf..b364cf41c6 100644
--- a/compat/test/browser/suspense-hydration.test.js
+++ b/compat/test/browser/suspense-hydration.test.js
@@ -15,7 +15,6 @@ import {
 } from '../../../test/_util/helpers';
 import { ul, li, div } from '../../../test/_util/dom';
 import { createLazy, createSuspenseLoader } from './suspense-utils';
-import { render } from 'preact';
 
 /* eslint-env browser, mocha */
 describe('suspense hydration', () => {