Move iterable signal updating outside for...in loop

WordPress · Sep 9, 2024 · d516c42 · d516c42
1 parent 7b7e0cf
commit d516c42
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/packages/interactivity/src/proxies/state.ts b/packages/interactivity/src/proxies/state.ts
@@ -276,8 +276,11 @@ const deepMergeRecursive = (
 	override: boolean = true
 ) => {
 	if ( isPlainObject( target ) && isPlainObject( source ) ) {
+		let hasNewKeys = false;
 		for ( const key in source ) {
 			const isNew = ! ( key in target );
+			hasNewKeys = hasNewKeys || isNew;
+
 			const desc = Object.getOwnPropertyDescriptor( source, key );
 			if (
 				typeof desc?.get === 'function' ||
@@ -311,10 +314,10 @@ const deepMergeRecursive = (
 					propSignal.setValue( desc.value );
 				}
 			}
+		}
 
-			if ( isNew && objToIterable.has( target ) ) {
-				objToIterable.get( target )!.value++;
-			}
+		if ( hasNewKeys && objToIterable.has( target ) ) {
+			objToIterable.get( target )!.value++;
 		}
 	}
 };