Update action, reducer, and selectors for consistency, add tests

packages/block-editor/src/store/private-actions.js

@@ -263,10 +263,10 @@ export function setBlockRemovalRules( rules = false ) {
 /**
  * Sets the client ID of the block settings menu that is currently open.
  *
- * @param {string} clientId The block client ID.
+ * @param {?string} clientId The block client ID.
  * @return {Object} Action object.
  */
-export function setOpenedBlockSettingsMenu( clientId = '' ) {
+export function setOpenedBlockSettingsMenu( clientId ) {
 	return {
 		type: 'SET_OPENED_BLOCK_SETTINGS_MENU',
 		clientId,

packages/block-editor/src/store/private-selectors.js

@@ -144,7 +144,7 @@ export function getBlockRemovalRules( state ) {
  * Returns the client ID of the block settings menu that is currently open.
  *
  * @param {Object} state Global application state.
- * @return {string|undefined} The client ID of the block menu that is currently open.
+ * @return {string|null} The client ID of the block menu that is currently open.
  */
 export function getOpenedBlockSettingsMenu( state ) {
 	return state.openedBlockSettingsMenu;

packages/block-editor/src/store/reducer.js

@@ -1913,9 +1913,17 @@ export function blockEditingModes( state = new Map(), action ) {
 	return state;
 }
 
+/**
+ * Reducer returning the clientId of the block settings menu that is currently open.
+ *
+ * @param {string|null} state  Current state.
+ * @param {Object}      action Dispatched action.
+ *
+ * @return {string|null} Updated state.
+ */
 export function openedBlockSettingsMenu( state = null, action ) {
 	if ( 'SET_OPENED_BLOCK_SETTINGS_MENU' === action.type ) {
-		return action?.clientId;
+		return action?.clientId ?? null;
 	}
 	return state;
 }

packages/block-editor/src/store/test/private-actions.js

@@ -5,6 +5,7 @@ import {
 	hideBlockInterface,
 	showBlockInterface,
 	__experimentalUpdateSettings,
+	setOpenedBlockSettingsMenu,
 } from '../private-actions';
 
 describe( 'private actions', () => {
@@ -78,4 +79,20 @@ describe( 'private actions', () => {
 			} );
 		} );
 	} );
+
+	describe( 'setOpenedBlockSettingsMenu', () => {
+		it( 'should return the SET_OPENED_BLOCK_SETTINGS_MENU action', () => {
+			expect( setOpenedBlockSettingsMenu() ).toEqual( {
+				clientId: undefined,
+				type: 'SET_OPENED_BLOCK_SETTINGS_MENU',
+			} );
+		} );
+
+		it( 'should return the SET_OPENED_BLOCK_SETTINGS_MENU action with client id if provided', () => {
+			expect( setOpenedBlockSettingsMenu( 'abcd' ) ).toEqual( {
+				clientId: 'abcd',
+				type: 'SET_OPENED_BLOCK_SETTINGS_MENU',
+			} );
+		} );
+	} );
 } );

packages/block-editor/src/store/test/reducer.js

@@ -33,6 +33,7 @@ import {
 	lastBlockAttributesChange,
 	lastBlockInserted,
 	blockEditingModes,
+	openedBlockSettingsMenu,
 } from '../reducer';
 
 const noop = () => {};
@@ -3415,4 +3416,28 @@ describe( 'state', () => {
 			);
 		} );
 	} );
+
+	describe( 'openedBlockSettingsMenu', () => {
+		it( 'should return null by default', () => {
+			expect( openedBlockSettingsMenu( undefined, {} ) ).toBe( null );
+		} );
+
+		it( 'should set client id for opened block settings menu', () => {
+			const state = openedBlockSettingsMenu( null, {
+				type: 'SET_OPENED_BLOCK_SETTINGS_MENU',
+				clientId: '14501cc2-90a6-4f52-aa36-ab6e896135d1',
+			} );
+			expect( state ).toBe( '14501cc2-90a6-4f52-aa36-ab6e896135d1' );
+		} );
+
+		it( 'should clear the state when no client id is passed', () => {
+			const state = openedBlockSettingsMenu(
+				'14501cc2-90a6-4f52-aa36-ab6e896135d1',
+				{
+					type: 'SET_OPENED_BLOCK_SETTINGS_MENU',
+				}
+			);
+			expect( state ).toBe( null );
+		} );
+	} );
 } );