@wordpress/block-editor 12.0.0 → 12.2.0

package/src/components/block-switcher/block-variation-transformations.js

@@ -0,0 +1,115 @@
+/**
+ * WordPress dependencies
+ */
+import { MenuItem } from '@wordpress/components';
+import {
+	getBlockMenuDefaultClassName,
+	cloneBlock,
+	store as blocksStore,
+} from '@wordpress/blocks';
+import { useSelect } from '@wordpress/data';
+import { useState, useMemo } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../../store';
+import BlockIcon from '../block-icon';
+import PreviewBlockPopover from './preview-block-popover';
+
+const EMPTY_OBJECT = {};
+
+export function useBlockVariationTransforms( { clientIds, blocks } ) {
+	const { activeBlockVariation, blockVariationTransformations } = useSelect(
+		( select ) => {
+			const {
+				getBlockRootClientId,
+				getBlockAttributes,
+				canRemoveBlocks,
+			} = select( blockEditorStore );
+			const { getActiveBlockVariation, getBlockVariations } =
+				select( blocksStore );
+			const rootClientId = getBlockRootClientId(
+				Array.isArray( clientIds ) ? clientIds[ 0 ] : clientIds
+			);
+			const canRemove = canRemoveBlocks( clientIds, rootClientId );
+			// Only handle single selected blocks for now.
+			if ( blocks.length !== 1 || ! canRemove ) {
+				return EMPTY_OBJECT;
+			}
+			const [ firstBlock ] = blocks;
+			return {
+				blockVariationTransformations: getBlockVariations(
+					firstBlock.name,
+					'transform'
+				),
+				activeBlockVariation: getActiveBlockVariation(
+					firstBlock.name,
+					getBlockAttributes( firstBlock.clientId )
+				),
+			};
+		},
+		[ clientIds, blocks ]
+	);
+	const transformations = useMemo( () => {
+		return blockVariationTransformations?.filter(
+			( { name } ) => name !== activeBlockVariation?.name
+		);
+	}, [ blockVariationTransformations, activeBlockVariation ] );
+	return transformations;
+}
+
+const BlockVariationTransformations = ( {
+	transformations,
+	onSelect,
+	blocks,
+} ) => {
+	const [ hoveredTransformItemName, setHoveredTransformItemName ] =
+		useState();
+	return (
+		<>
+			{ hoveredTransformItemName && (
+				<PreviewBlockPopover
+					blocks={ cloneBlock(
+						blocks[ 0 ],
+						transformations.find(
+							( { name } ) => name === hoveredTransformItemName
+						).attributes
+					) }
+				/>
+			) }
+			{ transformations?.map( ( item ) => (
+				<BlockVariationTranformationItem
+					key={ item.name }
+					item={ item }
+					onSelect={ onSelect }
+					setHoveredTransformItemName={ setHoveredTransformItemName }
+				/>
+			) ) }
+		</>
+	);
+};
+
+function BlockVariationTranformationItem( {
+	item,
+	onSelect,
+	setHoveredTransformItemName,
+} ) {
+	const { name, icon, title } = item;
+	return (
+		<MenuItem
+			className={ getBlockMenuDefaultClassName( name ) }
+			onClick={ ( event ) => {
+				event.preventDefault();
+				onSelect( name );
+			} }
+			onMouseLeave={ () => setHoveredTransformItemName( null ) }
+			onMouseEnter={ () => setHoveredTransformItemName( name ) }
+		>
+			<BlockIcon icon={ icon } showColors />
+			{ title }
+		</MenuItem>
+	);
+}
+
+export default BlockVariationTransformations;

package/src/components/block-switcher/index.js

@@ -24,12 +24,14 @@ import { store as blockEditorStore } from '../../store';
 import useBlockDisplayInformation from '../use-block-display-information';
 import BlockIcon from '../block-icon';
 import BlockTransformationsMenu from './block-transformations-menu';
+import { useBlockVariationTransforms } from './block-variation-transformations';
 import BlockStylesMenu from './block-styles-menu';
 import PatternTransformationsMenu from './pattern-transformations-menu';
 import useBlockDisplayTitle from '../block-title/use-block-display-title';
 
 export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
