Close block settings menu after removing block (#15543)

* Close block settings menu after removing block

* Undo change to BlockToolbar component

* Also close settings menu after other items

See #15313

* Do not show BlockSettingsMenu if block is invalid

* Use flow()

* Block Editor: Select previous / next only when exists

* Remove now unneeded isValid check

packages/block-editor/src/components/block-settings-menu/index.js

@@ -2,7 +2,7 @@
  * External dependencies
  */
 import classnames from 'classnames';
-import { castArray } from 'lodash';
+import { castArray, flow } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -70,7 +70,7 @@ export function BlockSettingsMenu( { clientIds, onSelect } ) {
 							{ ! isLocked && canDuplicate && (
 								<MenuItem
 									className="editor-block-settings-menu__control block-editor-block-settings-menu__control"
-									onClick={ onDuplicate }
+									onClick={ flow( onClose, onDuplicate ) }
 									icon="admin-page"
 									shortcut={ shortcuts.duplicate.display }
 								>
@@ -81,15 +81,15 @@ export function BlockSettingsMenu( { clientIds, onSelect } ) {
 								<>
 									<MenuItem
 										className="editor-block-settings-menu__control block-editor-block-settings-menu__control"
-										onClick={ onInsertBefore }
+										onClick={ flow( onClose, onInsertBefore ) }
 										icon="insert-before"
 										shortcut={ shortcuts.insertBefore.display }
 									>
 										{ __( 'Insert Before' ) }
 									</MenuItem>
 									<MenuItem
 										className="editor-block-settings-menu__control block-editor-block-settings-menu__control"
-										onClick={ onInsertAfter }
+										onClick={ flow( onClose, onInsertAfter ) }
 										icon="insert-after"
 										shortcut={ shortcuts.insertAfter.display }
 									>
@@ -108,7 +108,7 @@ export function BlockSettingsMenu( { clientIds, onSelect } ) {
 							{ ! isLocked && (
 								<MenuItem
 									className="editor-block-settings-menu__control block-editor-block-settings-menu__control"
-									onClick={ onRemove }
+									onClick={ flow( onClose, onRemove ) }
 									icon="trash"
 									shortcut={ shortcuts.removeBlock.display }
 								>

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

@@ -131,7 +131,9 @@ export function* selectPreviousBlock( clientId ) {
 		clientId
 	);
 
-	yield selectBlock( previousBlockClientId, -1 );
+	if ( previousBlockClientId ) {
+		yield selectBlock( previousBlockClientId, -1 );
+	}
 }
 
 /**
@@ -147,7 +149,9 @@ export function* selectNextBlock( clientId ) {
 		clientId
 	);
 
-	yield selectBlock( nextBlockClientId );
+	if ( nextBlockClientId ) {
+		yield selectBlock( nextBlockClientId );
+	}
 }
 
 /**