@wordpress/block-library 9.36.1-next.738bb1424.0 → 9.36.2-next.8fd3f8831.0

package/src/query/edit/query-toolbar.js

@@ -7,50 +7,66 @@ import {
 	__experimentalDropdownContentWrapper as DropdownContentWrapper,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
+import { useSelect } from '@wordpress/data';
+import {
+	BlockControls,
+	store as blockEditorStore,
+} from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
  */
 import PatternSelection, { useBlockPatterns } from './pattern-selection';
+import { unlock } from '../../lock-unlock';
 
-export default function QueryToolbar( {
-	clientId,
-	attributes,
-	hasInnerBlocks,
-} ) {
+function PatternPicker( { clientId, attributes, hasInnerBlocks } ) {
 	const hasPatterns = useBlockPatterns( clientId, attributes ).length;
 	if ( ! hasPatterns ) {
 		return null;
 	}
-
 	const buttonLabel = hasInnerBlocks
 		? __( 'Change design' )
 		: __( 'Choose pattern' );
-
 	return (
-		<DropdownContentWrapper>
-			<Dropdown
-				contentClassName="block-editor-block-settings-menu__popover"
-				focusOnMount="firstElement"
-				expandOnMobile
-				renderToggle={ ( { isOpen, onToggle } ) => (
-					<ToolbarButton
-						aria-haspopup="true"
-						aria-expanded={ isOpen }
-						onClick={ onToggle }
-					>
-						{ buttonLabel }
-					</ToolbarButton>
-				) }
-				renderContent={ () => (
-					<PatternSelection
-						clientId={ clientId }
-						attributes={ attributes }
-						showSearch={ false }
-						showTitlesAsTooltip
-					/>
-				) }
-			/>
-		</DropdownContentWrapper>
+		<BlockControls group="other">
+			<DropdownContentWrapper>
+				<Dropdown
+					contentClassName="block-editor-block-settings-menu__popover"
+					focusOnMount="firstElement"
+					expandOnMobile
+					renderToggle={ ( { isOpen, onToggle } ) => (
+						<ToolbarButton
+							aria-haspopup="true"
+							aria-expanded={ isOpen }
+							onClick={ onToggle }
+						>
+							{ buttonLabel }
+						</ToolbarButton>
+					) }
+					renderContent={ () => (
+						<PatternSelection
+							clientId={ clientId }
+							attributes={ attributes }
+							showSearch={ false }
+							showTitlesAsTooltip
+						/>
+					) }
+				/>
+			</DropdownContentWrapper>
+		</BlockControls>
+	);
+}
+
+export default function QueryToolbar( props ) {
+	const isLocked = useSelect(
+		( select ) => {
+			const { isLockedBlock } = unlock( select( blockEditorStore ) );
+			return isLockedBlock( props.clientId );
+		},
+		[ props.clientId ]
 	);
+	if ( isLocked ) {
+		return null;
+	}
+	return <PatternPicker { ...props } />;
 }

package/src/social-links/block.json

@@ -95,7 +95,8 @@
 				"style": true
 			}
 		},
-		"contentRole": true
+		"contentRole": true,
+		"listView": true
 	},
 	"styles": [
 		{ "name": "default", "label": "Default", "isDefault": true },

package/src/term-template/index.php

@@ -59,7 +59,7 @@ function render_block_core_term_template( $attributes, $content, $block ) {
 			$query_args['include'] = array_unique( array_map( 'intval', $query['include'] ) );
 			$query_args['orderby'] = 'include';
 			$query_args['order']   = 'asc';
-		} elseif ( empty( $query['showNested'] ) ) {
+		} elseif ( is_taxonomy_hierarchical( $query['taxonomy'] ) && empty( $query['showNested'] ) ) {
 			// We set parent only when inheriting from the taxonomy archive context or not
 			// showing nested terms, otherwise nested terms are not displayed.
 			$query_args['parent'] = 0;