@wordpress/block-editor 15.1.1-next.0f6f9d12c.0 → 15.2.1-next.f34ab90e9.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-editor",
-	"version": "15.1.1-next.0f6f9d12c.0",
+	"version": "15.2.1-next.f34ab90e9.0",
 	"description": "Generic block editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -37,38 +37,38 @@
 		"@emotion/react": "^11.7.1",
 		"@emotion/styled": "^11.6.0",
 		"@react-spring/web": "^9.4.5",
-		"@wordpress/a11y": "^4.28.1-next.0f6f9d12c.0",
-		"@wordpress/api-fetch": "^7.28.1-next.0f6f9d12c.0",
-		"@wordpress/blob": "^4.28.1-next.0f6f9d12c.0",
-		"@wordpress/block-serialization-default-parser": "^5.28.1-next.0f6f9d12c.0",
-		"@wordpress/blocks": "^15.1.1-next.0f6f9d12c.0",
-		"@wordpress/commands": "^1.28.1-next.0f6f9d12c.0",
-		"@wordpress/components": "^30.2.1-next.0f6f9d12c.0",
-		"@wordpress/compose": "^7.28.1-next.0f6f9d12c.0",
-		"@wordpress/data": "^10.28.1-next.0f6f9d12c.0",
-		"@wordpress/date": "^5.28.1-next.0f6f9d12c.0",
-		"@wordpress/deprecated": "^4.28.1-next.0f6f9d12c.0",
-		"@wordpress/dom": "^4.28.1-next.0f6f9d12c.0",
-		"@wordpress/element": "^6.28.1-next.0f6f9d12c.0",
-		"@wordpress/escape-html": "^3.28.1-next.0f6f9d12c.0",
-		"@wordpress/hooks": "^4.28.1-next.0f6f9d12c.0",
-		"@wordpress/html-entities": "^4.28.1-next.0f6f9d12c.0",
-		"@wordpress/i18n": "^6.1.1-next.0f6f9d12c.0",
-		"@wordpress/icons": "^10.28.2-next.0f6f9d12c.0",
-		"@wordpress/is-shallow-equal": "^5.28.1-next.0f6f9d12c.0",
-		"@wordpress/keyboard-shortcuts": "^5.28.1-next.0f6f9d12c.0",
-		"@wordpress/keycodes": "^4.28.1-next.0f6f9d12c.0",
-		"@wordpress/notices": "^5.28.1-next.0f6f9d12c.0",
-		"@wordpress/preferences": "^4.28.1-next.0f6f9d12c.0",
-		"@wordpress/priority-queue": "^3.28.1-next.0f6f9d12c.0",
-		"@wordpress/private-apis": "^1.28.1-next.0f6f9d12c.0",
-		"@wordpress/rich-text": "^7.28.1-next.0f6f9d12c.0",
-		"@wordpress/style-engine": "^2.28.1-next.0f6f9d12c.0",
-		"@wordpress/token-list": "^3.28.1-next.0f6f9d12c.0",
-		"@wordpress/upload-media": "^0.13.1-next.0f6f9d12c.0",
-		"@wordpress/url": "^4.28.1-next.0f6f9d12c.0",
-		"@wordpress/warning": "^3.28.1-next.0f6f9d12c.0",
-		"@wordpress/wordcount": "^4.28.1-next.0f6f9d12c.0",
+		"@wordpress/a11y": "^4.29.1-next.f34ab90e9.0",
+		"@wordpress/api-fetch": "^7.29.1-next.f34ab90e9.0",
+		"@wordpress/blob": "^4.29.1-next.f34ab90e9.0",
+		"@wordpress/block-serialization-default-parser": "^5.29.1-next.f34ab90e9.0",
+		"@wordpress/blocks": "^15.2.1-next.f34ab90e9.0",
+		"@wordpress/commands": "^1.29.1-next.f34ab90e9.0",
+		"@wordpress/components": "^30.2.1-next.f34ab90e9.0",
+		"@wordpress/compose": "^7.29.1-next.f34ab90e9.0",
+		"@wordpress/data": "^10.29.1-next.f34ab90e9.0",
+		"@wordpress/date": "^5.29.1-next.f34ab90e9.0",
+		"@wordpress/deprecated": "^4.29.1-next.f34ab90e9.0",
+		"@wordpress/dom": "^4.29.1-next.f34ab90e9.0",
+		"@wordpress/element": "^6.29.1-next.f34ab90e9.0",
+		"@wordpress/escape-html": "^3.29.1-next.f34ab90e9.0",
+		"@wordpress/hooks": "^4.29.1-next.f34ab90e9.0",
+		"@wordpress/html-entities": "^4.29.1-next.f34ab90e9.0",
+		"@wordpress/i18n": "^6.2.1-next.f34ab90e9.0",
+		"@wordpress/icons": "^10.29.1-next.f34ab90e9.0",
+		"@wordpress/is-shallow-equal": "^5.29.1-next.f34ab90e9.0",
+		"@wordpress/keyboard-shortcuts": "^5.29.1-next.f34ab90e9.0",
+		"@wordpress/keycodes": "^4.29.1-next.f34ab90e9.0",
+		"@wordpress/notices": "^5.29.1-next.f34ab90e9.0",
+		"@wordpress/preferences": "^4.29.1-next.f34ab90e9.0",
+		"@wordpress/priority-queue": "^3.29.1-next.f34ab90e9.0",
+		"@wordpress/private-apis": "^1.29.1-next.f34ab90e9.0",
+		"@wordpress/rich-text": "^7.29.1-next.f34ab90e9.0",
+		"@wordpress/style-engine": "^2.29.1-next.f34ab90e9.0",
+		"@wordpress/token-list": "^3.29.1-next.f34ab90e9.0",
+		"@wordpress/upload-media": "^0.14.1-next.f34ab90e9.0",
+		"@wordpress/url": "^4.29.1-next.f34ab90e9.0",
+		"@wordpress/warning": "^3.29.1-next.f34ab90e9.0",
+		"@wordpress/wordcount": "^4.29.1-next.f34ab90e9.0",
 		"change-case": "^4.1.2",
 		"clsx": "^2.1.1",
 		"colord": "^2.7.0",
