@wordpress/block-editor 15.10.1-next.v.0 → 15.11.0

package/src/hooks/block-fields/media/index.js

@@ -25,8 +25,7 @@ import { getMediaSelectKey } from '../../../store/private-keys';
 import { store as blockEditorStore } from '../../../store';
 
 function MediaThumbnail( { data, field, attachment, config } ) {
-	const { fieldDef } = config;
-	const { allowedTypes = [], multiple = false } = fieldDef.args || {};
+	const { allowedTypes = [], multiple = false } = config || {};
 
 	if ( multiple ) {
 		return 'todo multiple';
@@ -85,12 +84,11 @@ export default function Media( { data, field, onChange, config = {} } ) {
 		isControl: true,
 	} );
 	const value = field.getValue( { item: data } );
-	const { fieldDef } = config;
-	const { allowedTypes = [], multiple = false } = fieldDef.args || {};
-
-	// Check if featured image is supported by checking if it's in the mapping
-	const hasFeaturedImageSupport =
-		fieldDef?.mapping && 'featuredImage' in fieldDef.mapping;
+	const {
+		allowedTypes = [],
+		multiple = false,
+		useFeaturedImage = false,
+	} = config;
 
 	const id = value?.id;
 	const url = value?.url;
@@ -140,23 +138,14 @@ export default function Media( { data, field, onChange, config = {} } ) {
 				multiple={ multiple }
 				popoverProps={ popoverProps }
 				onReset={ () => {
-					// Build reset value dynamically based on mapping
-					const resetValue = {};
-
-					if ( fieldDef?.mapping ) {
-						Object.keys( fieldDef.mapping ).forEach( ( key ) => {
-							resetValue[ key ] = undefined;
-						} );
-					}
-
 					onChange(
 						field.setValue( {
 							item: data,
-							value: resetValue,
+							value: {},
 						} )
 					);
 				} }
-				{ ...( hasFeaturedImageSupport && {
+				{ ...( useFeaturedImage && {
 					useFeaturedImage: !! value?.featuredImage,
 					onToggleFeaturedImage: () => {
 						onChange(
@@ -171,14 +160,13 @@ export default function Media( { data, field, onChange, config = {} } ) {
 				} ) }
 				onSelect={ ( selectedMedia ) => {
 					if ( selectedMedia.id && selectedMedia.url ) {
-						// Build new value dynamically based on what's in the mapping
 						const newValue = {
 							...selectedMedia,
 							mediaType: selectedMedia.media_type,
 						};
 
 						// Turn off featured image when manually selecting media
-						if ( hasFeaturedImageSupport ) {
+						if ( useFeaturedImage ) {
 							newValue.featuredImage = false;
 						}
 

package/src/hooks/index.js

@@ -14,7 +14,7 @@ import './lock';
 import allowedBlocks from './allowed-blocks';
 import anchor from './anchor';
 import ariaLabel from './aria-label';
-import './block-fields';
+import blockFields from './block-fields';
 import customClassName from './custom-class-name';
 import './generated-class-name';
 import style from './style';
@@ -56,6 +56,7 @@ createBlockEditFilter(
 		blockBindingsPanel,
 		childLayout,
 		allowedBlocks,
+		blockFields,
 		listView,
 		autoInspectorControls,
 	].filter( Boolean )

package/src/hooks/list-view.js

@@ -5,13 +5,15 @@ import { __ } from '@wordpress/i18n';
 import { PanelBody } from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
 import { store as blocksStore, hasBlockSupport } from '@wordpress/blocks';
+import { useContext } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
-import InspectorControls from '../components/inspector-controls';
 import { store as blockEditorStore } from '../store';
 import { PrivateListView } from '../components/list-view';
+import InspectorControls from '../components/inspector-controls/fill';
+import { PrivateBlockContext } from '../components/block-list/private-block-context';
 
 export const LIST_VIEW_SUPPORT_KEY = 'listView';
 
@@ -34,23 +36,50 @@ export function hasListViewSupport( nameOrType ) {
  * @return {Element|null} List view inspector controls or null.
  */
 export function ListViewPanel( { clientId, name } ) {
+	const { isSelectionWithinCurrentSection } =
+		useContext( PrivateBlockContext );
 	const isEnabled = hasListViewSupport( name );
-	const { hasChildren, blockTitle } = useSelect(
-		( select ) => ( {
-			hasChildren:
-				!! select( blockEditorStore ).getBlockCount( clientId ),
-			blockTitle: select( blocksStore ).getBlockType( name )?.title,
-		} ),
-		[ clientId, name ]
+	const { hasChildren, blockTitle, isNestedListView } = useSelect(
+		( select ) => {
+			const { getBlockCount, getBlockParents, getBlockName } =
+				select( blockEditorStore );
+
+			// When the ListView is shown in a section, avoid showing List Views
+			// for both parent and child blocks that have support. In this situation
+			// the parent will show the child anyway in its List.
+			// Search parents to see if there's one that also has support, and if so
+			// skip rendering.
+			// This matches closely the logic in the `BlockCard` component.
+			let _isNestedListView = false;
+			if ( isSelectionWithinCurrentSection ) {
+				const parents = getBlockParents( clientId, true );
+				_isNestedListView = parents.find( ( parentId ) => {
+					const parentName = getBlockName( parentId );
+					return (
+						parentName === 'core/navigation' ||
+						hasBlockSupport( parentName, 'listView' )
+					);
+				} );
+			}
+
+			return {
+				hasChildren: !! getBlockCount( clientId ),
+				blockTitle: select( blocksStore ).getBlockType( name )?.title,
+				isNestedListView: _isNestedListView,
+			};
+		},
+		[ clientId, name, isSelectionWithinCurrentSection ]
 	);
 
-	if ( ! isEnabled ) {
+	if ( ! isEnabled || isNestedListView ) {
 		return null;
 	}
 
+	const showBlockTitle = isSelectionWithinCurrentSection;
+
 	return (
 		<InspectorControls group="list">
-			<PanelBody title={ null }>
+			<PanelBody title={ showBlockTitle ? blockTitle : undefined }>
 				{ ! hasChildren && (
 					<p className="block-editor-block-inspector__no-blocks">
 						{ __( 'No items yet.' ) }
@@ -74,4 +103,5 @@ export default {
 	edit: ListViewPanel,
 	hasSupport: hasListViewSupport,
 	attributeKeys: [],
+	supportsPatternEditing: true,
 };

package/src/hooks/utils.js

@@ -19,6 +19,7 @@ import {
 	useBlockEditContext,
 	mayDisplayControlsKey,
 	mayDisplayParentControlsKey,
+	mayDisplayPatternEditingControlsKey,
 } from '../components/block-edit/context';
 import { useSettings } from '../components';
 import { useSettingsForBlockElement } from '../components/global-styles/hooks';
@@ -534,8 +535,11 @@ export function createBlockEditFilter( features ) {
 						hasSupport,
 						attributeKeys = [],
 						shareWithChildBlocks,
+						supportsPatternEditing,
 					} = feature;
 					const shouldDisplayControls =
+						( supportsPatternEditing &&
+							context[ mayDisplayPatternEditingControlsKey ] ) ||
 						context[ mayDisplayControlsKey ] ||
 						( context[ mayDisplayParentControlsKey ] &&
 							shareWithChildBlocks );

package/src/store/selectors.js

@@ -2279,13 +2279,21 @@ export const getInserterItems = createRegistrySelector( ( select ) =>
 						)
 				);
 			} else {
+				const { getClosestAllowedInsertionPoint } = unlock(
+					select( STORE_NAME )
+				);
 				blockTypeInserterItems = blockTypeInserterItems
-					.filter( ( blockType ) =>
-						isBlockVisibleInTheInserter(
-							state,
-							blockType,
-							rootClientId
-						)
+					.filter(
+						( blockType ) =>
+							isBlockVisibleInTheInserter(
+								state,
+								blockType,
+								rootClientId
+							) &&
+							getClosestAllowedInsertionPoint(
+								blockType.name,
+								rootClientId
+							) !== null
 					)
 					.map( ( blockType ) => ( {
 						...blockType,