Utilise indexToSelect being false as equivalent to not updating selec…

…tion
WordPress · Dec 16, 2022 · 9387914 · 9387914 · github-actions · Dec 16, 2022
1 parent f8efb0d
commit 9387914
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/packages/block-editor/src/store/reducer.js b/packages/block-editor/src/store/reducer.js
@@ -1311,11 +1311,16 @@ function selectionHelper( state = {}, action ) {
 				return state;
 			}
 
+			const shouldNotUpdateSelection = false;
+
 			const blockToSelect =
 				action.blocks[ action.indexToSelect ] ||
 				action.blocks[ action.blocks.length - 1 ];
 
-			if ( ! blockToSelect ) {
+			if (
+				! blockToSelect ||
+				action.indexToSelect === shouldNotUpdateSelection
+			) {
 				return {};
 			}
 

diff --git a/packages/block-editor/src/store/test/reducer.js b/packages/block-editor/src/store/test/reducer.js
@@ -2719,6 +2719,30 @@ describe( 'state', () => {
 			);
 		} );
 
+		it( 'should replace the selected block but not apply a selection  when `indexToSelect` is explicitly set to `false`', () => {
+			const original = deepFreeze( {
+				selectionStart: { clientId: 'chicken' },
+				selectionEnd: { clientId: 'chicken' },
+			} );
+			const action = {
+				type: 'REPLACE_BLOCKS',
+				clientIds: [ 'chicken' ],
+				blocks: [
+					{ clientId: 'rigas' },
+					{ clientId: 'chicken' },
+					{ clientId: 'wings' },
+				],
+				indexToSelect: false,
+			};
+			const state = selection( original, action );
+			expect( state ).toEqual(
+				expect.objectContaining( {
+					selectionStart: {},
+					selectionEnd: {},
+				} )
+			);
+		} );
+
 		it( 'should reset if replacing with empty set', () => {
 			const original = deepFreeze( {
 				selectionStart: { clientId: 'chicken' },