@wordpress/editor 14.8.5 → 14.8.7

package/src/bindings/post-meta.js

@@ -15,8 +15,8 @@ import { unlock } from '../lock-unlock';
  * If the value is not available based on context, like in templates,
  * it falls back to the default value, label, or key.
  *
- * @param {Object} registry The registry context exposed through `useRegistry`.
- * @param {Object} context  The context provided.
+ * @param {Object} select  The select function from the data store.
+ * @param {Object} context The context provided.
  * @return {Object} List of post meta fields with their value and label.
  *
  * @example
@@ -34,11 +34,9 @@ import { unlock } from '../lock-unlock';
  * }
  * ```
  */
-function getPostMetaFields( registry, context ) {
-	const { getEditedEntityRecord } = registry.select( coreDataStore );
-	const { getRegisteredPostMeta } = unlock(
-		registry.select( coreDataStore )
-	);
+function getPostMetaFields( select, context ) {
+	const { getEditedEntityRecord } = select( coreDataStore );
+	const { getRegisteredPostMeta } = unlock( select( coreDataStore ) );
 
 	let entityMetaValues;
 	// Try to get the current entity meta values.
@@ -75,8 +73,8 @@ function getPostMetaFields( registry, context ) {
 
 export default {
 	name: 'core/post-meta',
-	getValues( { registry, context, bindings } ) {
-		const metaFields = getPostMetaFields( registry, context );
+	getValues( { select, context, bindings } ) {
+		const metaFields = getPostMetaFields( select, context );
 
 		const newValues = {};
 		for ( const [ attributeName, source ] of Object.entries( bindings ) ) {
@@ -88,61 +86,61 @@ export default {
 		}
 		return newValues;
 	},
-	setValues( { registry, context, bindings } ) {
+	setValues( { dispatch, context, bindings } ) {
 		const newMeta = {};
 		Object.values( bindings ).forEach( ( { args, newValue } ) => {
 			newMeta[ args.key ] = newValue;
 		} );
-		registry
-			.dispatch( coreDataStore )
-			.editEntityRecord( 'postType', context?.postType, context?.postId, {
+
+		dispatch( coreDataStore ).editEntityRecord(
+			'postType',
+			context?.postType,
+			context?.postId,
+			{
 				meta: newMeta,
-			} );
+			}
+		);
 	},
-	canUserEditValue( { registry, context, args } ) {
+	canUserEditValue( { select, context, args } ) {
 		// Lock editing in query loop.
 		if ( context?.query || context?.queryId ) {
 			return false;
 		}
 
 		const postType =
-			context?.postType ||
-			registry.select( editorStore ).getCurrentPostType();
+			context?.postType || select( editorStore ).getCurrentPostType();
 
 		// Check that editing is happening in the post editor and not a template.
 		if ( postType === 'wp_template' ) {
 			return false;
 		}
 
-		const fieldValue = getPostMetaFields( registry, context )?.[ args.key ]
+		const fieldValue = getPostMetaFields( select, context )?.[ args.key ]
 			?.value;
 		// Empty string or `false` could be a valid value, so we need to check if the field value is undefined.
 		if ( fieldValue === undefined ) {
 			return false;
 		}
 		// Check that custom fields metabox is not enabled.
-		const areCustomFieldsEnabled = registry
-			.select( editorStore )
-			.getEditorSettings().enableCustomFields;
+		const areCustomFieldsEnabled =
+			select( editorStore ).getEditorSettings().enableCustomFields;
 		if ( areCustomFieldsEnabled ) {
 			return false;
 		}
 
 		// Check that the user has the capability to edit post meta.
-		const canUserEdit = registry
-			.select( coreDataStore )
-			.canUser( 'update', {
-				kind: 'postType',
-				name: context?.postType,
-				id: context?.postId,
-			} );
+		const canUserEdit = select( coreDataStore ).canUser( 'update', {
+			kind: 'postType',
+			name: context?.postType,
+			id: context?.postId,
+		} );
 		if ( ! canUserEdit ) {
 			return false;
 		}
 
 		return true;
 	},
-	getFieldsList( { registry, context } ) {
-		return getPostMetaFields( registry, context );
+	getFieldsList( { select, context } ) {
+		return getPostMetaFields( select, context );
 	},
 };

package/src/components/header/index.js

@@ -57,6 +57,7 @@ function Header( {
 		isPublishSidebarOpened,
 		showIconLabels,
 		hasFixedToolbar,
+		hasBlockSelection,
 		isNestedEntity,
 	} = useSelect( ( select ) => {
 		const { get: getPreference } = select( preferencesStore );
@@ -72,6 +73,8 @@ function Header( {
 			isPublishSidebarOpened: _isPublishSidebarOpened(),
 			showIconLabels: getPreference( 'core', 'showIconLabels' ),
 			hasFixedToolbar: getPreference( 'core', 'fixedToolbar' ),
+			hasBlockSelection:
+				!! select( blockEditorStore ).getBlockSelectionStart(),
 			isNestedEntity:
 				!! getEditorSettings().onNavigateToPreviousEntityRecord,
 			isZoomedOutView: __unstableGetEditorMode() === 'zoom-out',
@@ -81,7 +84,9 @@ function Header( {
 	const [ isBlockToolsCollapsed, setIsBlockToolsCollapsed ] =
 		useState( true );
 
-	const hasCenter = isBlockToolsCollapsed && ! isTooNarrowForDocumentBar;
+	const hasCenter =
+		( ! hasBlockSelection || isBlockToolsCollapsed ) &&
+		! isTooNarrowForDocumentBar;
 	const hasBackButton = useHasBackButton();
 
 	// The edit-post-header classname is only kept for backward compatibilty

package/src/hooks/pattern-overrides.js

@@ -6,7 +6,7 @@ import { privateApis as patternsPrivateApis } from '@wordpress/patterns';
 import { createHigherOrderComponent } from '@wordpress/compose';
 import { useBlockEditingMode } from '@wordpress/block-editor';
 import { useSelect } from '@wordpress/data';
-import { store as blocksStore } from '@wordpress/blocks';
+import { getBlockBindingsSource } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
@@ -58,7 +58,6 @@ function ControlsWithStoreSubscription( props ) {
 	const blockEditingMode = useBlockEditingMode();
 	const { hasPatternOverridesSource, isEditingSyncedPattern } = useSelect(
 		( select ) => {
-			const { getBlockBindingsSource } = unlock( select( blocksStore ) );
 			const { getCurrentPostType, getEditedPostAttribute } =
 				select( editorStore );