Don't execute copy handler if widget area block is included

WordPress · May 24, 2022 · c4a7de0 · c4a7de0
1 parent 8e6b18e
commit c4a7de0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/packages/block-editor/src/components/copy-handler/index.js b/packages/block-editor/src/components/copy-handler/index.js
@@ -75,6 +75,7 @@ export function useNotifyCopy() {
 export function useClipboardHandler() {
 	const {
 		getBlocksByClientId,
+		getBlockName,
 		getSelectedBlockClientIds,
 		hasMultiSelection,
 		getSettings,
@@ -100,6 +101,14 @@ export function useClipboardHandler() {
 				return;
 			}
 
+			// Don't execute if widget area block is included
+			if (
+				getBlockName( selectedBlockClientIds[ 0 ] ) ===
+				'core/widget-area'
+			) {
+				return;
+			}
+
 			// Always handle multiple selected blocks.
 			if ( ! hasMultiSelection() ) {
 				const { target } = event;

diff --git a/packages/block-editor/src/store/selectors.js b/packages/block-editor/src/store/selectors.js
@@ -711,14 +711,6 @@ export const getSelectedBlockClientIds = createSelector(
 			return EMPTY_ARRAY;
 		}
 
-		// Disable widget area selection.
-		if (
-			getBlockName( state, selectionStart.clientId ) ===
-			'core/widget-area'
-		) {
-			return EMPTY_ARRAY;
-		}
-
 		if ( selectionStart.clientId === selectionEnd.clientId ) {
 			return [ selectionStart.clientId ];
 		}