prep build 3/6

changelog.txt

@@ -1,5 +1,16 @@
 == Changelog ==
 
+= 20.0.4 =
+
+## Changelog
+
+### Bug Fixes
+
+#### Interactivity API
+
+- iAPI Router: Revert "Handle styles assets on region-based navigation" (#69222)
+
+
 = 20.4.0 =
 
 ## Changelog

lib/experiments-page.php

@@ -86,7 +86,7 @@ function gutenberg_initialize_experiments_settings() {
 		'gutenberg-experiments',
 		'gutenberg_experiments_section',
 		array(
-			'label' => __( 'Disables the TinyMCE and Classic block', 'gutenberg' ),
+			'label' => __( 'Disables the TinyMCE and Classic block.', 'gutenberg' ),
 			'id'    => 'gutenberg-no-tinymce',
 		)
 	);

packages/block-directory/src/store/selectors.js

@@ -4,10 +4,7 @@
 import { createSelector, createRegistrySelector } from '@wordpress/data';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 
-/**
- * Internal dependencies
- */
-import hasBlockType from './utils/has-block-type';
+const EMPTY_ARRAY = [];
 
 /**
  * Returns true if application is requesting for downloadable blocks.
@@ -30,7 +27,7 @@ export function isRequestingDownloadableBlocks( state, filterValue ) {
  * @return {Array} Downloadable blocks.
  */
 export function getDownloadableBlocks( state, filterValue ) {
-	return state.downloadableBlocks[ filterValue ]?.results ?? [];
+	return state.downloadableBlocks[ filterValue ]?.results ?? EMPTY_ARRAY;
 }
 
 /**
@@ -56,16 +53,33 @@ export function getInstalledBlockTypes( state ) {
 export const getNewBlockTypes = createRegistrySelector( ( select ) =>
 	createSelector(
 		( state ) => {
-			const usedBlockTree = select( blockEditorStore ).getBlocks();
 			const installedBlockTypes = getInstalledBlockTypes( state );
+			if ( ! installedBlockTypes.length ) {
+				return EMPTY_ARRAY;
+			}
 
-			return installedBlockTypes.filter( ( blockType ) =>
-				hasBlockType( blockType, usedBlockTree )
+			const { getBlockName, getClientIdsWithDescendants } =
+				select( blockEditorStore );
+			const installedBlockNames = installedBlockTypes.map(
+				( blockType ) => blockType.name
+			);
+			const foundBlockNames = getClientIdsWithDescendants().flatMap(
+				( clientId ) => {
+					const blockName = getBlockName( clientId );
+					return installedBlockNames.includes( blockName )
+						? blockName
+						: [];
+				}
+			);
+			const newBlockTypes = installedBlockTypes.filter( ( blockType ) =>
+				foundBlockNames.includes( blockType.name )
 			);
+
+			return newBlockTypes.length > 0 ? newBlockTypes : EMPTY_ARRAY;
 		},
 		( state ) => [
 			getInstalledBlockTypes( state ),
-			select( blockEditorStore ).getBlocks(),
+			select( blockEditorStore ).getClientIdsWithDescendants(),
 		]
 	)
 );
@@ -81,16 +95,33 @@ export const getNewBlockTypes = createRegistrySelector( ( select ) =>
 export const getUnusedBlockTypes = createRegistrySelector( ( select ) =>
 	createSelector(
 		( state ) => {
-			const usedBlockTree = select( blockEditorStore ).getBlocks();
 			const installedBlockTypes = getInstalledBlockTypes( state );
+			if ( ! installedBlockTypes.length ) {
+				return EMPTY_ARRAY;
+			}
 
-			return installedBlockTypes.filter(
-				( blockType ) => ! hasBlockType( blockType, usedBlockTree )
+			const { getBlockName, getClientIdsWithDescendants } =
+				select( blockEditorStore );
+			const installedBlockNames = installedBlockTypes.map(
+				( blockType ) => blockType.name
+			);
+			const foundBlockNames = getClientIdsWithDescendants().flatMap(
+				( clientId ) => {
+					const blockName = getBlockName( clientId );
+					return installedBlockNames.includes( blockName )
+						? blockName
+						: [];
+				}
 			);
+			const unusedBlockTypes = installedBlockTypes.filter(
+				( blockType ) => ! foundBlockNames.includes( blockType.name )
+			);
+
+			return unusedBlockTypes.length > 0 ? unusedBlockTypes : EMPTY_ARRAY;
 		},
 		( state ) => [
 			getInstalledBlockTypes( state ),
-			select( blockEditorStore ).getBlocks(),
+			select( blockEditorStore ).getClientIdsWithDescendants(),
 		]
 	)
 );

packages/block-directory/src/store/test/fixtures/index.js

@@ -48,3 +48,9 @@ export const blockList = [
 		innerBlocks: [],
 	},
 ];
+
+export const blockListIds = blockList.map( ( block ) => block.clientId );
+export const blockListNameMap = blockList.reduce( ( acc, block ) => {
+	acc[ block.clientId ] = block.name;
+	return acc;
+}, {} );

packages/block-directory/src/store/test/selectors.js

@@ -2,7 +2,8 @@
  * Internal dependencies
  */
 import {
-	blockList,
+	blockListIds,
+	blockListNameMap,
 	blockTypeInstalled,
 	blockTypeUnused,
 	downloadableBlock,
@@ -90,7 +91,10 @@ describe( 'selectors', () => {
 	describe( 'getNewBlockTypes', () => {
 		it( 'should retrieve the block types that are installed and in the post content', () => {
 			getNewBlockTypes.registry = {
-				select: jest.fn( () => ( { getBlocks: () => blockList } ) ),
+				select: jest.fn( () => ( {
+					getBlockName: ( clientId ) => blockListNameMap[ clientId ],
+					getClientIdsWithDescendants: () => blockListIds,
+				} ) ),
 			};
 			const state = {
 				blockManagement: {
@@ -107,7 +111,10 @@ describe( 'selectors', () => {
 
 		it( 'should return an empty array if no blocks are used', () => {
 			getNewBlockTypes.registry = {
-				select: jest.fn( () => ( { getBlocks: () => [] } ) ),
+				select: jest.fn( () => ( {
+					getBlockName: ( clientId ) => blockListNameMap[ clientId ],
+					getClientIdsWithDescendants: () => [],
+				} ) ),
 			};
 			const state = {
 				blockManagement: {
@@ -125,7 +132,10 @@ describe( 'selectors', () => {
 	describe( 'getUnusedBlockTypes', () => {
 		it( 'should retrieve the block types that are installed but not used', () => {
 			getUnusedBlockTypes.registry = {
-				select: jest.fn( () => ( { getBlocks: () => blockList } ) ),
+				select: jest.fn( () => ( {
+					getBlockName: ( clientId ) => blockListNameMap[ clientId ],
+					getClientIdsWithDescendants: () => blockListIds,
+				} ) ),
 			};
 			const state = {
 				blockManagement: {
@@ -142,7 +152,10 @@ describe( 'selectors', () => {
 
 		it( 'should return all block types if no blocks are used', () => {
 			getUnusedBlockTypes.registry = {
-				select: jest.fn( () => ( { getBlocks: () => [] } ) ),
+				select: jest.fn( () => ( {
+					getBlockName: ( clientId ) => blockListNameMap[ clientId ],
+					getClientIdsWithDescendants: () => [],
+				} ) ),
 			};
 			const state = {
 				blockManagement: {

packages/block-editor/src/components/block-variation-transforms/index.js

@@ -86,15 +86,13 @@ function VariationsDropdown( {
 			toggleProps={ { iconPosition: 'right' } }
 		>
 			{ () => (
-				<div className={ `${ className }__container` }>
-					<MenuGroup>
-						<MenuItemsChoice
-							choices={ selectOptions }
-							value={ selectedValue }
-							onSelect={ onSelectVariation }
-						/>
-					</MenuGroup>
-				</div>
+				<MenuGroup>
+					<MenuItemsChoice
+						choices={ selectOptions }
+						value={ selectedValue }
+						onSelect={ onSelectVariation }
+					/>
+				</MenuGroup>
 			) }
 		</DropdownMenu>
 	);

packages/block-editor/src/components/global-styles/filters-panel.js

@@ -124,7 +124,10 @@ const renderToggle =
 
 		const toggleProps = {
 			onClick: onToggle,
-			className: clsx( { 'is-open': isOpen } ),
+			className: clsx(
+				'block-editor-global-styles-filters-panel__dropdown-toggle',
+				{ 'is-open': isOpen }
+			),
 			'aria-expanded': isOpen,
 			ref: duotoneButtonRef,
 		};

packages/block-editor/src/components/global-styles/shadow-panel-components.js

@@ -141,7 +141,10 @@ function renderShadowToggle( shadow, onShadowChange ) {
 
 		const toggleProps = {
 			onClick: onToggle,
-			className: clsx( { 'is-open': isOpen } ),
+			className: clsx(
+				'block-editor-global-styles__shadow-dropdown-toggle',
+				{ 'is-open': isOpen }
+			),
 			'aria-expanded': isOpen,
 			ref: shadowButtonRef,
 		};

packages/block-editor/src/components/global-styles/style.scss

@@ -25,14 +25,15 @@
 	display: block;
 	padding: 0;
 	position: relative;
+}
 
-	button {
-		width: 100%;
-		padding: $grid-unit-10;
+.block-editor-global-styles-filters-panel__dropdown-toggle,
+.block-editor-global-styles__shadow-dropdown-toggle {
+	width: 100%;
+	padding: $grid-unit-10;
 
-		&.is-open {
-			background-color: $gray-100;
-		}
+	&.is-open {
+		background-color: $gray-100;
 	}
 }
 

packages/block-library/src/archives/edit.js

@@ -30,7 +30,7 @@ export default function ArchivesEdit( { attributes, setAttributes } ) {
 					resetAll={ () => {
 						setAttributes( {
 							displayAsDropdown: false,
-							showLabel: false,
+							showLabel: true,
 							showPostCounts: false,
 							type: 'monthly',
 						} );
@@ -63,7 +63,7 @@ export default function ArchivesEdit( { attributes, setAttributes } ) {
 							isShownByDefault
 							hasValue={ () => ! showLabel }
 							onDeselect={ () =>
-								setAttributes( { showLabel: false } )
+								setAttributes( { showLabel: true } )
 							}
 						>
 							<ToggleControl

packages/block-library/src/post-author-name/edit.js

@@ -132,15 +132,15 @@ function PostAuthorNameEdit( {
 				</ToolsPanel>
 			</InspectorControls>
 			<div { ...blockProps }>
-				{ supportsAuthor
-					? displayAuthor
-					: sprintf(
+				{ ! supportsAuthor && postType !== undefined
+					? sprintf(
 							// translators: %s: Name of the post type e.g: "post".
 							__(
 								'This post type (%s) does not support the author.'
 							),
 							postType
-					  ) }
+					  )
+					: displayAuthor }
 			</div>
 		</>
 	);

packages/block-library/src/post-author/edit.js

@@ -99,7 +99,7 @@ function PostAuthorEdit( {
 	const showAuthorControl =
 		!! postId && ! isDescendentOfQueryLoop && authorOptions.length > 0;
 
-	if ( ! supportsAuthor ) {
+	if ( ! supportsAuthor && postType !== undefined ) {
 		return (
 			<div { ...blockProps }>
 				{ sprintf(

packages/block-library/src/spacer/constants.js

@@ -1,2 +1 @@
 export const MIN_SPACER_SIZE = 0;
-export const DEFAULT_HEIGHT = '100px';