Fix reusable block locking

WordPress · Apr 28, 2022 · 7bb9963 · 7bb9963
1 parent cdaefc3
commit 7bb9963
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/packages/block-editor/src/components/block-content-overlay/index.js b/packages/block-editor/src/components/block-content-overlay/index.js
@@ -9,18 +9,20 @@ import { useSelect } from '@wordpress/data';
 import { store as blockEditorStore } from '../../store';
 
 export default function useBlockOverlayActive( clientId ) {
-	const { isParentSelected, hasChildSelected } = useSelect(
+	return useSelect(
 		( select ) => {
-			const { isBlockSelected, hasSelectedInnerBlock } = select(
-				blockEditorStore
+			const {
+				isBlockSelected,
+				hasSelectedInnerBlock,
+				canEditBlock,
+			} = select( blockEditorStore );
+
+			return (
+				! canEditBlock( clientId ) ||
+				( ! isBlockSelected( clientId ) &&
+					! hasSelectedInnerBlock( clientId, true ) )
 			);
-			return {
-				isParentSelected: isBlockSelected( clientId ),
-				hasChildSelected: hasSelectedInnerBlock( clientId, true ),
-			};
 		},
 		[ clientId ]
 	);
-
-	return ! isParentSelected && ! hasChildSelected;
 }
diff --git a/packages/compose/src/hooks/use-disabled/index.js b/packages/compose/src/hooks/use-disabled/index.js
@@ -66,12 +66,9 @@ export default function useDisabled( {
 
 			/** A variable keeping track of the previous updates in order to restore them. */
 			/** @type {Function[]} */
-			let updates = [];
+			const updates = [];
 
 			const disable = () => {
-				// Restore previous updates.
-				updates = [];
-
 				if ( node.style.getPropertyValue( 'user-select' ) !== 'none' ) {
 					const previousValue = node.style.getPropertyValue(
 						'user-select'