Block Bindings: Refactor utils file. (WordPress#64740)

* Refactor block binding utils * Add security checks Co-authored-by: cbravobernal <[email protected]> Co-authored-by: gziolo <[email protected]> Co-authored-by: SantosGuillamot <[email protected]> Co-authored-by: jsnajdr <[email protected]>
pewresearch · Aug 27, 2024 · 57c9c69 · 57c9c69
1 parent fb15df1
commit 57c9c69
Showing 1 changed file with 15 additions and 16 deletions.
diff --git a/packages/block-editor/src/utils/block-bindings.js b/packages/block-editor/src/utils/block-bindings.js
@@ -1,18 +1,22 @@
 /**
  * WordPress dependencies
  */
-import { useDispatch, useSelect } from '@wordpress/data';
+import { useDispatch, useRegistry } from '@wordpress/data';
 
 /**
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../store';
 import { useBlockEditContext } from '../components/block-edit';
 
+function isObjectEmpty( object ) {
+	return ! object || Object.keys( object ).length === 0;
+}
+
 export function useBlockBindingsUtils() {
 	const { clientId } = useBlockEditContext();
 	const { updateBlockAttributes } = useDispatch( blockEditorStore );
-	const { getBlockAttributes } = useSelect( blockEditorStore );
+	const { getBlockAttributes } = useRegistry().select( blockEditorStore );
 
 	/**
 	 * Updates the value of the bindings connected to block attributes.
@@ -44,8 +48,10 @@ export function useBlockBindingsUtils() {
 	 * ```
 	 */
 	const updateBlockBindings = ( bindings ) => {
-		const { metadata } = getBlockAttributes( clientId );
-		const newBindings = { ...metadata?.bindings };
+		const { metadata: { bindings: currentBindings, ...metadata } = {} } =
+			getBlockAttributes( clientId );
+		const newBindings = { ...currentBindings };
+
 		Object.entries( bindings ).forEach( ( [ attribute, binding ] ) => {
 			if ( ! binding && newBindings[ attribute ] ) {
 				delete newBindings[ attribute ];
@@ -59,15 +65,12 @@ export function useBlockBindingsUtils() {
 			bindings: newBindings,
 		};
 
-		if ( Object.keys( newMetadata.bindings ).length === 0 ) {
+		if ( isObjectEmpty( newMetadata.bindings ) ) {
 			delete newMetadata.bindings;
 		}
 
 		updateBlockAttributes( clientId, {
-			metadata:
-				Object.keys( newMetadata ).length === 0
-					? undefined
-					: newMetadata,
+			metadata: isObjectEmpty( newMetadata ) ? undefined : newMetadata,
 		} );
 	};
 
@@ -83,14 +86,10 @@ export function useBlockBindingsUtils() {
 	 * ```
 	 */
 	const removeAllBlockBindings = () => {
-		const { metadata } = getBlockAttributes( clientId );
-		const newMetadata = { ...metadata };
-		delete newMetadata.bindings;
+		const { metadata: { bindings, ...metadata } = {} } =
+			getBlockAttributes( clientId );
 		updateBlockAttributes( clientId, {
-			metadata:
-				Object.keys( newMetadata ).length === 0
-					? undefined
-					: newMetadata,
+			metadata: isObjectEmpty( metadata ) ? undefined : metadata,
 		} );
 	};