-	const { replaceBlocks, multiSelect } = useDispatch( blockEditorStore );
+	const { replaceBlocks, multiSelect, updateBlockAttributes } =
+		useDispatch( blockEditorStore );
 	const blockInformation = useBlockDisplayInformation( blocks[ 0 ].clientId );
 	const {
 		possibleBlockTransformations,
@@ -43,9 +45,9 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 				getBlockRootClientId,
 				getBlockTransformItems,
 				__experimentalGetPatternTransformItems,
+				canRemoveBlocks,
 			} = select( blockEditorStore );
 			const { getBlockStyles, getBlockType } = select( blocksStore );
-			const { canRemoveBlocks } = select( blockEditorStore );
 			const rootClientId = getBlockRootClientId(
 				Array.isArray( clientIds ) ? clientIds[ 0 ] : clientIds
 			);
@@ -82,6 +84,11 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 		[ clientIds, blocks, blockInformation?.icon ]
 	);
 
+	const blockVariationTransformations = useBlockVariationTransforms( {
+		clientIds,
+		blocks,
+	} );
+
 	const blockTitle = useBlockDisplayTitle( {
 		clientId: Array.isArray( clientIds ) ? clientIds[ 0 ] : clientIds,
 		maximumLength: 35,
@@ -105,6 +112,14 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 		selectForMultipleBlocks( newBlocks );
 	}
 
+	function onBlockVariationTransform( name ) {
+		updateBlockAttributes( blocks[ 0 ].clientId, {
+			...blockVariationTransformations.find(
+				( { name: variationName } ) => variationName === name
+			).attributes,
+		} );
+	}
+
 	// Pattern transformation through the `Patterns` API.
 	function onPatternTransform( transformedBlocks ) {
 		replaceBlocks( clientIds, transformedBlocks );
@@ -118,8 +133,14 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 	 */
 	const hasPossibleBlockTransformations =
 		!! possibleBlockTransformations.length && canRemove && ! isTemplate;
+	const hasPossibleBlockVariationTransformations =
+		!! blockVariationTransformations?.length;
 	const hasPatternTransformation = !! patterns?.length && canRemove;
-	if ( ! hasBlockStyles && ! hasPossibleBlockTransformations ) {
+	if (
+		! hasBlockStyles &&
+		! hasPossibleBlockTransformations &&
+		! hasPossibleBlockVariationTransformations
+	) {
 		return (
 			<ToolbarGroup>
 				<ToolbarButton
@@ -160,9 +181,12 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 					blocks.length
 			  );
 
+	const hasBlockOrBlockVariationTransforms =
+		hasPossibleBlockTransformations ||
+		hasPossibleBlockVariationTransformations;
 	const showDropDown =
 		hasBlockStyles ||
-		hasPossibleBlockTransformations ||
+		hasBlockOrBlockVariationTransforms ||
 		hasPatternTransformation;
 	return (
 		<ToolbarGroup>
@@ -213,17 +237,26 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 											} }
 										/>
 									) }
-									{ hasPossibleBlockTransformations && (
+									{ hasBlockOrBlockVariationTransforms && (
 										<BlockTransformationsMenu
 											className="block-editor-block-switcher__transforms__menugroup"
 											possibleBlockTransformations={
 												possibleBlockTransformations
 											}
+											possibleBlockVariationTransformations={
+												blockVariationTransformations
+											}
 											blocks={ blocks }
 											onSelect={ ( name ) => {
 												onBlockTransform( name );
 												onClose();
 											} }
+											onSelectVariation={ ( name ) => {
+												onBlockVariationTransform(
+													name
+												);
+												onClose();
+											} }
 										/>
 									) }
 									{ hasBlockStyles && (

package/src/components/block-switcher/pattern-transformations-menu.js

@@ -105,15 +105,15 @@ function BlockPattern( { pattern, onSelect, composite } ) {
 		`${ baseClassName }-list__item-description`
 	);
 	return (
-		<div
-			className={ `${ baseClassName }-list__list-item` }
-			aria-label={ pattern.title }
-			aria-describedby={ pattern.description ? descriptionId : undefined }
-		>
+		<div className={ `${ baseClassName }-list__list-item` }>
 			<CompositeItem
 				role="option"
 				as="div"
 				{ ...composite }
+				aria-label={ pattern.title }
+				aria-describedby={
+					pattern.description ? descriptionId : undefined
+				}
 				className={ `${ baseClassName }-list__item` }
 				onClick={ () => onSelect( pattern.transformedBlocks ) }
 			>

package/src/components/block-switcher/style.scss

@@ -109,19 +109,20 @@
 	}
 
 	.components-popover__content {
-		box-shadow: none;
+		width: 300px;
 		border: $border-width solid $gray-900;
 		background: $white;
 		border-radius: $radius-block-ui;
 		outline: none;
+		box-shadow: none;
 	}
 
 	.block-editor-block-switcher__preview {
-		width: 300px;
-		height: auto;
-		// Subtract margin from max-height.
+		// Subtract vertical margin from max-height.
 		max-height: calc(500px - #{$grid-unit-40});
-		margin: $grid-unit-20;
+		margin: $grid-unit-20 0;
+		// Use padding to prevent the pattern previews focus style from being cut-off.
+		padding: 0 $grid-unit-20;
 		overflow: hidden;
 	}
 }

package/src/components/block-toolbar/index.js

@@ -32,6 +32,7 @@ import BlockEditVisuallyButton from '../block-edit-visually-button';
 import { useShowMoversGestures } from './utils';
 import { store as blockEditorStore } from '../../store';
 import __unstableBlockNameContext from './block-name-context';
+import { unlock } from '../../lock-unlock';
 
 const BlockToolbar = ( { hideDragHandle } ) => {
 	const {
@@ -42,7 +43,7 @@ const BlockToolbar = ( { hideDragHandle } ) => {
 		isDistractionFree,
 		isValid,
 		isVisual,
-		isContentLocked,
+		blockEditingMode,
 	} = useSelect( ( select ) => {
 		const {
 			getBlockName,
@@ -51,8 +52,8 @@ const BlockToolbar = ( { hideDragHandle } ) => {
 			isBlockValid,
 			getBlockRootClientId,
 			getSettings,
-			__unstableGetContentLockingParent,
-		} = select( blockEditorStore );
+			getBlockEditingMode,
+		} = unlock( select( blockEditorStore ) );
 		const selectedBlockClientIds = getSelectedBlockClientIds();
 		const selectedBlockClientId = selectedBlockClientIds[ 0 ];
 		const blockRootClientId = getBlockRootClientId( selectedBlockClientId );
@@ -73,9 +74,7 @@ const BlockToolbar = ( { hideDragHandle } ) => {
 			isVisual: selectedBlockClientIds.every(
 				( id ) => getBlockMode( id ) === 'visual'
 			),
-			isContentLocked: !! __unstableGetContentLockingParent(
-				selectedBlockClientId
-			),
+			blockEditingMode: getBlockEditingMode( selectedBlockClientId ),
 		};
 	}, [] );
 
@@ -125,12 +124,12 @@ const BlockToolbar = ( { hideDragHandle } ) => {
 
 	return (
 		<div className={ classes }>
-			{ ! isMultiToolbar && isLargeViewport && ! isContentLocked && (
-				<BlockParentSelector />
-			) }
+			{ ! isMultiToolbar &&
+				isLargeViewport &&
+				blockEditingMode === 'default' && <BlockParentSelector /> }
 			<div ref={ nodeRef } { ...showMoversGestures }>
 				{ ( shouldShowVisualToolbar || isMultiToolbar ) &&
-					! isContentLocked && (
+					blockEditingMode === 'default' && (
 						<ToolbarGroup className="block-editor-block-toolbar__block-controls">
 							<BlockSwitcher clientIds={ blockClientIds } />
 							{ ! isMultiToolbar && (
@@ -175,7 +174,7 @@ const BlockToolbar = ( { hideDragHandle } ) => {
 				</>
 			) }
 			<BlockEditVisuallyButton clientIds={ blockClientIds } />
-			{ ! isContentLocked && (
+			{ blockEditingMode === 'default' && (
 				<BlockSettingsMenu clientIds={ blockClientIds } />
 			) }
 		</div>

package/src/components/block-tools/block-contextual-toolbar.js

@@ -7,7 +7,7 @@ import classnames from 'classnames';
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { forwardRef, useEffect, useRef, useState } from '@wordpress/element';
+import { useEffect, useRef, useState } from '@wordpress/element';
 import { hasBlockSupport, store as blocksStore } from '@wordpress/blocks';
 import { useSelect } from '@wordpress/data';
 import {
@@ -25,62 +25,22 @@ import NavigableToolbar from '../navigable-toolbar';
 import BlockToolbar from '../block-toolbar';
 import { store as blockEditorStore } from '../../store';
 import BlockIcon from '../block-icon';
-
-const CollapseFixedToolbarButton = forwardRef( ( { onClick }, ref ) => {
-	return (
-		<ToolbarItem
-			as={ ToolbarButton }
-			className="block-editor-block-toolbar__collapse-fixed-toolbar"
-			icon={ levelUp }
-			onClick={ onClick }
-			ref={ ref }
-			label={ __( 'Show document tools' ) }
-		/>
-	);
-} );
-
-const ExpandFixedToolbarButton = forwardRef( ( { onClick, icon }, ref ) => {
-	return (
-		<ToolbarItem
-			as={ ToolbarButton }
-			className="block-editor-block-toolbar__expand-fixed-toolbar"
-			icon={ <BlockIcon icon={ icon } /> }
-			onClick={ onClick }
-			ref={ ref }
-			label={ __( 'Show block tools' ) }
-		/>
-	);
-} );
+import { unlock } from '../../lock-unlock';
 
 function BlockContextualToolbar( { focusOnMount, isFixed, ...props } ) {
 	// When the toolbar is fixed it can be collapsed
 	const [ isCollapsed, setIsCollapsed ] = useState( false );
-	const expandFixedToolbarButtonRef = useRef();
-	const collapseFixedToolbarButtonRef = useRef();
-
-	// Don't focus the block toolbar just because it mounts
-	const initialRender = useRef( true );
-	useEffect( () => {
-		if ( initialRender.current ) {
-			initialRender.current = false;
-			return;
-		}
-		if ( isCollapsed && expandFixedToolbarButtonRef.current ) {
-			expandFixedToolbarButtonRef.current.focus();
-		}
-		if ( ! isCollapsed && collapseFixedToolbarButtonRef.current ) {
-			collapseFixedToolbarButtonRef.current.focus();
-		}
-	}, [ isCollapsed ] );
+	const toolbarButtonRef = useRef();
 
+	const isLargeViewport = useViewportMatch( 'medium' );
 	const { blockType, hasParents, showParentSelector, selectedBlockClientId } =
 		useSelect( ( select ) => {
 			const {
 				getBlockName,
 				getBlockParents,
 				getSelectedBlockClientIds,
-				__unstableGetContentLockingParent,
-			} = select( blockEditorStore );
+				getBlockEditingMode,
+			} = unlock( select( blockEditorStore ) );
 			const { getBlockType } = select( blocksStore );
 			const selectedBlockClientIds = getSelectedBlockClientIds();
 			const _selectedBlockClientId = selectedBlockClientIds[ 0 ];
@@ -103,9 +63,7 @@ function BlockContextualToolbar( { focusOnMount, isFixed, ...props } ) {
 						true
 					) &&
 					selectedBlockClientIds.length <= 1 &&
-					! __unstableGetContentLockingParent(
-						_selectedBlockClientId
-					),
+					getBlockEditingMode( _selectedBlockClientId ) === 'default',
 			};
 		}, [] );
 
@@ -113,12 +71,11 @@ function BlockContextualToolbar( { focusOnMount, isFixed, ...props } ) {
 		setIsCollapsed( false );
 	}, [ selectedBlockClientId ] );
 
-	const isLargeViewport = useViewportMatch( 'medium' );
-
-	if ( blockType ) {
-		if ( ! hasBlockSupport( blockType, '__experimentalToolbar', true ) ) {
-			return null;
-		}
+	if (
+		blockType &&
+		! hasBlockSupport( blockType, '__experimentalToolbar', true )
+	) {
+		return null;
 	}
 
 	// Shifts the toolbar to make room for the parent block selector.
@@ -144,18 +101,26 @@ function BlockContextualToolbar( { focusOnMount, isFixed, ...props } ) {
 							: 'block-editor-block-toolbar__group-collapse-fixed-toolbar'
 					}
 				>
-					{ isCollapsed ? (
-						<ExpandFixedToolbarButton
-							onClick={ () => setIsCollapsed( false ) }
-							icon={ blockType.icon }
-							ref={ expandFixedToolbarButtonRef }
-						/>
-					) : (
-						<CollapseFixedToolbarButton
-							onClick={ () => setIsCollapsed( true ) }
-							ref={ collapseFixedToolbarButtonRef }
-						/>
-					) }
+					<ToolbarItem
+						as={ ToolbarButton }
+						ref={ toolbarButtonRef }
+						icon={
+							isCollapsed ? (
+								<BlockIcon icon={ blockType.icon } />
+							) : (
+								levelUp
+							)
+						}
+						onClick={ () => {
+							setIsCollapsed( ( collapsed ) => ! collapsed );
+							toolbarButtonRef.current.focus();
+						} }
+						label={
+							isCollapsed
+								? __( 'Show block tools' )
+								: __( 'Show document tools' )
+						}
+					/>
 				</ToolbarGroup>
 			) }
 			{ ! isCollapsed && <BlockToolbar hideDragHandle={ isFixed } /> }

package/src/components/block-tools/insertion-point.js

@@ -198,16 +198,30 @@ function InbetweenInsertionPointPopover( {
 }
 
 export default function InsertionPoint( props ) {
-	const { insertionPoint, isVisible } = useSelect( ( select ) => {
-		const { getBlockInsertionPoint, isBlockInsertionPointVisible } =
-			select( blockEditorStore );
-		return {
-			insertionPoint: getBlockInsertionPoint(),
-			isVisible: isBlockInsertionPointVisible(),
-		};
-	}, [] );
+	const { insertionPoint, isVisible, isBlockListEmpty } = useSelect(
+		( select ) => {
+			const {
+				getBlockInsertionPoint,
+				isBlockInsertionPointVisible,
+				getBlockCount,
+			} = select( blockEditorStore );
+			const blockInsertionPoint = getBlockInsertionPoint();
+			return {
+				insertionPoint: blockInsertionPoint,
+				isVisible: isBlockInsertionPointVisible(),
+				isBlockListEmpty:
+					getBlockCount( blockInsertionPoint?.rootClientId ) === 0,
+			};
+		},
+		[]
+	);
 
-	if ( ! isVisible ) {
+	if (
+		! isVisible ||
+		// Don't render the insertion point if the block list is empty.
+		// The insertion point will be represented by the appender instead.
+		isBlockListEmpty
+	) {
 		return null;
 	}
 

package/src/components/block-tools/selected-block-popover.js

@@ -20,8 +20,7 @@ import { store as blockEditorStore } from '../../store';
 import BlockPopover from '../block-popover';
 import useBlockToolbarPopoverProps from './use-block-toolbar-popover-props';
 import Inserter from '../inserter';
-import { unlock } from '../../lock-unlock';
-import { privateApis } from '../../private-apis';
+import { useShouldContextualToolbarShow } from '../../utils/use-should-contextual-toolbar-show';
 
 function selector( select ) {
 	const {
@@ -29,7 +28,7 @@ function selector( select ) {
 		hasMultiSelection,
 		isTyping,
 		getLastMultiSelectedBlockClientId,
-	} = unlock( select( blockEditorStore ) );
+	} = select( blockEditorStore );
 
 	return {
 		editorMode: __unstableGetEditorMode(),
@@ -54,7 +53,6 @@ function SelectedBlockPopover( {
 		[]
 	);
 
-	const { useShouldContextualToolbarShow } = unlock( privateApis );
 	const isInsertionPointVisible = useSelect(
 		( select ) => {
 			const {
@@ -75,7 +73,7 @@ function SelectedBlockPopover( {
 	);
 	const isToolbarForced = useRef( false );
 	const { shouldShowContextualToolbar, canFocusHiddenToolbar } =
-		useShouldContextualToolbarShow( clientId );
+		useShouldContextualToolbarShow();
 
 	const { stopTyping } = useDispatch( blockEditorStore );
 

package/src/components/block-tools/style.scss

@@ -219,6 +219,14 @@
 					}
 				}
 			}
+
+			.blocks-widgets-container & {
+				margin-left: $grid-unit-80 * 2.4;
+
+				&.is-collapsed {
+					margin-left: $grid-unit-80 * 4.2;
+				}
+			}
 		}
 
 		&.is-fixed .block-editor-block-parent-selector {

package/src/components/button-block-appender/content.scss

@@ -32,6 +32,7 @@
 	}
 }
 
+
 // When the appender shows up in empty container blocks, such as Group and Columns, add an extra click state.
 .block-list-appender:only-child {
 	.is-layout-constrained.block-editor-block-list__block:not(.is-selected) > &,
@@ -56,5 +57,26 @@
 		.block-editor-inserter {
 			visibility: hidden;
 		}
+
+		&.is-drag-over {
+			&::after {
+				border: none;
+			}
+
+			.block-editor-inserter {
+				visibility: visible;
+			}
+		}
+	}
+
+	&.is-drag-over .block-editor-button-block-appender {
+		background-color: var(--wp-admin-theme-color);
+		box-shadow: inset 0 0 0 $border-width $light-gray-placeholder;
+		color: $light-gray-placeholder;
+		transition: background-color 0.2s ease-in-out;
+
+		@media ( prefers-reduced-motion: reduce ) {
+			transition: none;
+		}
 	}
 }

package/src/components/colors-gradients/use-multiple-origin-colors-and-gradients.js

@@ -61,7 +61,12 @@ export default function useMultipleOriginColorsAndGradients() {
 			} );
 		}
 		return result;
-	}, [ defaultColors, themeColors, customColors ] );
+	}, [
+		defaultColors,
+		themeColors,
+		customColors,
+		shouldDisplayDefaultColors,
+	] );
 
 	const customGradients = useSetting( 'color.gradients.custom' );
 	const themeGradients = useSetting( 'color.gradients.theme' );
@@ -103,7 +108,16 @@ export default function useMultipleOriginColorsAndGradients() {
 			} );
 		}
 		return result;
-	}, [ customGradients, themeGradients, defaultGradients ] );
+	}, [
+		customGradients,
+		themeGradients,
+		defaultGradients,
+		shouldDisplayDefaultGradients,
+	] );
+
+	colorGradientSettings.hasColorsOrGradients =
+		!! colorGradientSettings.colors.length ||
+		!! colorGradientSettings.gradients.length;
 
 	return colorGradientSettings;
 }

package/src/components/convert-to-group-buttons/index.js

@@ -17,6 +17,7 @@ function ConvertToGroupButton( {
 	clientIds,
 	isGroupable,
 	isUngroupable,
+	onUngroup,
 	blocksSelection,
 	groupingBlockName,
 	onClose = () => {},
@@ -34,10 +35,16 @@ function ConvertToGroupButton( {
 	};
 
 	const onConvertFromGroup = () => {
-		const innerBlocks = blocksSelection[ 0 ].innerBlocks;
+		let innerBlocks = blocksSelection[ 0 ].innerBlocks;
 		if ( ! innerBlocks.length ) {
 			return;
 		}
+		if ( onUngroup ) {
+			innerBlocks = onUngroup(
+				blocksSelection[ 0 ].attributes,
+				blocksSelection[ 0 ].innerBlocks
+			);
+		}
 		replaceBlocks( clientIds, innerBlocks );
 	};
 
@@ -66,7 +73,7 @@ function ConvertToGroupButton( {
 				>
 					{ _x(
 						'Ungroup',
-						'Ungrouping blocks from within a Group block back into individual blocks within the Editor '
+						'Ungrouping blocks from within a grouping block back into individual blocks within the Editor '
 					) }
 				</MenuItem>
 			) }