Merge branch 'main' into fix_4631

Author: CaptainWang98

devtools/src/devtools.js

@@ -13,7 +13,7 @@ export function initDevTools() {
 		globalVar !== undefined &&
 		globalVar.__PREACT_DEVTOOLS__
 	) {
-		globalVar.__PREACT_DEVTOOLS__.attachPreact('10.26.2', options, {
+		globalVar.__PREACT_DEVTOOLS__.attachPreact('10.26.4', options, {
 			Fragment,
 			Component
 		});

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "preact",
   "amdName": "preact",
-  "version": "10.26.2",
+  "version": "10.26.4",
   "private": false,
   "description": "Fast 3kb React-compatible Virtual DOM library.",
   "main": "dist/preact.js",

package.json

@@ -26,7 +26,7 @@ export function cloneElement(vnode, props, children) {
 	for (i in props) {
 		if (i == 'key') key = props[i];
 		else if (i == 'ref') ref = props[i];
-		else if (props[i] === UNDEFINED && defaultProps !== UNDEFINED) {
+		else if (props[i] == UNDEFINED && defaultProps != UNDEFINED) {
 			normalizedProps[i] = defaultProps[i];
 		} else {
 			normalizedProps[i] = props[i];

src/clone-element.js

@@ -28,7 +28,7 @@ export function BaseComponent(props, context) {
 BaseComponent.prototype.setState = function (update, callback) {
 	// only clone state when copying to nextState the first time.
 	let s;
-	if (this._nextState != NULL && this._nextState !== this.state) {
+	if (this._nextState != NULL && this._nextState != this.state) {
 		s = this._nextState;
 	} else {
 		s = this._nextState = assign({}, this.state);
@@ -204,7 +204,7 @@ export function enqueueRender(c) {
 			(c._dirty = true) &&
 			rerenderQueue.push(c) &&
 			!process._rerenderCount++) ||
-		prevDebounce !== options.debounceRendering
+		prevDebounce != options.debounceRendering
 	) {
 		prevDebounce = options.debounceRendering;
 		(prevDebounce || defer)(process);

src/component.js

@@ -19,7 +19,7 @@ export function createContext(defaultValue) {
 
 			this.shouldComponentUpdate = function (_props) {
 				// @ts-expect-error even
-				if (this.props.value !== _props.value) {
+				if (this.props.value != _props.value) {
 					subs.forEach(c => {
 						c._force = true;
 						enqueueRender(c);

src/create-context.js

@@ -33,7 +33,7 @@ export function createElement(type, props, children) {
 	// Note: type may be undefined in development, must never error here.
 	if (typeof type == 'function' && type.defaultProps != NULL) {
 		for (i in type.defaultProps) {
-			if (normalizedProps[i] === UNDEFINED) {
+			if (normalizedProps[i] == UNDEFINED) {
 				normalizedProps[i] = type.defaultProps[i];
 			}
 		}

src/create-element.js

@@ -84,7 +84,7 @@ export function diffChildren(
 
 		// At this point, constructNewChildrenArray has assigned _index to be the
 		// matchingIndex for this VNode's oldVNode (or -1 if there is no oldVNode).
-		if (childVNode._index === -1) {
+		if (childVNode._index == -1) {
 			oldVNode = EMPTY_OBJ;
 		} else {
 			oldVNode = oldChildren[childVNode._index] || EMPTY_OBJ;
@@ -207,7 +207,7 @@ function constructNewChildrenArray(
 				NULL,
 				NULL
 			);
-		} else if (childVNode.constructor === UNDEFINED && childVNode._depth > 0) {
+		} else if (childVNode.constructor == UNDEFINED && childVNode._depth > 0) {
 			// VNode is already in use, clone it. This can happen in the following
 			// scenario:
 			//   const reuse = <div />
@@ -238,7 +238,7 @@ function constructNewChildrenArray(
 		));
 
 		oldVNode = NULL;
-		if (matchingIndex !== -1) {
+		if (matchingIndex != -1) {
 			oldVNode = oldChildren[matchingIndex];
 			remainingOldChildren--;
 			if (oldVNode) {
@@ -248,8 +248,8 @@ function constructNewChildrenArray(
 
 		// Here, we define isMounting for the purposes of the skew diffing
 		// algorithm. Nodes that are unsuspending are considered mounting and we detect
-		// this by checking if oldVNode._original === null
-		const isMounting = oldVNode == NULL || oldVNode._original === NULL;
+		// this by checking if oldVNode._original == null
+		const isMounting = oldVNode == NULL || oldVNode._original == NULL;
 
 		if (isMounting) {
 			if (matchingIndex == -1) {
@@ -428,7 +428,7 @@ function findMatchingIndex(
 		(oldVNode === NULL && childVNode.key == null) ||
 		(oldVNode &&
 			key == oldVNode.key &&
-			type === oldVNode.type &&
+			type == oldVNode.type &&
 			(oldVNode._flags & MATCHED) == 0)
 	) {
 		return skewedIndex;
@@ -442,7 +442,7 @@ function findMatchingIndex(
 					oldVNode &&
 					(oldVNode._flags & MATCHED) == 0 &&
 					key == oldVNode.key &&
-					type === oldVNode.type
+					type == oldVNode.type
 				) {
 					return x;
 				}
@@ -455,7 +455,7 @@ function findMatchingIndex(
 					oldVNode &&
 					(oldVNode._flags & MATCHED) == 0 &&
 					key == oldVNode.key &&
-					type === oldVNode.type
+					type == oldVNode.type
 				) {
 					return y;
 				}

src/diff/children.js

@@ -64,7 +64,7 @@ export function diff(
 
 	// When passing through createElement it assigns the object
 	// constructor as undefined. This to prevent JSON-injection.
-	if (newVNode.constructor !== UNDEFINED) return NULL;
+	if (newVNode.constructor != UNDEFINED) return NULL;
 
 	// If the previous diff bailed out, resume creating/hydrating.
 	if (oldVNode._flags & MODE_SUSPENDED) {
@@ -165,14 +165,14 @@ export function diff(
 				}
 
 				if (
-					!c._force &&
-					((c.shouldComponentUpdate != NULL &&
+					(!c._force &&
+						c.shouldComponentUpdate != NULL &&
 						c.shouldComponentUpdate(
 							newProps,
 							c._nextState,
 							componentContext
 						) === false) ||
-						newVNode._original == oldVNode._original)
+					newVNode._original == oldVNode._original
 				) {
 					// More info about this here: https://gist.github.com/JoviDeCroock/bec5f2ce93544d2e6070ef8e0036e4e8
 					if (newVNode._original != oldVNode._original) {
@@ -258,10 +258,10 @@ export function diff(
 
 			let isTopLevelFragment =
 				tmp != NULL && tmp.type === Fragment && tmp.key == NULL;
-			let renderResult = isTopLevelFragment ? tmp.props.children : tmp;
+			let renderResult = tmp;
 
 			if (isTopLevelFragment) {
-				tmp.props.children = NULL;
+				renderResult = cloneNode(tmp.props.children);
 			}
 
 			oldDom = diffChildren(
@@ -368,6 +368,22 @@ export function commitRoot(commitQueue, root, refQueue) {
 	});
 }
 
+function cloneNode(node) {
+	if (
+		typeof node != 'object' ||
+		node == NULL ||
+		(node._depth && node._depth > 0)
+	) {
+		return node;
+	}
+
+	if (isArray(node)) {
+		return node.map(cloneNode);
+	}
+
+	return assign({}, node);
+}
+
 /**
  * Diff two virtual nodes representing DOM element
  * @param {PreactElement} dom The DOM element representing the virtual nodes
@@ -455,9 +471,9 @@ function diffElementNodes(
 		excessDomChildren = NULL;
 	}
 
-	if (nodeType === NULL) {
+	if (nodeType == NULL) {
 		// During hydration, we still have to split merged text from SSR'd HTML.
-		if (oldProps !== newProps && (!isHydrating || dom.data !== newProps)) {
+		if (oldProps !== newProps && (!isHydrating || dom.data != newProps)) {
 			dom.data = newProps;
 		}
 	} else {
@@ -519,8 +535,7 @@ function diffElementNodes(
 			if (
 				!isHydrating &&
 				(!oldHtml ||
-					(newHtml.__html !== oldHtml.__html &&
-						newHtml.__html !== dom.innerHTML))
+					(newHtml.__html != oldHtml.__html && newHtml.__html != dom.innerHTML))
 			) {
 				dom.innerHTML = newHtml.__html;
 			}
@@ -531,7 +546,7 @@ function diffElementNodes(
 
 			diffChildren(
 				// @ts-expect-error
-				newVNode.type === 'template' ? dom.content : dom,
+				newVNode.type == 'template' ? dom.content : dom,
 				isArray(newChildren) ? newChildren : [newChildren],
 				newVNode,
 				oldVNode,
@@ -560,7 +575,7 @@ function diffElementNodes(
 			if (nodeType == 'progress' && inputValue == NULL) {
 				dom.removeAttribute('value');
 			} else if (
-				inputValue !== UNDEFINED &&
+				inputValue != UNDEFINED &&
 				// #2756 For the <progress>-element the initial value is 0,
 				// despite the attribute not being present. When the attribute
 				// is missing the progress bar is treated as indeterminate.
@@ -570,13 +585,13 @@ function diffElementNodes(
 					// This is only for IE 11 to fix <select> value not being updated.
 					// To avoid a stale select value we need to set the option.value
 					// again, which triggers IE11 to re-evaluate the select value
-					(nodeType == 'option' && inputValue !== oldProps[i]))
+					(nodeType == 'option' && inputValue != oldProps[i]))
 			) {
 				setProperty(dom, i, inputValue, oldProps[i], namespace);
 			}
 
 			i = 'checked';
-			if (checked !== UNDEFINED && checked !== dom[i]) {
+			if (checked != UNDEFINED && checked != dom[i]) {
 				setProperty(dom, i, checked, oldProps[i], namespace);
 			}
 		}
@@ -624,7 +639,7 @@ export function unmount(vnode, parentVNode, skipRemove) {
 	if (options.unmount) options.unmount(vnode);
 
 	if ((r = vnode.ref)) {
-		if (!r.current || r.current === vnode._dom) {
+		if (!r.current || r.current == vnode._dom) {
 			applyRef(r, NULL, parentVNode);
 		}
 	}

src/diff/index.js

@@ -57,7 +57,7 @@ export function setProperty(dom, name, value, oldValue, namespace) {
 
 			if (value) {
 				for (name in value) {
-					if (!oldValue || value[name] !== oldValue[name]) {
+					if (!oldValue || value[name] != oldValue[name]) {
 						setStyle(dom.style, name, value[name]);
 					}
 				}