Hide parent selector in widget area (#26011)

* Hide parent selector in widget area * Only hide when parent is widget-area * Move to supports and rename it to experimental
WordPress · Oct 15, 2020 · 0f978d2 · 0f978d2
1 parent f5bca16
commit 0f978d2
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 15 deletions.
diff --git a/packages/block-editor/src/components/block-parent-selector/index.js b/packages/block-editor/src/components/block-parent-selector/index.js
@@ -19,21 +19,35 @@ import BlockIcon from '../block-icon';
  */
 export default function BlockParentSelector() {
 	const { selectBlock } = useDispatch( 'core/block-editor' );
-	const { parentBlockType, firstParentClientId } = useSelect( ( select ) => {
-		const {
-			getBlockName,
-			getBlockParents,
-			getSelectedBlockClientId,
-		} = select( 'core/block-editor' );
-		const selectedBlockClientId = getSelectedBlockClientId();
-		const parents = getBlockParents( selectedBlockClientId );
-		const _firstParentClientId = parents[ parents.length - 1 ];
-		const parentBlockName = getBlockName( _firstParentClientId );
-		return {
-			parentBlockType: getBlockType( parentBlockName ),
-			firstParentClientId: _firstParentClientId,
-		};
-	}, [] );
+	const { parentBlockType, firstParentClientId, shouldHide } = useSelect(
+		( select ) => {
+			const {
+				getBlockName,
+				getBlockParents,
+				getSelectedBlockClientId,
+			} = select( 'core/block-editor' );
+			const { hasBlockSupport } = select( 'core/blocks' );
+			const selectedBlockClientId = getSelectedBlockClientId();
+			const parents = getBlockParents( selectedBlockClientId );
+			const _firstParentClientId = parents[ parents.length - 1 ];
+			const parentBlockName = getBlockName( _firstParentClientId );
+			const _parentBlockType = getBlockType( parentBlockName );
+			return {
+				parentBlockType: _parentBlockType,
+				firstParentClientId: _firstParentClientId,
+				shouldHide: ! hasBlockSupport(
+					parentBlockType,
+					'__experimentalParentSelector',
+					true
+				),
+			};
+		},
+		[]
+	);
+
+	if ( shouldHide ) {
+		return null;
+	}
 
 	if ( firstParentClientId !== undefined ) {
 		return (

diff --git a/packages/edit-widgets/src/blocks/widget-area/index.js b/packages/edit-widgets/src/blocks/widget-area/index.js
@@ -16,5 +16,9 @@ export const settings = {
 	title: __( 'Widget Area' ),
 	description: __( 'A widget area container.' ),
 	__experimentalLabel: ( { name: label } ) => label,
+	supports: {
+		// Should show the parent selector for its children or not. Defaults to true.
+		__experimentalParentSelector: false,
+	},
 	edit,
 };