1 files changed, 38 insertions, 1 deletions
diff --git a/packages/integrations/react/client.js b/packages/integrations/react/client.js
index dbd32c0c5..73f43aa94 100644
--- a/packages/integrations/react/client.js
+++ b/packages/integrations/react/client.js
@@ -10,6 +10,42 @@ function isAlreadyHydrated(element) {
 	}
 }
 
+function createReactElementFromDOMElement(element) {
+	let attrs = {};
+	for(const attr of element.attributes) {
+		attrs[attr.name] = attr.value;
+	}
+
+	return createElement(element.localName, attrs,
+		Array.from(element.childNodes).map(c => {
+			if(c.nodeType === Node.TEXT_NODE) {
+				return c.data;
+			} else if(c.nodeType === Node.ELEMENT_NODE) {
+				return createReactElementFromDOMElement(c)
+			} else {
+				return undefined;
+			}
+		}).filter(a => !!a)
+	);
+}
+
+function getChildren(childString, experimentalReactChildren) {
+	if(experimentalReactChildren && childString) {
+		let children = [];
+		let template = document.createElement('template');
+		template.innerHTML = childString;
+		for(let child of template.content.children) {
+			children.push(createReactElementFromDOMElement(child))
+		}
+		return children;
+	} else if(childString) {
+		return createElement(StaticHtml, { value: childString });
+	} else {
+		return undefined;
+	}
+
+}
+
 export default (element) =>
 	(Component, props, { default: children, ...slotted }, { client }) => {
 		if (!element.hasAttribute('ssr')) return;
@@ -19,10 +55,11 @@ export default (element) =>
 		for (const [key, value] of Object.entries(slotted)) {
 			props[key] = createElement(StaticHtml, { value, name: key });
 		}
+		
 		const componentEl = createElement(
 			Component,
 			props,
-			children != null ? createElement(StaticHtml, { value: children }) : children
+			getChildren(children, element.hasAttribute('data-react-children'))
 		);
 		const rootKey = isAlreadyHydrated(element);
 		// HACK: delete internal react marker for nested components to suppress aggressive warnings