@wordpress/block-editor 12.19.0 → 12.19.2

package/src/hooks/use-bindings-attributes.js

@@ -46,7 +46,7 @@ const createEditFunctionWithBindingsAttribute = () =>
 							settings.source
 						);
 
-						if ( source ) {
+						if ( source && source.useSource ) {
 							// Second argument (`updateMetaValue`) will be used to update the value in the future.
 							const {
 								placeholder,
@@ -112,24 +112,3 @@ addFilter(
 	'core/editor/custom-sources-backwards-compatibility/shim-attribute-source',
 	shimAttributeSource
 );
-
-// Add the context to all blocks.
-addFilter(
-	'blocks.registerBlockType',
-	'core/block-bindings-ui',
-	( settings, name ) => {
-		if ( ! ( name in BLOCK_BINDINGS_ALLOWED_BLOCKS ) ) {
-			return settings;
-		}
-		const contextItems = [ 'postId', 'postType', 'queryId' ];
-		const usesContextArray = settings.usesContext;
-		const oldUsesContextArray = new Set( usesContextArray );
-		contextItems.forEach( ( item ) => {
-			if ( ! oldUsesContextArray.has( item ) ) {
-				usesContextArray.push( item );
-			}
-		} );
-		settings.usesContext = usesContextArray;
-		return settings;
-	}
-);

package/src/hooks/utils.js

@@ -176,8 +176,12 @@ export function useBlockSettings( name, parentLayout ) {
 	const [
 		backgroundImage,
 		backgroundSize,
-		fontFamilies,
-		fontSizes,
+		customFontFamilies,
+		defaultFontFamilies,
+		themeFontFamilies,
+		customFontSizes,
+		defaultFontSizes,
+		themeFontSizes,
 		customFontSize,
 		fontStyle,
 		fontWeight,
@@ -223,8 +227,12 @@ export function useBlockSettings( name, parentLayout ) {
 	] = useSettings(
 		'background.backgroundImage',
 		'background.backgroundSize',
-		'typography.fontFamilies',
-		'typography.fontSizes',
+		'typography.fontFamilies.custom',
+		'typography.fontFamilies.default',
+		'typography.fontFamilies.theme',
+		'typography.fontSizes.custom',
+		'typography.fontSizes.default',
+		'typography.fontSizes.theme',
 		'typography.customFontSize',
 		'typography.fontStyle',
 		'typography.fontWeight',
@@ -305,10 +313,14 @@ export function useBlockSettings( name, parentLayout ) {
 			},
 			typography: {
 				fontFamilies: {
-					custom: fontFamilies,
+					custom: customFontFamilies,
+					default: defaultFontFamilies,
+					theme: themeFontFamilies,
 				},
 				fontSizes: {
-					custom: fontSizes,
+					custom: customFontSizes,
+					default: defaultFontSizes,
+					theme: themeFontSizes,
 				},
 				customFontSize,
 				fontStyle,
@@ -346,8 +358,12 @@ export function useBlockSettings( name, parentLayout ) {
 	}, [
 		backgroundImage,
 		backgroundSize,
-		fontFamilies,
-		fontSizes,
+		customFontFamilies,
+		defaultFontFamilies,
+		themeFontFamilies,
+		customFontSizes,
+		defaultFontSizes,
+		themeFontSizes,
 		customFontSize,
 		fontStyle,
 		fontWeight,

package/src/store/get-block-settings.js

@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import {
-	__EXPERIMENTAL_PATHS_WITH_MERGE as PATHS_WITH_MERGE,
+	__EXPERIMENTAL_PATHS_WITH_OVERRIDE as PATHS_WITH_OVERRIDE,
 	hasBlockSupport,
 } from '@wordpress/blocks';
 import { applyFilters } from '@wordpress/hooks';
@@ -111,6 +111,17 @@ export function mergeOrigins( value ) {
 }
 const mergeCache = new WeakMap();
 
+/**
+ * For settings like `color.palette`, which have a value that is an object
+ * with `default`, `theme`, `custom`, with field values that are arrays of
+ * items, returns the one with the highest priority among these three arrays.
+ * @param {Object} value Object to extract from
+ * @return {Array} Array of items extracted from the three origins
+ */
+export function overrideOrigins( value ) {
+	return value.custom ?? value.theme ?? value.default;
+}
+
 /**
  * For settings like `color.palette`, which have a value that is an object
  * with `default`, `theme`, `custom`, with field values that are arrays of
@@ -119,7 +130,7 @@ const mergeCache = new WeakMap();
  * @param {Object} value Object to check
  * @return {boolean} Whether the object has values in any of the three origins
  */
-export function hasMergedOrigins( value ) {
+export function hasOriginValue( value ) {
 	return [ 'default', 'theme', 'custom' ].some(
 		( key ) => value?.[ key ]?.length
 	);
@@ -203,8 +214,8 @@ export function getBlockSettings( state, clientId, ...paths ) {
 
 		// Return if the setting was found in either the block instance or the store.
 		if ( result !== undefined ) {
-			if ( PATHS_WITH_MERGE[ normalizedPath ] ) {
-				return mergeOrigins( result );
+			if ( PATHS_WITH_OVERRIDE[ normalizedPath ] ) {
+				return overrideOrigins( result );
 			}
 			return result;
 		}

package/src/store/private-actions.js

@@ -140,6 +140,15 @@ export const privateRemoveBlocks =
 				}
 
 				if ( rules[ 'bindings/core/pattern-overrides' ] ) {
+					const parentPatternBlocks =
+						select.getBlockParentsByBlockName(
+							clientId,
+							'core/block'
+						);
+					// We only need to run this check when editing the original pattern, not pattern instances.
+					if ( parentPatternBlocks?.length > 0 ) {
+						continue;
+					}
 					const blockAttributes =
 						select.getBlockAttributes( clientId );
 					if (

package/src/store/reducer.js

@@ -2057,7 +2057,7 @@ function blockBindingsSources( state = {}, action ) {
 			[ action.sourceName ]: {
 				label: action.sourceLabel,
 				useSource: action.useSource,
-				lockAttributesEditing: action.lockAttributesEditing,
+				lockAttributesEditing: action.lockAttributesEditing ?? true,
 			},
 		};
 	}