Revert "add parent and children for useId"

This reverts commit 78f365f.

Author: JoviDeCroock

.changeset/young-cougars-protect.md

@@ -7,8 +7,6 @@ export const SKIP_EFFECTS = '__s';
 
 // VNode properties
 export const COMPONENT = '__c';
-export const PARENT = '__';
-export const CHILDREN = '__k';
 
 // Component properties
 export const VNODE = '__v';

package-lock.json

@@ -18,9 +18,7 @@ import {
 	NEXT_STATE,
 	RENDER,
 	SKIP_EFFECTS,
-	VNODE,
-	PARENT,
-	CHILDREN
+	VNODE
 } from './constants';
 
 /** @typedef {import('preact').VNode} VNode */
@@ -74,7 +72,7 @@ function renderToString(vnode, context, opts) {
 	) {
 		res = _renderToStringPretty(vnode, context, opts);
 	} else {
-		res = _renderToString(vnode, context, false, undefined, vnode);
+		res = _renderToString(vnode, context, false, undefined);
 	}
 
 	// options._commit, we don't schedule any effects in this library right now,
@@ -183,7 +181,7 @@ const isArray = Array.isArray;
 const assign = Object.assign;
 
 /** The default export is an alias of `render()`. */
-function _renderToString(vnode, context, isSvgMode, selectValue, parent) {
+function _renderToString(vnode, context, isSvgMode, selectValue) {
 	if (vnode == null || vnode === true || vnode === false || vnode === '') {
 		return '';
 	}
@@ -195,15 +193,9 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent) {
 
 	if (isArray(vnode)) {
 		let rendered = '';
-		parent[CHILDREN] = [];
 		for (let i = 0; i < vnode.length; i++) {
-			if (typeof vnode[i] === 'object' && parent) {
-				vnode[i][PARENT] = parent;
-				parent[CHILDREN].push(vnode[i]);
-			}
 			rendered =
-				rendered +
-				_renderToString(vnode[i], context, isSvgMode, selectValue, parent);
+				rendered + _renderToString(vnode[i], context, isSvgMode, selectValue);
 		}
 		return rendered;
 	}
@@ -214,14 +206,12 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent) {
 
 	// components
 	if (isComponent) {
-		vnode[PARENT] = parent;
 		if (nodeName === Fragment) {
 			return _renderToString(
 				vnode.props.children,
 				context,
 				isSvgMode,
-				selectValue,
-				vnode
+				selectValue
 			);
 		}
 
@@ -241,8 +231,7 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent) {
 
 		if (options[DIFFED]) options[DIFFED](vnode);
 
-		vnode[CHILDREN] = Array.isArray(rendered) ? rendered : [rendered];
-		return _renderToString(rendered, context, isSvgMode, selectValue, vnode);
+		return _renderToString(rendered, context, isSvgMode, selectValue);
 	}
 
 	// render JSX to HTML
@@ -257,6 +246,36 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent) {
 		for (let name in props) {
 			let v = props[name];
 
+			// switch (name) {
+			// 	case 'className':
+			// 		if ('class' in props) continue;
+			// 		name = 'class';
+			// 		break;
+			// 	case 'htmlFor':
+			// 		if ('for' in props) continue;
+			// 		name = 'for';
+			// 		break;
+			// 	case 'defaultValue':
+			// 		name = 'value';
+			// 		break;
+			// 	case 'defaultChecked':
+			// 		name = 'checked';
+			// 		break;
+			// 	case 'defaultSelected':
+			// 		name = 'selected';
+			// 		break;
+			// 	case 'key':
+			// 	case 'ref':
+			// 	case '__self':
+			// 	case '__source':
+			// 	case 'children':
+			// 		continue;
+			// 	default:
+			// 		if (isSvgMode && XLINK.test(name)) {
+			// 			name = name.toLowerCase().replace(/^xlink:?/, 'xlink:');
+			// 		}
+			// }
+
 			if (
 				name === 'key' ||
 				name === 'ref' ||
@@ -316,6 +335,11 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent) {
 	let pieces = '';
 	let hasChildren = false;
 
+	// let children = isArray(propChildren)
+	// 	? propChildren
+	// 	: propChildren != null
+	// 	? [propChildren]
+	// 	: undefined;
 	if (html) {
 		// return s + html + '</' + nodeName + '>';
 		// s = s + html;
@@ -326,24 +350,13 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent) {
 		pieces = pieces + encodeEntities(children);
 		hasChildren = true;
 	} else if (isArray(children)) {
-		vnode[CHILDREN] = [];
-
 		for (let i = 0; i < children.length; i++) {
 			let child = children[i];
-			vnode[CHILDREN].push(child);
+
 			if (child != null && child !== false) {
-				if (typeof child === 'object') {
-					child[PARENT] = vnode;
-				}
 				let childSvgMode =
 					nodeName === 'svg' || (nodeName !== 'foreignObject' && isSvgMode);
-				let ret = _renderToString(
-					child,
-					context,
-					childSvgMode,
-					selectValue,
-					vnode
-				);
+				let ret = _renderToString(child, context, childSvgMode, selectValue);
 
 				// Skip if we received an empty string
 				if (ret) {
@@ -354,19 +367,9 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent) {
 			}
 		}
 	} else if (children != null && children !== false && children !== true) {
-		vnode[CHILDREN] = [children];
-		if (typeof children === 'object') {
-			children[PARENT] = vnode;
-		}
 		let childSvgMode =
 			nodeName === 'svg' || (nodeName !== 'foreignObject' && isSvgMode);
-		let ret = _renderToString(
-			children,
-			context,
-			childSvgMode,
-			selectValue,
-			vnode
-		);
+		let ret = _renderToString(children, context, childSvgMode, selectValue);
 
 		// Skip if we received an empty string
 		if (ret) {

src/constants.js

@@ -19,45 +19,6 @@ describe('render', () => {
 			expect(rendered).to.equal(expected);
 		});
 
-		describe('setting vnode properties', () => {
-			it('sets the parent and children attributes for normal nodes', () => {
-				const paragraph = <p>hi</p>;
-				const root = <div>{paragraph}</div>;
-				const rendered = render(root);
-
-				expect(rendered).to.equal(`<div><p>hi</p></div>`);
-				expect(root.__k).to.deep.equal([paragraph]);
-				expect(paragraph.__).to.deep.equal(root);
-			});
-
-			it('sets the parent and children attributes for functions', () => {
-				const Root = () => <p>hi</p>;
-				const root = <Root />;
-				const wrapper = <div>{root}</div>;
-				const rendered = render(wrapper);
-
-				expect(rendered).to.equal(`<div><p>hi</p></div>`);
-				expect(wrapper.__k).to.deep.equal([root]);
-				expect(root.__).to.deep.equal(wrapper);
-			});
-
-			it('sets the parent and children attributes for nested functions', () => {
-				const Root = (props) => props.children;
-				const Child = () => (
-					<div>
-						<p>hi</p>
-					</div>
-				);
-				const child = <Child />;
-				const root = <Root>{child}</Root>;
-				const rendered = render(root);
-
-				expect(rendered).to.equal(`<div><p>hi</p></div>`);
-				expect(root.__k).to.deep.equal([child]);
-				expect(child.__).to.deep.equal(root);
-			});
-		});
-
 		describe('whitespace', () => {
 			it('should omit whitespace between elements', () => {
 				let children = [];