@@ -91,5 +91,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "7d4f4367e2f76deddf4a09b540e6b2f9f4c3fe9f"
+	"gitHead": "91f58004986ec6faf118825f925ac7873d171986"
 }

package/src/components/use-block-drop-zone/index.js

@@ -148,6 +148,10 @@ export function getDropTargetPosition(
 		} ) => {
 			const rect = getBoundingClientRect();
 
+			if ( ! rect ) {
+				return;
+			}
+
 			let [ distance, edge ] = getDistanceToNearestEdge(
 				position,
 				rect,
@@ -428,10 +432,14 @@ export default function useBlockDropZone( {
 					return {
 						isUnmodifiedDefaultBlock:
 							getIsUnmodifiedDefaultBlock( block ),
-						getBoundingClientRect: () =>
-							ownerDocument
-								.getElementById( `block-${ clientId }` )
-								.getBoundingClientRect(),
+						getBoundingClientRect: () => {
+							const blockElement = ownerDocument.getElementById(
+								`block-${ clientId }`
+							);
+							return blockElement
+								? blockElement.getBoundingClientRect()
+								: null;
+						},
 						blockIndex: getBlockIndex( clientId ),
 						blockOrientation:
 							getBlockListSettings( clientId )?.orientation,

package/src/store/actions.js

@@ -155,22 +155,26 @@ export function receiveBlocks( blocks ) {
 /**
  * Action that updates attributes of multiple blocks with the specified client IDs.
  *
- * @param {string|string[]} clientIds     Block client IDs.
- * @param {Object}          attributes    Block attributes to be merged. Should be keyed by clientIds if
- *                                        uniqueByBlock is true.
- * @param {boolean}         uniqueByBlock true if each block in clientIds array has a unique set of attributes
+ * @param {string|string[]} clientIds                     Block client IDs.
+ * @param {Object}          attributes                    Block attributes to be merged. Should be keyed by clientIds if `options.uniqueByBlock` is true.
+ * @param {Object}          options                       Updating options.
+ * @param {boolean}         [options.uniqueByBlock=false] Whether each block in clientIds array has a unique set of attributes.
  * @return {Object} Action object.
  */
 export function updateBlockAttributes(
 	clientIds,
 	attributes,
-	uniqueByBlock = false
+	options = { uniqueByBlock: false }
 ) {
+	if ( typeof options === 'boolean' ) {
+		options = { uniqueByBlock: options };
+	}
+
 	return {
 		type: 'UPDATE_BLOCK_ATTRIBUTES',
 		clientIds: castArray( clientIds ),
 		attributes,
-		uniqueByBlock,
+		options,
 	};
 }
 

package/src/store/reducer.js

@@ -882,7 +882,7 @@ export const blocks = pipe(
 				const newState = new Map( state );
 				for ( const clientId of action.clientIds ) {
 					const updatedAttributeEntries = Object.entries(
-						action.uniqueByBlock
+						!! action.options?.uniqueByBlock
 							? action.attributes[ clientId ]
 							: action.attributes ?? {}
 					);
@@ -1833,7 +1833,7 @@ export function lastBlockAttributesChange( state = null, action ) {
 			return action.clientIds.reduce(
 				( accumulator, id ) => ( {
 					...accumulator,
-					[ id ]: action.uniqueByBlock
+					[ id ]: !! action.options?.uniqueByBlock
 						? action.attributes[ id ]
 						: action.attributes,
 				} ),

package/src/store/test/actions.js

@@ -89,7 +89,7 @@ describe( 'actions', () => {
 				type: 'UPDATE_BLOCK_ATTRIBUTES',
 				clientIds: [ clientId ],
 				attributes,
-				uniqueByBlock: false,
+				options: { uniqueByBlock: false },
 			} );
 		} );
 
@@ -101,7 +101,19 @@ describe( 'actions', () => {
 				type: 'UPDATE_BLOCK_ATTRIBUTES',
 				clientIds,
 				attributes,
-				uniqueByBlock: false,
+				options: { uniqueByBlock: false },
+			} );
+		} );
+
+		it( 'should fold boolean uniqueByBlock option into an object', () => {
+			const clientId = 'myclientid';
+			const attributes = {};
+			const result = updateBlockAttributes( clientId, attributes, true );
+			expect( result ).toEqual( {
+				type: 'UPDATE_BLOCK_ATTRIBUTES',
+				clientIds: [ clientId ],
+				attributes,
+				options: { uniqueByBlock: true },
 			} );
 		} );
 	} );

package/src/store/test/reducer.js

@@ -1963,7 +1963,7 @@ describe( 'state', () => {
 						attributes: {
 							kumquat: { updated: true },
 						},
-						uniqueByBlock: true,
+						options: { uniqueByBlock: true },
 					} );
 
 					expect( state.attributes.get( 'kumquat' ).updated ).toBe(
@@ -3308,7 +3308,7 @@ describe( 'state', () => {
 				attributes: {
 					'afd1cb17-2c08-4e7a-91be-007ba7ddc3a1': { food: 'banana' },
 				},
-				uniqueByBlock: true,
+				options: { uniqueByBlock: true },
 			} );
 
 			expect( state ).toEqual( {