@wordpress/block-editor 16.1.0 → 16.2.0

package/src/components/inserter/index.js

@@ -1,11 +1,4 @@
-/**
- * External dependencies
- */
 import clsx from 'clsx';
-
-/**
- * WordPress dependencies
- */
 import { speak } from '@wordpress/a11y';
 import { __, _x, sprintf } from '@wordpress/i18n';
 import { Dropdown, Button } from '@wordpress/components';
@@ -17,13 +10,10 @@ import {
 } from '@wordpress/blocks';
 import { forwardRef } from '@wordpress/element';
 import { plus } from '@wordpress/icons';
-
-/**
- * Internal dependencies
- */
 import InserterMenu from './menu';
 import QuickInserter from './quick-inserter';
 import { store as blockEditorStore } from '../../store';
+import { getSiblingBlockAttributes } from '../../utils/sibling-block-attributes';
 import { getAppenderLabel } from './get-appender-label';
 
 const UnforwardedInserterToggle = (
@@ -196,11 +186,7 @@ const UnforwardedInserter = (
 	function insertOnlyAllowedBlock() {
 		const blockName = blockToInsert?.name ?? allowedBlockType.name;
 
-		function getAdjacentBlockAttributes( attributesToCopy ) {
-			if ( ! attributesToCopy?.length ) {
-				return {};
-			}
-
+		function getAdjacentBlockAttributes() {
 			// Find the adjacent block of the same type whose attributes
 			// should be copied: previous sibling when inserting next to
 			// an existing block, otherwise the last child of the root.
@@ -221,15 +207,7 @@ const UnforwardedInserter = (
 				}
 			}
 
-			if ( ! adjacentAttributes ) {
-				return {};
-			}
-
-			return Object.fromEntries(
-				attributesToCopy
-					.filter( ( attr ) => attr in adjacentAttributes )
-					.map( ( attr ) => [ attr, adjacentAttributes[ attr ] ] )
-			);
+			return getSiblingBlockAttributes( blockName, adjacentAttributes );
 		}
 
 		function getInsertionIndex() {
@@ -255,9 +233,7 @@ const UnforwardedInserter = (
 		// Attempt to augment the inserted block with attributes from an adjacent block.
 		// This ensures styling from nearby blocks is preserved in the newly inserted block.
 		// See: https://github.com/WordPress/gutenberg/issues/37904
-		const newAttributes = getAdjacentBlockAttributes(
-			blockToInsert?.attributesToCopy
-		);
+		const newAttributes = getAdjacentBlockAttributes();
 
 		const newBlock = createBlock( blockName, {
 			...blockToInsert?.attributes,

package/src/components/inserter/library.js

@@ -1,12 +1,5 @@
-/**
- * WordPress dependencies
- */
 import { useSelect } from '@wordpress/data';
 import { forwardRef } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
 import { PrivateInserterMenu } from './menu';
 import { store as blockEditorStore } from '../../store';
 

package/src/components/inserter/media-tab/hooks.js

@@ -1,12 +1,5 @@
-/**
- * WordPress dependencies
- */
 import { useEffect, useState, useRef } from '@wordpress/element';
 import { useSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
 import { store as blockEditorStore } from '../../../store';
 import { unlock } from '../../../lock-unlock';
 

package/src/components/inserter/media-tab/media-list.js

@@ -1,12 +1,5 @@
-/**
- * WordPress dependencies
- */
 import { Composite } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
-
-/**
- * Internal dependencies
- */
 import { MediaPreview } from './media-preview';
 
 function MediaList( {

package/src/components/inserter/media-tab/media-panel.js

@@ -1,11 +1,4 @@
-/**
- * External dependencies
- */
 import clsx from 'clsx';
-
-/**
- * WordPress dependencies
- */
 import { Button, Modal, Spinner, SearchControl } from '@wordpress/components';
 import { __, _n, sprintf } from '@wordpress/i18n';
 import {
@@ -20,10 +13,6 @@ import { useDispatch } from '@wordpress/data';
 import { getScrollContainer } from '@wordpress/dom';
 import { store as noticesStore } from '@wordpress/notices';
 import { Stack } from '@wordpress/ui';
-
-/**
- * Internal dependencies
- */
 import MediaList from './media-list';
 import MediaUpload from '../../media-upload';
 import MediaUploadCheck from '../../media-upload/check';

package/src/components/inserter/media-tab/media-preview.js

@@ -1,11 +1,4 @@
-/**
- * External dependencies
- */
 import clsx from 'clsx';
-
-/**
- * WordPress dependencies
- */
 import {
 	DropdownMenu,
 	MenuGroup,
@@ -26,12 +19,7 @@ import { useSelect, useDispatch } from '@wordpress/data';
 import { store as noticesStore } from '@wordpress/notices';
 import { isBlobURL } from '@wordpress/blob';
 import { getFilename } from '@wordpress/url';
-
 import { Tooltip } from '@wordpress/ui';
-
-/**
- * Internal dependencies
- */
 import InserterDraggableBlocks from '../../inserter-draggable-blocks';
 import { getBlockAndPreviewFromMedia } from './utils';
 import { store as blockEditorStore } from '../../../store';

package/src/components/inserter/media-tab/media-tab.js

@@ -1,14 +1,7 @@
-/**
- * WordPress dependencies
- */
 import { __ } from '@wordpress/i18n';
 import { useViewportMatch } from '@wordpress/compose';
 import { Button } from '@wordpress/components';
 import { useCallback, useEffect, useMemo } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
 import { MediaCategoryPanel } from './media-panel';
 import MediaUploadCheck from '../../media-upload/check';
 import MediaUpload from '../../media-upload';

package/src/components/inserter/media-tab/test/hooks.js

@@ -1,11 +1,4 @@
-/**
- * External dependencies
- */
 import { renderHook, act, waitFor } from '@testing-library/react';
-
-/**
- * Internal dependencies
- */
 import { useDelayedLoading, useMediaResults } from '../hooks';
 
 describe( 'useDelayedLoading', () => {

package/src/components/inserter/media-tab/test/media-panel.js

@@ -1,11 +1,4 @@
-/**
- * External dependencies
- */
 import { render, screen } from '@testing-library/react';
-
-/**
- * Internal dependencies
- */
 import { MediaCategoryPanel } from '../media-panel';
 
 // Keep the panel's data + async surface out of the test: return a small,

package/src/components/inserter/media-tab/utils.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { createBlock } from '@wordpress/blocks';
 
 const mediaTypeTag = { image: 'img', video: 'video', audio: 'audio' };

package/src/components/inserter/menu.js

@@ -1,11 +1,4 @@
-/**
- * External dependencies
- */
 import clsx from 'clsx';
-
-/**
- * WordPress dependencies
- */
 import {
 	forwardRef,
 	useState,
@@ -20,10 +13,6 @@ import { VisuallyHidden } from '@wordpress/ui';
 import { __ } from '@wordpress/i18n';
 import { useDebouncedInput, useViewportMatch } from '@wordpress/compose';
 import { useSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
 import Tips from './tips';
 import InserterPreviewPanel from './preview-panel';
 import BlockTypesTab from './block-types-tab';

package/src/components/inserter/mobile-tab-navigation.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { __, isRTL } from '@wordpress/i18n';
 import {
 	__experimentalItemGroup as ItemGroup,

package/src/components/inserter/no-results.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { __ } from '@wordpress/i18n';
 
 function InserterNoResults( { children = __( 'No results found.' ) } ) {

package/src/components/inserter/panel.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { Icon as WCIcon } from '@wordpress/components';
 
 function InserterPanel( { title, icon, children } ) {

package/src/components/inserter/preview-panel.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import {
 	isReusableBlock,
 	createBlock,
@@ -8,10 +5,6 @@ import {
 } from '@wordpress/blocks';
 import { useMemo } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
-
-/**
- * Internal dependencies
- */
 import BlockCard from '../block-card';
 import BlockPreview from '../block-preview';
 

package/src/components/inserter/quick-inserter.js

@@ -1,19 +1,8 @@
-/**
- * External dependencies
- */
 import clsx from 'clsx';
-
-/**
- * WordPress dependencies
- */
 import { useState, useEffect } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { Button, SearchControl } from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
 import InserterSearchResults from './search-results';
 import useInsertionPoint from './hooks/use-insertion-point';
 import useBlockTypesState from './hooks/use-block-types-state';

package/src/components/inserter/search-items.js

@@ -1,6 +1,3 @@
-/**
- * External dependencies
- */
 import removeAccents from 'remove-accents';
 import { noCase } from 'change-case';
 

package/src/components/inserter/search-results.js

@@ -1,16 +1,9 @@
-/**
- * WordPress dependencies
- */
 import { useMemo, useEffect } from '@wordpress/element';
 import { __, _n, sprintf } from '@wordpress/i18n';
 import { VisuallyHidden } from '@wordpress/ui';
 import { useDebounce, useAsyncList } from '@wordpress/compose';
 import { speak } from '@wordpress/a11y';
 import { useSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
 import BlockTypesList from '../block-types-list';
 import BlockPatternsList from '../block-patterns-list';
 import __unstableInserterMenuExtension from '../inserter-menu-extension';

package/src/components/inserter/stories/index.story.jsx

@@ -1,11 +1,4 @@
-/**
- * WordPress dependencies
- */
 import { registerCoreBlocks } from '@wordpress/block-library';
-
-/**
- * Internal dependencies
- */
 import BlockLibrary from '../library';
 import { ExperimentalBlockEditorProvider } from '../../provider';
 import { patternCategories, patterns, reusableBlocks } from './utils/fixtures';

package/src/components/inserter/test/get-appender-label.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import { getAppenderLabel } from '../get-appender-label';
 
 describe( 'getAppenderLabel', () => {

package/src/components/inserter/test/search-items.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import items, {
 	categories,
 	collections,

package/src/components/inserter/tips.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { __ } from '@wordpress/i18n';
 import { createInterpolateElement, useState } from '@wordpress/element';
 import { Tip } from '@wordpress/components';

package/src/components/inserter-button/sparkles.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { SVG, Path } from '@wordpress/components';
 
 const sparkles = (

package/src/components/inserter-draggable-blocks/index.js

@@ -1,14 +1,7 @@
-/**
- * WordPress dependencies
- */
 import { Draggable } from '@wordpress/components';
 import { createBlock, store as blocksStore } from '@wordpress/blocks';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { useMemo } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
 import BlockDraggableChip from '../block-draggable/draggable-chip';
 import { INSERTER_PATTERN_TYPES } from '../inserter/block-patterns-tab/utils';
 import { store as blockEditorStore } from '../../store';

package/src/components/inserter-list-item/index.js

@@ -1,11 +1,4 @@
-/**
- * External dependencies
- */
 import clsx from 'clsx';
-
-/**
- * WordPress dependencies
- */
 import { useMemo, useRef, memo } from '@wordpress/element';
 import {
 	createBlock,
@@ -15,10 +8,6 @@ import {
 } from '@wordpress/blocks';
 import { __experimentalTruncate as Truncate } from '@wordpress/components';
 import { ENTER, isAppleOS } from '@wordpress/keycodes';
-
-/**
- * Internal dependencies
- */
 import BlockIcon from '../block-icon';
 import { InserterListboxItem } from '../inserter-listbox';
 import InserterDraggableBlocks from '../inserter-draggable-blocks';

package/src/components/inserter-listbox/context.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { createContext } from '@wordpress/element';
 
 const InserterListboxContext = createContext();

package/src/components/inserter-listbox/group.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { forwardRef, useEffect, useState } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { speak } from '@wordpress/a11y';

package/src/components/inserter-listbox/index.js

@@ -1,13 +1,5 @@
-/**
- * WordPress dependencies
- */
 import { Composite } from '@wordpress/components';
 import { Fragment } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-
 export { default as InserterListboxGroup } from './group';
 export { default as InserterListboxRow } from './row';
 export { default as InserterListboxItem } from './item';

package/src/components/inserter-listbox/item.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { Button, Composite } from '@wordpress/components';
 import { forwardRef } from '@wordpress/element';
 

package/src/components/inserter-listbox/row.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { forwardRef } from '@wordpress/element';
 import { Composite } from '@wordpress/components';
 

package/src/components/inserter-menu-extension/index.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { createSlotFill } from '@wordpress/components';
 
 const { Fill: __unstableInserterMenuExtension, Slot } = createSlotFill(

package/src/components/inspector-controls/block-support-slot-container.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { __experimentalToolsPanelContext as ToolsPanelContext } from '@wordpress/components';
 import { useContext, useMemo } from '@wordpress/element';
 

package/src/components/inspector-controls/block-support-tools-panel.js

@@ -1,13 +1,6 @@
-/**
- * WordPress dependencies
- */
 import { __experimentalToolsPanel as ToolsPanel } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { useCallback } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
 import { store as blockEditorStore } from '../../store';
 import { cleanEmptyObject } from '../../hooks/utils';
 import { useToolsPanelDropdownMenuProps } from '../global-styles/utils';

package/src/components/inspector-controls/fill.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import {
 	__experimentalStyleProvider as StyleProvider,
 	__experimentalToolsPanelContext as ToolsPanelContext,
@@ -8,10 +5,6 @@ import {
 import warning from '@wordpress/warning';
 import deprecated from '@wordpress/deprecated';
 import { useEffect, useContext, useMemo } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
 import {
 	useBlockEditContext,
 	mayDisplayControlsKey,
@@ -46,6 +39,9 @@ export default function InspectorControlsFill( {
 	}
 
 	const context = useBlockEditContext();
+	const isSelectedBlock = context[ mayDisplayControlsKey ];
+	const isPatternEditing = context[ mayDisplayPatternEditingControlsKey ];
+	const isInListViewTree = context[ isInListViewBlockSupportTreeKey ];
 
 	const Fill = groups[ group ]?.Fill;
 	if ( ! Fill ) {
@@ -57,7 +53,7 @@ export default function InspectorControlsFill( {
 	// - All blocks can show pattern editing groups (content, list).
 	// - Template parts can show any inspector group.
 	// - Other blocks cannot show a settings tab.
-	if ( context[ mayDisplayPatternEditingControlsKey ] ) {
+	if ( isPatternEditing ) {
 		// Template parts have also historically supported
 		// any block inspector groups for extenders. The settings
 		// tab is also used by core for the 'Design' panel. Specifically
@@ -69,49 +65,38 @@ export default function InspectorControlsFill( {
 		if ( ! canShowGroup ) {
 			return null;
 		}
-	}
-
-	// Outside pattern editing, use the standard rules for displaying controls.
-	if (
-		! context[ mayDisplayPatternEditingControlsKey ] &&
-		! context[ mayDisplayControlsKey ]
-	) {
+	} else if ( ! isSelectedBlock ) {
+		// Outside pattern editing, use the standard rules for displaying controls.
 		return null;
 	}
 
 	// When inside a section with a parent that has ListView block support,
 	// content controls are rendered as part of the ListView via a popover.
-	if (
-		group === 'content' &&
-		!! context[ isInListViewBlockSupportTreeKey ] &&
-		!! context[ mayDisplayPatternEditingControlsKey ]
-	) {
-		if ( context[ mayDisplayControlsKey ] ) {
-			return (
-				<StyleProvider document={ document }>
-					<ListViewContentFill>{ children }</ListViewContentFill>
-				</StyleProvider>
-			);
-		}
+	const rendersInListView =
+		group === 'content' && isPatternEditing && isInListViewTree;
 
-		// When using the ListView fill, only render controls for the selected
-		// block. Other blocks return `null`.
+	// When using the ListView fill, only render controls for the selected
+	// block. Other blocks return `null`.
+	if ( rendersInListView && ! isSelectedBlock ) {
 		return null;
 	}
 
 	return (
 		<StyleProvider document={ document }>
-			<Fill>
-				{ ( fillProps ) => {
-					return (
+			{ rendersInListView ? (
+				<ListViewContentFill>{ children }</ListViewContentFill>
+			) : (
+				<Fill>
+					{ ( fillProps ) => (
 						<ToolsPanelInspectorControl
 							fillProps={ fillProps }
-							children={ children }
 							resetAllFilter={ resetAllFilter }
-						/>
-					);
-				} }
-			</Fill>
+						>
+							{ children }
+						</ToolsPanelInspectorControl>
+					) }
+				</Fill>
+			) }
 		</StyleProvider>
 	);
 }

package/src/components/inspector-controls/groups.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { createSlotFill } from '@wordpress/components';
 
 const InspectorControlsDefault = createSlotFill( 'InspectorControls' );

package/src/components/inspector-controls/index.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import InspectorControlsFill from './fill';
 import InspectorControlsSlot from './slot';
 

package/src/components/inspector-controls/last-item.js

@@ -1,11 +1,4 @@
-/**
- * WordPress dependencies
- */
 import { createSlotFill } from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
 import {
 	useBlockEditContext,
 	mayDisplayControlsKey,

package/src/components/inspector-controls/list-view-content-popover.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import {
 	createSlotFill,
 	Popover,
@@ -9,10 +6,6 @@ import {
 import { useState, useLayoutEffect } from '@wordpress/element';
 import { useViewportMatch } from '@wordpress/compose';
 import { useSelect, useDispatch } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
 import { store as blockEditorStore } from '../../store';
 import { unlock } from '../../lock-unlock';
 

package/src/components/inspector-controls/slot.js

@@ -1,14 +1,7 @@
-/**
- * WordPress dependencies
- */
 import { __experimentalUseSlotFills as useSlotFills } from '@wordpress/components';
 import { forwardRef } from '@wordpress/element';
 import warning from '@wordpress/warning';
 import deprecated from '@wordpress/deprecated';
-
-/**
- * Internal dependencies
- */
 import BlockSupportToolsPanel from './block-support-tools-panel';
 import BlockSupportSlotContainer from './block-support-slot-container';
 import groups from './groups';

package/src/components/inspector-controls-tabs/advanced-controls-panel.js

@@ -1,15 +1,8 @@
-/**
- * WordPress dependencies
- */
 import {
 	PanelBody,
 	__experimentalUseSlotFills as useSlotFills,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
-
-/**
- * Internal dependencies
- */
 import {
 	default as InspectorControls,
 	InspectorAdvancedControls,