useSelect: keep lastMapResult and lastMapSelect always in sync

WordPress · Mar 13, 2023 · 490e315 · 490e315
1 parent 8ad89a9
commit 490e315
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/packages/data/src/components/use-select/index.js b/packages/data/src/components/use-select/index.js
@@ -145,6 +145,7 @@ function Store( registry, suspense ) {
 			if ( ! isShallowEqual( lastMapResult, mapResult ) ) {
 				lastMapResult = mapResult;
 			}
+			lastMapSelect = mapSelect;
 			lastMapResultValid = true;
 		}
 
@@ -165,7 +166,6 @@ function Store( registry, suspense ) {
 		updateValue();
 
 		lastIsAsync = isAsync;
-		lastMapSelect = mapSelect;
 
 		// Return a pair of functions that can be passed to `useSyncExternalStore`.
 		return { subscribe: subscriber.subscribe, getValue };