+
{ description }
-
+
) }
-
+
);
}
diff --git a/packages/block-editor/src/components/block-card/style.scss b/packages/block-editor/src/components/block-card/style.scss
index 9cd45c7e982965..42cf77aa4b0a84 100644
--- a/packages/block-editor/src/components/block-card/style.scss
+++ b/packages/block-editor/src/components/block-card/style.scss
@@ -5,10 +5,6 @@
padding: $grid-unit-20;
}
-.block-editor-block-card__content {
- flex-grow: 1;
-}
-
.block-editor-block-card__title {
font-weight: 500;
@@ -20,13 +16,6 @@
}
}
-.block-editor-block-card__description {
- display: block;
- font-size: $default-font-size;
- line-height: $default-line-height;
- margin-top: $grid-unit-05;
-}
-
.block-editor-block-card .block-editor-block-icon {
flex: 0 0 $button-size-small;
margin-left: 0;
diff --git a/packages/block-editor/src/components/block-edit/index.js b/packages/block-editor/src/components/block-edit/index.js
index 57df36c7c74a0b..0c29c0e98b1bfd 100644
--- a/packages/block-editor/src/components/block-edit/index.js
+++ b/packages/block-editor/src/components/block-edit/index.js
@@ -1,9 +1,9 @@
/**
* WordPress dependencies
*/
-import { useMemo } from '@wordpress/element';
-
+import { useMemo, useContext } from '@wordpress/element';
import { hasBlockSupport } from '@wordpress/blocks';
+
/**
* Internal dependencies
*/
@@ -17,6 +17,8 @@ import {
blockBindingsKey,
isPreviewModeKey,
} from './context';
+import { MultipleUsageWarning } from './multiple-usage-warning';
+import { PrivateBlockContext } from '../block-list/private-block-context';
/**
* The `useBlockEditContext` hook provides information about the block this hook is being used in.
@@ -49,6 +51,8 @@ export default function BlockEdit( {
const layoutSupport =
hasBlockSupport( name, 'layout', false ) ||
hasBlockSupport( name, '__experimentalLayout', false );
+ const { originalBlockClientId } = useContext( PrivateBlockContext );
+
return (
{ title }
{ description && ( - +
- { showMostUsedBlocks && !! suggestedItems.length && (
+
-
+
);
diff --git a/packages/block-editor/src/components/inserter/category-tabs/index.js b/packages/block-editor/src/components/inserter/category-tabs/index.js
index 47c9f0e051a66e..a379f4719556b2 100644
--- a/packages/block-editor/src/components/inserter/category-tabs/index.js
+++ b/packages/block-editor/src/components/inserter/category-tabs/index.js
@@ -27,7 +27,7 @@ function CategoryTabs( {
className="block-editor-inserter__category-tabs"
selectOnMove={ false }
selectedTabId={ selectedCategory ? selectedCategory.name : null }
- orientation={ 'vertical' }
+ orientation="vertical"
onSelect={ ( categoryId ) => {
// Pass the full category object
onSelectCategory(
diff --git a/packages/block-editor/src/components/inserter/hooks/use-block-types-state.js b/packages/block-editor/src/components/inserter/hooks/use-block-types-state.js
index 566d0476fbd0f5..6b9e694c1cdf8f 100644
--- a/packages/block-editor/src/components/inserter/hooks/use-block-types-state.js
+++ b/packages/block-editor/src/components/inserter/hooks/use-block-types-state.js
@@ -14,20 +14,24 @@ import { useCallback } from '@wordpress/element';
* Internal dependencies
*/
import { store as blockEditorStore } from '../../../store';
+import { withRootClientIdOptionKey } from '../../../store/utils';
/**
* Retrieves the block types inserter state.
*
* @param {string=} rootClientId Insertion's root client ID.
* @param {Function} onInsert function called when inserter a list of blocks.
+ * @param {boolean} isQuick
* @return {Array} Returns the block types state. (block types, categories, collections, onSelect handler)
*/
-const useBlockTypesState = ( rootClientId, onInsert ) => {
+const useBlockTypesState = ( rootClientId, onInsert, isQuick ) => {
const [ items ] = useSelect(
( select ) => [
- select( blockEditorStore ).getInserterItems( rootClientId ),
+ select( blockEditorStore ).getInserterItems( rootClientId, {
+ [ withRootClientIdOptionKey ]: ! isQuick,
+ } ),
],
- [ rootClientId ]
+ [ rootClientId, isQuick ]
);
const [ categories, collections ] = useSelect( ( select ) => {
@@ -37,7 +41,14 @@ const useBlockTypesState = ( rootClientId, onInsert ) => {
const onSelectItem = useCallback(
(
- { name, initialAttributes, innerBlocks, syncStatus, content },
+ {
+ name,
+ initialAttributes,
+ innerBlocks,
+ syncStatus,
+ content,
+ rootClientId: _rootClientId,
+ },
shouldFocusBlock
) => {
const insertedBlock =
@@ -51,7 +62,12 @@ const useBlockTypesState = ( rootClientId, onInsert ) => {
createBlocksFromInnerBlocksTemplate( innerBlocks )
);
- onInsert( insertedBlock, undefined, shouldFocusBlock );
+ onInsert(
+ insertedBlock,
+ undefined,
+ shouldFocusBlock,
+ _rootClientId
+ );
},
[ onInsert ]
);
diff --git a/packages/block-editor/src/components/inserter/hooks/use-insertion-point.js b/packages/block-editor/src/components/inserter/hooks/use-insertion-point.js
index 0dae090578ab4f..24074ec5004565 100644
--- a/packages/block-editor/src/components/inserter/hooks/use-insertion-point.js
+++ b/packages/block-editor/src/components/inserter/hooks/use-insertion-point.js
@@ -1,7 +1,7 @@
/**
* WordPress dependencies
*/
-import { useDispatch, useSelect } from '@wordpress/data';
+import { useDispatch, useRegistry, useSelect } from '@wordpress/data';
import { isUnmodifiedDefaultBlock } from '@wordpress/blocks';
import { _n, sprintf } from '@wordpress/i18n';
import { speak } from '@wordpress/a11y';
@@ -13,6 +13,34 @@ import { useCallback } from '@wordpress/element';
import { store as blockEditorStore } from '../../../store';
import { unlock } from '../../../lock-unlock';
+function getIndex( {
+ destinationRootClientId,
+ destinationIndex,
+ rootClientId,
+ registry,
+} ) {
+ if ( rootClientId === destinationRootClientId ) {
+ return destinationIndex;
+ }
+ const parents = [
+ '',
+ ...registry
+ .select( blockEditorStore )
+ .getBlockParents( destinationRootClientId ),
+ destinationRootClientId,
+ ];
+ const parentIndex = parents.indexOf( rootClientId );
+ if ( parentIndex !== -1 ) {
+ return (
+ registry
+ .select( blockEditorStore )
+ .getBlockIndex( parents[ parentIndex + 1 ] ) + 1
+ );
+ }
+ return registry.select( blockEditorStore ).getBlockOrder( rootClientId )
+ .length;
+}
+
/**
* @typedef WPInserterConfig
*
@@ -42,6 +70,7 @@ function useInsertionPoint( {
shouldFocusBlock = true,
selectBlockOnInsert = true,
} ) {
+ const registry = useRegistry();
const { getSelectedBlock } = useSelect( blockEditorStore );
const { destinationRootClientId, destinationIndex } = useSelect(
( select ) => {
@@ -91,7 +120,7 @@ function useInsertionPoint( {
} = unlock( useDispatch( blockEditorStore ) );
const onInsertBlocks = useCallback(
- ( blocks, meta, shouldForceFocusBlock = false ) => {
+ ( blocks, meta, shouldForceFocusBlock = false, _rootClientId ) => {
// When we are trying to move focus or select a new block on insert, we also
// need to clear the last focus to avoid the focus being set to the wrong block
// when tabbing back into the canvas if the block was added from outside the
@@ -121,8 +150,17 @@ function useInsertionPoint( {
} else {
insertBlocks(
blocks,
- destinationIndex,
- destinationRootClientId,
+ isAppender || _rootClientId === undefined
+ ? destinationIndex
+ : getIndex( {
+ destinationRootClientId,
+ destinationIndex,
+ rootClientId: _rootClientId,
+ registry,
+ } ),
+ isAppender || _rootClientId === undefined
+ ? destinationRootClientId
+ : _rootClientId,
selectBlockOnInsert,
shouldFocusBlock || shouldForceFocusBlock ? 0 : null,
meta
@@ -154,9 +192,17 @@ function useInsertionPoint( {
);
const onToggleInsertionPoint = useCallback(
- ( show ) => {
- if ( show ) {
- showInsertionPoint( destinationRootClientId, destinationIndex );
+ ( item ) => {
+ if ( item?.hasOwnProperty( 'rootClientId' ) ) {
+ showInsertionPoint(
+ item.rootClientId,
+ getIndex( {
+ destinationRootClientId,
+ destinationIndex,
+ rootClientId: item.rootClientId,
+ registry,
+ } )
+ );
} else {
hideInsertionPoint();
}
diff --git a/packages/block-editor/src/components/inserter/library.js b/packages/block-editor/src/components/inserter/library.js
index 6be31f49b5fbe1..4e10a051996a9f 100644
--- a/packages/block-editor/src/components/inserter/library.js
+++ b/packages/block-editor/src/components/inserter/library.js
@@ -7,7 +7,7 @@ import { forwardRef } from '@wordpress/element';
/**
* Internal dependencies
*/
-import InserterMenu from './menu';
+import { PrivateInserterMenu } from './menu';
import { store as blockEditorStore } from '../../store';
const noop = () => {};
@@ -23,7 +23,7 @@ function InserterLibrary(
__experimentalInitialTab,
__experimentalInitialCategory,
__experimentalFilterValue,
- __experimentalOnPatternCategorySelection,
+ onPatternCategorySelection,
onSelect = noop,
shouldFocusBlock = false,
onClose,
@@ -43,7 +43,7 @@ function InserterLibrary(
);
return (
-
diff --git a/packages/block-editor/src/components/inserter/search-results.js b/packages/block-editor/src/components/inserter/search-results.js
index edd99609ea916c..9c001823745e6c 100644
--- a/packages/block-editor/src/components/inserter/search-results.js
+++ b/packages/block-editor/src/components/inserter/search-results.js
@@ -50,6 +50,7 @@ function InserterSearchResults( {
shouldFocusBlock = true,
prioritizePatterns,
selectBlockOnInsert,
+ isQuick,
} ) {
const debouncedSpeak = useDebounce( speak, 500 );
@@ -80,7 +81,7 @@ function InserterSearchResults( {
blockTypeCategories,
blockTypeCollections,
onSelectBlockType,
- ] = useBlockTypesState( destinationRootClientId, onInsertBlocks );
+ ] = useBlockTypesState( destinationRootClientId, onInsertBlocks, isQuick );
const [ patterns, , onClickPattern ] = usePatternsState(
onInsertBlocks,
destinationRootClientId
diff --git a/packages/block-editor/src/components/inserter/style.scss b/packages/block-editor/src/components/inserter/style.scss
index 7618d9712ad535..4fac1d7ea1f308 100644
--- a/packages/block-editor/src/components/inserter/style.scss
+++ b/packages/block-editor/src/components/inserter/style.scss
@@ -329,18 +329,20 @@ $block-inserter-tabs-height: 44px;
.block-editor-inserter__category-panel {
background: $gray-100;
- border-left: $border-width solid $gray-200;
- border-right: $border-width solid $gray-200;
+ border-top: $border-width solid $gray-200;
+ box-shadow: $border-width $border-width 0 0 rgba($color: #000, $alpha: 0.133); // 0.133 = $gray-200 but with alpha.
+ outline: 1px solid transparent; // Shown for Windows 10 High Contrast mode.
position: absolute;
- top: 0;
+ top: -$border-width;
left: 0;
- height: 100%;
+ height: calc(100% + #{$border-width});
width: 100%;
padding: 0 $grid-unit-20;
display: flex;
flex-direction: column;
@include break-medium {
+ border-left: $border-width solid $gray-200;
padding: 0;
left: 100%;
width: 300px;
@@ -525,8 +527,8 @@ $block-inserter-tabs-height: 44px;
}
}
-.block-editor-inserter__patterns-category-panel-title {
- font-size: calc(1.25 * 13px);
+.components-heading.block-editor-inserter__patterns-category-panel-title {
+ font-weight: 500;
}
.block-editor-inserter__patterns-explore-button,
diff --git a/packages/block-editor/src/components/inspector-controls/fill.native.js b/packages/block-editor/src/components/inspector-controls/fill.native.js
index 98b6698721e1ce..69da92dd42b378 100644
--- a/packages/block-editor/src/components/inspector-controls/fill.native.js
+++ b/packages/block-editor/src/components/inspector-controls/fill.native.js
@@ -52,11 +52,9 @@ export default function InspectorControlsFill( {
return (
<>
+ { showMostUsedBlocks &&
+ // Only show the most used blocks if the total amount of block
+ // is larger than 1 row, otherwise it is not so useful.
+ items.length > 3 &&
+ !! suggestedItems.length && (
) }
- { currentlyRenderedCategories.map( ( category ) => {
- const categoryItems = itemsPerCategory[ category.slug ];
- if ( ! categoryItems || ! categoryItems.length ) {
+ { currentlyRenderedCategories.map( ( category ) => {
+ const categoryItems = items.filter(
+ ( item ) => item.category === category.slug
+ );
+ if ( ! categoryItems || ! categoryItems.length ) {
+ return null;
+ }
+ return (
+
+
+ );
+ } ) }
+
+ { didRenderAllCategories && uncategorizedItems.length > 0 && (
+
+
+ ) }
+
+ { currentlyRenderedCollections.map(
+ ( [ namespace, collection ] ) => {
+ const collectionItems = itemsPerCollection[ namespace ];
+ if ( ! collectionItems || ! collectionItems.length ) {
return null;
}
+
return (
);
- } ) }
+ }
+ ) }
+
+ );
+}
- { didRenderAllCategories && uncategorizedItems.length > 0 && (
-
+ { !! itemsForCurrentRoot.length && (
+ <>
+
-
- );
- }
+
+ ) } +
+ ) } +
+
+
{ /* Using RichText here instead of PlainText so that it can be styled like a button. */ }
+
{ __( 'Resolution' ) }
-
+
diff --git a/packages/block-library/src/gallery/v1/gallery-button.native.js b/packages/block-library/src/gallery/v1/gallery-button.native.js
index 8804e99cf2e7e6..4dc9abd9753ee4 100644
--- a/packages/block-library/src/gallery/v1/gallery-button.native.js
+++ b/packages/block-library/src/gallery/v1/gallery-button.native.js
@@ -35,7 +35,7 @@ export function Button( props ) {
style={ buttonStyle }
activeOpacity={ 0.7 }
accessibilityLabel={ accessibilityLabel }
- accessibilityRole={ 'button' }
+ accessibilityRole="button"
onPress={ onClick }
disabled={ isDisabled }
>
diff --git a/packages/block-library/src/gallery/v1/gallery-image.native.js b/packages/block-library/src/gallery/v1/gallery-image.native.js
index b887ca0bbfe04f..fc07a209d8c6a5 100644
--- a/packages/block-library/src/gallery/v1/gallery-image.native.js
+++ b/packages/block-library/src/gallery/v1/gallery-image.native.js
@@ -310,7 +310,7 @@ class GalleryImage extends Component {
onPress={ this.onMediaPressed }
accessible={ ! isSelected } // We need only child views to be accessible after the selection.
accessibilityLabel={ this.accessibilityLabelImageContainer() } // if we don't set this explicitly it reads system provided accessibilityLabels of all child components and those include pretty technical words which don't make sense
- accessibilityRole={ 'imagebutton' } // this makes VoiceOver to read a description of image provided by system on iOS and lets user know this is a button which conveys the message of tappablity
+ accessibilityRole="imagebutton" // this makes VoiceOver to read a description of image provided by system on iOS and lets user know this is a button which conveys the message of tappablity
>
"
`;
+exports[`Heading block should keep the heading when there is an empty paragraph block before and backspace is pressed at the start 1`] = `
+"
+
);
@@ -317,8 +317,11 @@ export function ImageEdit( {
return {
lockUrlControls:
!! metadata?.bindings?.url &&
- ( ! blockBindingsSource ||
- blockBindingsSource?.lockAttributesEditing() ),
+ ! blockBindingsSource?.canUserEditValue( {
+ select,
+ context,
+ args: metadata?.bindings?.url?.args,
+ } ),
lockUrlControlsMessage: blockBindingsSource?.label
? sprintf(
/* translators: %s: Label of the bindings source. */
@@ -328,7 +331,7 @@ export function ImageEdit( {
: __( 'Connected to dynamic data' ),
};
},
- [ isSingleSelected ]
+ [ isSingleSelected, metadata?.bindings?.url ]
);
const placeholder = ( content ) => {
return (
@@ -359,9 +362,7 @@ export function ImageEdit( {
} }
>
{ lockUrlControls ? (
-
+
{ lockUrlControlsMessage }
) : (
diff --git a/packages/block-library/src/image/edit.native.js b/packages/block-library/src/image/edit.native.js
index 010ec4cd596949..efa526ec0afd5d 100644
--- a/packages/block-library/src/image/edit.native.js
+++ b/packages/block-library/src/image/edit.native.js
@@ -581,7 +581,10 @@ export class ImageEdit extends Component {
) }{ ' ' }
- { isSingleSelected &&
- ! isEditingImage &&
- ! lockHrefControls &&
- ! lockUrlControls && (
+ { showBlockControls && (
+
+ { showUrlInput && (
setIsEditingImage( true ) }
- icon={ crop }
- label={ __( 'Crop' ) }
- />
- ) }
- { isSingleSelected && canInsertCover && (
-
+ { allowCrop && (
+ setIsEditingImage( true ) }
+ icon={ crop }
+ label={ __( 'Crop' ) }
+ />
+ ) }
+ { showCoverControls && (
+
+ ) }
{ isSingleSelected && ! isEditingImage && ! lockUrlControls && (
{ lockAltControlsMessage }
) : (
<>
-
+
{ __(
'Describe the purpose of the image.'
) }
@@ -684,7 +709,14 @@ export default function Image( {
<>{ lockAltControlsMessage }
) : (
<>
-
+
{ __(
'Describe the purpose of the image.'
) }
diff --git a/packages/block-library/src/latest-posts/edit.native.js b/packages/block-library/src/latest-posts/edit.native.js
index 90edce4f84b5b9..632efa149313f6 100644
--- a/packages/block-library/src/latest-posts/edit.native.js
+++ b/packages/block-library/src/latest-posts/edit.native.js
@@ -207,7 +207,7 @@ class LatestPostsEdit extends Component {
label={ __( 'Add link to featured image' ) }
checked={ addLinkToFeaturedImage }
onChange={ this.onSetAddLinkToFeaturedImage }
- separatorType={ 'topFullWidth' }
+ separatorType="topFullWidth"
/>
) }
diff --git a/packages/block-library/src/media-text/edit.js b/packages/block-library/src/media-text/edit.js
index 5901cd780c1309..bcdbc658507fce 100644
--- a/packages/block-library/src/media-text/edit.js
+++ b/packages/block-library/src/media-text/edit.js
@@ -187,6 +187,12 @@ function MediaTextEdit( {
mediaId: undefined,
mediaUrl: undefined,
mediaAlt: undefined,
+ mediaLink: undefined,
+ linkDestination: undefined,
+ linkTarget: undefined,
+ linkClass: undefined,
+ rel: undefined,
+ href: undefined,
useFeaturedImage: ! useFeaturedImage,
} );
};
@@ -383,7 +389,14 @@ function MediaTextEdit( {
onChange={ onMediaAltChange }
help={
<>
-
+
{ __(
'Describe the purpose of the image.'
) }
@@ -446,17 +459,13 @@ function MediaTextEdit( {
) }
- { mediaType === 'image' && (
+ { mediaType === 'image' && ! useFeaturedImage && (
diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
index 125dd90ee87bec..9e2e171975570f 100644
--- a/packages/block-library/src/navigation-link/edit.js
+++ b/packages/block-library/src/navigation-link/edit.js
@@ -261,6 +261,7 @@ export default function NavigationLinkEdit( {
const isDraggingWithin = useIsDraggingWithin( listItemRef );
const itemLabelPlaceholder = __( 'Add label…' );
const ref = useRef();
+ const linkUIref = useRef();
const prevUrl = usePrevious( url );
// Change the label using inspector causes rich text to change focus on firefox.
@@ -570,14 +571,27 @@ export default function NavigationLinkEdit( {
) }
{ isLinkOpen && (
{
// If there is no link then remove the auto-inserted block.
// This avoids empty blocks which can provided a poor UX.
if ( ! url ) {
- // Select the previous block to keep focus nearby
- selectPreviousBlock( clientId, true );
+ // Fixes https://github.com/WordPress/gutenberg/issues/61361
+ // There's a chance we're closing due to the user selecting the browse all button.
+ // Only move focus if the focus is still within the popover ui. If it's not within
+ // the popover, it's because something has taken the focus from the popover, and
+ // we don't want to steal it back.
+ if (
+ linkUIref.current.contains(
+ window.document.activeElement
+ )
+ ) {
+ // Select the previous block to keep focus nearby
+ selectPreviousBlock( clientId, true );
+ }
+
// Remove the link.
onReplace( [] );
return;
diff --git a/packages/block-library/src/navigation-link/link-ui.js b/packages/block-library/src/navigation-link/link-ui.js
index ce79af40e4708c..6619c46253546e 100644
--- a/packages/block-library/src/navigation-link/link-ui.js
+++ b/packages/block-library/src/navigation-link/link-ui.js
@@ -20,6 +20,7 @@ import {
useState,
useRef,
useEffect,
+ forwardRef,
} from '@wordpress/element';
import {
store as coreStore,
@@ -145,7 +146,7 @@ function LinkUIBlockInserter( { clientId, onBack, onSelectBlock } ) {
);
}
-export function LinkUI( props ) {
+function UnforwardedLinkUI( props, ref ) {
const [ addingBlock, setAddingBlock ] = useState( false );
const [ focusAddBlockButton, setFocusAddBlockButton ] = useState( false );
const { saveEntityRecord } = useDispatch( coreStore );
@@ -214,6 +215,7 @@ export function LinkUI( props ) {
return (
{
const blockInserterAriaRole = 'listbox';
const addBlockButtonRef = useRef();
diff --git a/packages/block-library/src/navigation-submenu/edit.js b/packages/block-library/src/navigation-submenu/edit.js
index f435b5e5a8a953..bbba77707e8159 100644
--- a/packages/block-library/src/navigation-submenu/edit.js
+++ b/packages/block-library/src/navigation-submenu/edit.js
@@ -459,34 +459,32 @@ export default function NavigationSubmenuEdit( {
{ /* eslint-disable jsx-a11y/anchor-is-valid */ }
{ /* eslint-enable */ }
- {
-
- setAttributes( { label: labelValue } )
+
+ setAttributes( { label: labelValue } )
+ }
+ onMerge={ mergeBlocks }
+ onReplace={ onReplace }
+ aria-label={ __( 'Navigation link text' ) }
+ placeholder={ itemLabelPlaceholder }
+ withoutInteractiveFormatting
+ allowedFormats={ [
+ 'core/bold',
+ 'core/italic',
+ 'core/image',
+ 'core/strikethrough',
+ ] }
+ onClick={ () => {
+ if ( ! openSubmenusOnClick && ! url ) {
+ setIsLinkOpen( true );
+ setOpenedBy( ref.current );
}
- onMerge={ mergeBlocks }
- onReplace={ onReplace }
- aria-label={ __( 'Navigation link text' ) }
- placeholder={ itemLabelPlaceholder }
- withoutInteractiveFormatting
- allowedFormats={ [
- 'core/bold',
- 'core/italic',
- 'core/image',
- 'core/strikethrough',
- ] }
- onClick={ () => {
- if ( ! openSubmenusOnClick && ! url ) {
- setIsLinkOpen( true );
- setOpenedBy( ref.current );
- }
- } }
- />
- }
+ } }
+ />
{ ! openSubmenusOnClick && isLinkOpen && (
= 6.5
- * that are not present in Gutenberg's WP 6.5 compatibility layer.
+ * Do not add the `block_core_navigation_insert_hooked_blocks_into_rest_response` filter in the following cases:
+ * - If Core has added the `insert_hooked_blocks_into_rest_response` filter already (WP >= 6.6);
+ * - or if the `set_ignored_hooked_blocks_metadata` function is unavailable (which is required for the filter to work. It was introduced by WP 6.5 but is not present in Gutenberg's WP 6.5 compatibility layer);
+ * - or if the `$rest_prepare_wp_navigation_core_callback` filter has already been added.
*/
-if ( function_exists( 'set_ignored_hooked_blocks_metadata' ) && ! has_filter( 'rest_prepare_wp_navigation', $rest_prepare_wp_navigation_core_callback ) ) {
+if (
+ ! has_filter( 'rest_prepare_wp_navigation', 'insert_hooked_blocks_into_rest_response' ) &&
+ function_exists( 'set_ignored_hooked_blocks_metadata' ) &&
+ ! has_filter( 'rest_prepare_wp_navigation', $rest_prepare_wp_navigation_core_callback )
+) {
add_filter( 'rest_prepare_wp_navigation', 'block_core_navigation_insert_hooked_blocks_into_rest_response', 10, 3 );
}
diff --git a/packages/block-library/src/page-list/convert-to-links-modal.js b/packages/block-library/src/page-list/convert-to-links-modal.js
index 8f8c75f6dea1c1..33ee22045b8241 100644
--- a/packages/block-library/src/page-list/convert-to-links-modal.js
+++ b/packages/block-library/src/page-list/convert-to-links-modal.js
@@ -2,6 +2,7 @@
* WordPress dependencies
*/
import { Button, Modal } from '@wordpress/components';
+import { useInstanceId } from '@wordpress/compose';
import { __ } from '@wordpress/i18n';
export const convertDescription = __(
@@ -13,12 +14,20 @@ export function ConvertToLinksModal( { onClick, onClose, disabled } ) {
-
A quick brown fox jumps over the lazy dog.
+" +`; + exports[`Heading block should merge with an empty Paragraph block and keep being the Heading block 1`] = ` "A quick brown fox jumps over the lazy dog.
@@ -29,3 +35,9 @@ exports[`Heading block should set a text color 1`] = `A quick brown fox jumps over the lazy dog.
" `; + +exports[`Heading block should transform to a paragraph block when pressing backspace at the beginning of the first heading block 1`] = ` +" +A quick brown fox jumps over the lazy dog.
+" +`; diff --git a/packages/block-library/src/heading/test/index.native.js b/packages/block-library/src/heading/test/index.native.js index 498ae6b3ea1d72..b8d93c32f5b4f6 100644 --- a/packages/block-library/src/heading/test/index.native.js +++ b/packages/block-library/src/heading/test/index.native.js @@ -189,4 +189,69 @@ describe( 'Heading block', () => { // Assert expect( getEditorHtml() ).toMatchSnapshot(); } ); + + it( 'should transform to a paragraph block when pressing backspace at the beginning of the first heading block', async () => { + // Arrange + await initializeEditor(); + + // Act + await addBlock( screen, 'Heading' ); + const headingBlock = getBlock( screen, 'Heading' ); + fireEvent.press( headingBlock ); + + const headingTextInput = + within( headingBlock ).getByPlaceholderText( 'Heading' ); + typeInRichText( + headingTextInput, + 'A quick brown fox jumps over the lazy dog.', + { finalSelectionStart: 0, finalSelectionEnd: 0 } + ); + + fireEvent( headingTextInput, 'onKeyDown', { + nativeEvent: {}, + preventDefault() {}, + keyCode: BACKSPACE, + } ); + + // Assert + expect( getEditorHtml() ).toMatchSnapshot(); + } ); + + it( 'should keep the heading when there is an empty paragraph block before and backspace is pressed at the start', async () => { + // Arrange + await initializeEditor(); + await addBlock( screen, 'Paragraph' ); + + // Act + const paragraphBlock = getBlock( screen, 'Paragraph' ); + fireEvent.press( paragraphBlock ); + const paragraphTextInput = + within( paragraphBlock ).getByPlaceholderText( 'Start writing…' ); + fireEvent( paragraphTextInput, 'onKeyDown', { + nativeEvent: {}, + preventDefault() {}, + keyCode: ENTER, + } ); + + await addBlock( screen, 'Heading' ); + const headingBlock = getBlock( screen, 'Heading', { rowIndex: 2 } ); + fireEvent.press( headingBlock ); + + const headingTextInput = + within( headingBlock ).getByPlaceholderText( 'Heading' ); + typeInRichText( + headingTextInput, + 'A quick brown fox jumps over the lazy dog.', + { finalSelectionStart: 0, finalSelectionEnd: 0 } + ); + + fireEvent( headingTextInput, 'onKeyDown', { + nativeEvent: {}, + preventDefault() {}, + keyCode: BACKSPACE, + } ); + + // Assert + expect( getEditorHtml() ).toMatchSnapshot(); + } ); } ); diff --git a/packages/block-library/src/image/edit.js b/packages/block-library/src/image/edit.js index b5e7e6be095170..673ab44a8c28aa 100644 --- a/packages/block-library/src/image/edit.js +++ b/packages/block-library/src/image/edit.js @@ -145,7 +145,7 @@ export function ImageEdit( { scale: undefined, } ); } - }, [ align ] ); + }, [ __unstableMarkNextChangeAsNotPersistent, align, setAttributes ] ); const { getSettings } = useSelect( blockEditorStore ); const blockEditingMode = useBlockEditingMode(); @@ -283,7 +283,7 @@ export function ImageEdit( {+
{ convertDescription }
diff --git a/packages/block-library/src/page-list/edit.js b/packages/block-library/src/page-list/edit.js
index 0e81336dfde287..2106aa7c39e9f7 100644
--- a/packages/block-library/src/page-list/edit.js
+++ b/packages/block-library/src/page-list/edit.js
@@ -63,7 +63,7 @@ function BlockContent( {
if ( pages === null ) {
return (
{
expect( screen.toJSON() ).toMatchSnapshot();
} );
+ it( 'should prevent deleting the first Paragraph block when pressing backspace at the start', async () => {
+ // Arrange
+ const screen = await initializeEditor();
+ await addBlock( screen, 'Paragraph' );
+
+ // Act
+ const paragraphBlock = getBlock( screen, 'Paragraph' );
+ fireEvent.press( paragraphBlock );
+ const paragraphTextInput =
+ within( paragraphBlock ).getByPlaceholderText( 'Start writing…' );
+ typeInRichText(
+ paragraphTextInput,
+ 'A quick brown fox jumps over the lazy dog.',
+ { finalSelectionStart: 0, finalSelectionEnd: 0 }
+ );
+
+ fireEvent( paragraphTextInput, 'onKeyDown', {
+ nativeEvent: {},
+ preventDefault() {},
+ keyCode: BACKSPACE,
+ } );
+
+ // Assert
+ expect( getEditorHtml() ).toMatchSnapshot();
+ } );
+
it( 'should bold text', async () => {
// Arrange
const screen = await initializeEditor();
diff --git a/packages/block-library/src/query/variations.js b/packages/block-library/src/query/variations.js
index 65a73d134981f3..1970d9947916b5 100644
--- a/packages/block-library/src/query/variations.js
+++ b/packages/block-library/src/query/variations.js
@@ -54,9 +54,7 @@ const variations = [
},
},
scope: [ 'inserter' ],
- isActive: ( { namespace, query } ) => {
- return namespace === 'core/posts-list' && query.postType === 'post';
- },
+ isActive: [ 'namespace', 'query.postType' ],
},
{
name: 'title-date',
diff --git a/packages/block-library/src/search/edit.js b/packages/block-library/src/search/edit.js
index 1a88576965002f..cfe7b29caf5de0 100644
--- a/packages/block-library/src/search/edit.js
+++ b/packages/block-library/src/search/edit.js
@@ -441,7 +441,7 @@ export default function SearchEdit( {
widthUnit: newUnit,
} );
} }
- __unstableInputWidth={ '80px' }
+ __unstableInputWidth="80px"
value={ `${ width }${ widthUnit }` }
units={ units }
/>
diff --git a/packages/block-library/src/social-link/edit.native.js b/packages/block-library/src/social-link/edit.native.js
index 3ea794a9b8c20b..0b4b6b0ac7d4bd 100644
--- a/packages/block-library/src/social-link/edit.native.js
+++ b/packages/block-library/src/social-link/edit.native.js
@@ -171,7 +171,7 @@ const SocialLinkEdit = ( {
{
/>
{
if (
- newAttributes.metadata.bindings[ binding ]?.source?.name ===
- 'pattern_attributes'
+ newAttributes.metadata.bindings[ binding ]?.source ===
+ 'core/pattern-overrides'
) {
- newAttributes.metadata.bindings[ binding ].source =
- 'core/pattern-overrides';
+ hasPatternOverrides = true;
+ newAttributes.metadata = {
+ ...newAttributes.metadata,
+ bindings: { ...newAttributes.metadata.bindings },
+ };
+ delete newAttributes.metadata.bindings[ binding ];
}
} );
+ if ( hasPatternOverrides ) {
+ newAttributes.metadata.bindings.__default = {
+ source: 'core/pattern-overrides',
+ };
+ }
}
}
return [ name, newAttributes ];
diff --git a/packages/blocks/src/api/parser/get-block-attributes.js b/packages/blocks/src/api/parser/get-block-attributes.js
index 24faae73704636..36ea86399329e1 100644
--- a/packages/blocks/src/api/parser/get-block-attributes.js
+++ b/packages/blocks/src/api/parser/get-block-attributes.js
@@ -7,7 +7,6 @@ import memoize from 'memize';
/**
* WordPress dependencies
*/
-import { pipe } from '@wordpress/compose';
import { applyFilters } from '@wordpress/hooks';
import { RichTextData } from '@wordpress/rich-text';
@@ -37,24 +36,8 @@ import { normalizeBlockType, getDefault } from '../utils';
*
* @return {Function} Enhanced hpq matcher.
*/
-export const toBooleanAttributeMatcher = ( matcher ) =>
- pipe( [
- matcher,
- // Expected values from `attr( 'disabled' )`:
- //
- //
- // - Value: `undefined`
- // - Transformed: `false`
- //
- //
- // - Value: `''`
- // - Transformed: `true`
- //
- //
- // - Value: `'disabled'`
- // - Transformed: `true`
- ( value ) => value !== undefined,
- ] );
+export const toBooleanAttributeMatcher = ( matcher ) => ( value ) =>
+ matcher( value ) !== undefined;
/**
* Returns true if value is of the given JSON schema type, or false otherwise.
@@ -214,13 +197,13 @@ export function isValidByEnum( value, enumSet ) {
*/
export const matcherFromSource = memoize( ( sourceConfig ) => {
switch ( sourceConfig.source ) {
- case 'attribute':
+ case 'attribute': {
let matcher = attr( sourceConfig.selector, sourceConfig.attribute );
if ( sourceConfig.type === 'boolean' ) {
matcher = toBooleanAttributeMatcher( matcher );
}
-
return matcher;
+ }
case 'html':
return html( sourceConfig.selector, sourceConfig.multiline );
case 'text':
@@ -244,12 +227,10 @@ export const matcherFromSource = memoize( ( sourceConfig ) => {
)
);
return query( sourceConfig.selector, subMatchers );
- case 'tag':
- return pipe( [
- prop( sourceConfig.selector, 'nodeName' ),
- ( nodeName ) =>
- nodeName ? nodeName.toLowerCase() : undefined,
- ] );
+ case 'tag': {
+ const matcher = prop( sourceConfig.selector, 'nodeName' );
+ return ( domNode ) => matcher( domNode )?.toLowerCase();
+ }
default:
// eslint-disable-next-line no-console
console.error( `Unknown source type "${ sourceConfig.source }"` );
diff --git a/packages/blocks/src/store/private-actions.js b/packages/blocks/src/store/private-actions.js
index a47d9aacab37ae..dd6650338d9d1a 100644
--- a/packages/blocks/src/store/private-actions.js
+++ b/packages/blocks/src/store/private-actions.js
@@ -55,6 +55,6 @@ export function registerBlockBindingsSource( source ) {
setValue: source.setValue,
setValues: source.setValues,
getPlaceholder: source.getPlaceholder,
- lockAttributesEditing: source.lockAttributesEditing,
+ canUserEditValue: source.canUserEditValue,
};
}
diff --git a/packages/blocks/src/store/reducer.js b/packages/blocks/src/store/reducer.js
index 1d0d8cb2e968fc..c00810c534d55d 100644
--- a/packages/blocks/src/store/reducer.js
+++ b/packages/blocks/src/store/reducer.js
@@ -381,10 +381,7 @@ export function blockBindingsSources( state = {}, action ) {
setValue: action.setValue,
setValues: action.setValues,
getPlaceholder: action.getPlaceholder,
- lockAttributesEditing: () =>
- action.lockAttributesEditing
- ? action.lockAttributesEditing()
- : true,
+ canUserEditValue: action.canUserEditValue || ( () => false ),
},
};
}
diff --git a/packages/blocks/src/store/selectors.js b/packages/blocks/src/store/selectors.js
index a69879809ab1a6..ecdc82e7633043 100644
--- a/packages/blocks/src/store/selectors.js
+++ b/packages/blocks/src/store/selectors.js
@@ -6,7 +6,6 @@ import removeAccents from 'remove-accents';
/**
* WordPress dependencies
*/
-import { pipe } from '@wordpress/compose';
import { createSelector } from '@wordpress/data';
/**
@@ -238,26 +237,54 @@ export const getBlockVariations = createSelector(
export function getActiveBlockVariation( state, blockName, attributes, scope ) {
const variations = getBlockVariations( state, blockName, scope );
- const match = variations?.find( ( variation ) => {
+ if ( ! variations ) {
+ return variations;
+ }
+
+ const blockType = getBlockType( state, blockName );
+ const attributeKeys = Object.keys( blockType?.attributes || {} );
+ let match;
+ let maxMatchedAttributes = 0;
+
+ for ( const variation of variations ) {
if ( Array.isArray( variation.isActive ) ) {
- const blockType = getBlockType( state, blockName );
- const attributeKeys = Object.keys( blockType?.attributes || {} );
const definedAttributes = variation.isActive.filter(
- ( attribute ) => attributeKeys.includes( attribute )
+ ( attribute ) => {
+ // We support nested attribute paths, e.g. `layout.type`.
+ // In this case, we need to check if the part before the
+ // first dot is a known attribute.
+ const topLevelAttribute = attribute.split( '.' )[ 0 ];
+ return attributeKeys.includes( topLevelAttribute );
+ }
);
- if ( definedAttributes.length === 0 ) {
- return false;
+ const definedAttributesLength = definedAttributes.length;
+ if ( definedAttributesLength === 0 ) {
+ continue;
}
- return definedAttributes.every(
- ( attribute ) =>
- attributes[ attribute ] ===
- variation.attributes[ attribute ]
- );
+ const isMatch = definedAttributes.every( ( attribute ) => {
+ const attributeValue = getValueFromObjectPath(
+ attributes,
+ attribute
+ );
+ if ( attributeValue === undefined ) {
+ return false;
+ }
+ return (
+ attributeValue ===
+ getValueFromObjectPath( variation.attributes, attribute )
+ );
+ } );
+ if ( isMatch && definedAttributesLength > maxMatchedAttributes ) {
+ match = variation;
+ maxMatchedAttributes = definedAttributesLength;
+ }
+ } else if ( variation.isActive?.( attributes, variation.attributes ) ) {
+ // If isActive is a function, we cannot know how many attributes it matches.
+ // This means that we cannot compare the specificity of our matches,
+ // and simply return the best match we have found.
+ return match || variation;
}
-
- return variation.isActive?.( attributes, variation.attributes );
- } );
-
+ }
return match;
}
@@ -645,6 +672,18 @@ export function hasBlockSupport( state, nameOrType, feature, defaultSupports ) {
return !! getBlockSupport( state, nameOrType, feature, defaultSupports );
}
+/**
+ * Normalizes a search term string: removes accents, converts to lowercase, removes extra whitespace.
+ *
+ * @param {string|null|undefined} term Search term to normalize.
+ * @return {string} Normalized search term.
+ */
+function getNormalizedSearchTerm( term ) {
+ return removeAccents( term ?? '' )
+ .toLowerCase()
+ .trim();
+}
+
/**
* Returns true if the block type by the given name or object value matches a
* search term, or false otherwise.
@@ -684,30 +723,12 @@ export function hasBlockSupport( state, nameOrType, feature, defaultSupports ) {
*
* @return {Object[]} Whether block type matches search term.
*/
-export function isMatchingSearchTerm( state, nameOrType, searchTerm ) {
+export function isMatchingSearchTerm( state, nameOrType, searchTerm = '' ) {
const blockType = getNormalizedBlockType( state, nameOrType );
-
- const getNormalizedSearchTerm = pipe( [
- // Disregard diacritics.
- // Input: "média"
- ( term ) => removeAccents( term ?? '' ),
-
- // Lowercase.
- // Input: "MEDIA"
- ( term ) => term.toLowerCase(),
-
- // Strip leading and trailing whitespace.
- // Input: " media "
- ( term ) => term.trim(),
- ] );
-
const normalizedSearchTerm = getNormalizedSearchTerm( searchTerm );
- const isSearchMatch = pipe( [
- getNormalizedSearchTerm,
- ( normalizedCandidate ) =>
- normalizedCandidate.includes( normalizedSearchTerm ),
- ] );
+ const isSearchMatch = ( candidate ) =>
+ getNormalizedSearchTerm( candidate ).includes( normalizedSearchTerm );
return (
isSearchMatch( blockType.title ) ||
diff --git a/packages/blocks/src/store/test/selectors.js b/packages/blocks/src/store/test/selectors.js
index 1fda11d72311a3..1a6e768724acc7 100644
--- a/packages/blocks/src/store/test/selectors.js
+++ b/packages/blocks/src/store/test/selectors.js
@@ -291,6 +291,7 @@ describe( 'selectors', () => {
testAttribute: {},
firstTestAttribute: {},
secondTestAttribute: {},
+ thirdTestAttribute: {},
},
};
const FIRST_VARIATION_TEST_ATTRIBUTE_VALUE = 1;
@@ -410,6 +411,47 @@ describe( 'selectors', () => {
expect( result ).toEqual( variation );
} );
} );
+ it( 'should support nested attribute paths in the isActive array', () => {
+ const variations = [
+ {
+ name: 'variation-1',
+ attributes: {
+ firstTestAttribute: {
+ nestedProperty: 1,
+ otherNestedProperty: 5555,
+ },
+ },
+ isActive: [ 'firstTestAttribute.nestedProperty' ],
+ },
+ {
+ name: 'variation-2',
+ attributes: {
+ firstTestAttribute: {
+ nestedProperty: 2,
+ otherNestedProperty: 5555,
+ },
+ },
+ isActive: [ 'firstTestAttribute.nestedProperty' ],
+ },
+ ];
+ const state =
+ createBlockVariationsStateWithTestBlockType( variations );
+
+ expect(
+ getActiveBlockVariation( state, blockName, {
+ firstTestAttribute: {
+ nestedProperty: 1,
+ },
+ } )
+ ).toEqual( variations[ 0 ] );
+ expect(
+ getActiveBlockVariation( state, blockName, {
+ firstTestAttribute: {
+ nestedProperty: 2,
+ },
+ } )
+ ).toEqual( variations[ 1 ] );
+ } );
it( 'should return the active variation based on the given isActive array (multiple values)', () => {
const variations = [
{
@@ -469,6 +511,136 @@ describe( 'selectors', () => {
} )
).toEqual( variations[ 2 ] );
} );
+ it( 'should return the active variation using the match with the highest specificity for the given isActive array (multiple values)', () => {
+ const variations = [
+ {
+ name: 'variation-1',
+ attributes: {
+ firstTestAttribute: 1,
+ secondTestAttribute: 2,
+ },
+ isActive: [
+ 'firstTestAttribute',
+ 'secondTestAttribute',
+ ],
+ },
+ {
+ name: 'variation-2',
+ attributes: {
+ firstTestAttribute: 1,
+ secondTestAttribute: 2,
+ thirdTestAttribute: 3,
+ },
+ isActive: [
+ 'firstTestAttribute',
+ 'secondTestAttribute',
+ 'thirdTestAttribute',
+ ],
+ },
+ {
+ name: 'variation-3',
+ attributes: {
+ firstTestAttribute: 1,
+ thirdTestAttribute: 3,
+ },
+ isActive: [
+ 'firstTestAttribute',
+ 'thirdTestAttribute',
+ ],
+ },
+ ];
+
+ const state =
+ createBlockVariationsStateWithTestBlockType( variations );
+
+ expect(
+ getActiveBlockVariation( state, blockName, {
+ firstTestAttribute: 1,
+ secondTestAttribute: 2,
+ } )
+ ).toEqual( variations[ 0 ] );
+ // All variations match the following attributes. Since all matches have an array for their isActive
+ // fields, we can compare the specificity of each match and return the most specific match.
+ expect(
+ getActiveBlockVariation( state, blockName, {
+ firstTestAttribute: 1,
+ secondTestAttribute: 2,
+ thirdTestAttribute: 3,
+ } )
+ ).toEqual( variations[ 1 ] );
+ expect(
+ getActiveBlockVariation( state, blockName, {
+ firstTestAttribute: 1,
+ thirdTestAttribute: 3,
+ } )
+ ).toEqual( variations[ 2 ] );
+ } );
+ it( 'should return the active variation using the first match given the isActive array (multiple values) and function', () => {
+ const variations = [
+ {
+ name: 'variation-1',
+ attributes: {
+ firstTestAttribute: 1,
+ secondTestAttribute: 2,
+ },
+ isActive: [
+ 'firstTestAttribute',
+ 'secondTestAttribute',
+ ],
+ },
+ {
+ name: 'variation-2',
+ attributes: {
+ firstTestAttribute: 1,
+ secondTestAttribute: 2,
+ thirdTestAttribute: 3,
+ },
+ isActive: [
+ 'firstTestAttribute',
+ 'secondTestAttribute',
+ 'thirdTestAttribute',
+ ],
+ },
+ {
+ name: 'variation-3',
+ attributes: {
+ firstTestAttribute: 1,
+ thirdTestAttribute: 3,
+ },
+ isActive: ( blockAttributes, variationAttributes ) =>
+ blockAttributes.firstTestAttribute ===
+ variationAttributes.firstTestAttribute &&
+ blockAttributes.thirdTestAttribute ===
+ variationAttributes.thirdTestAttribute,
+ },
+ ];
+
+ const state =
+ createBlockVariationsStateWithTestBlockType( variations );
+
+ expect(
+ getActiveBlockVariation( state, blockName, {
+ firstTestAttribute: 1,
+ secondTestAttribute: 2,
+ } )
+ ).toEqual( variations[ 0 ] );
+ // All variations match the following attributes. However, since the third variation has a function
+ // for its isActive field, we cannot compare the specificity of each match, so instead we return the
+ // best match we've found.
+ expect(
+ getActiveBlockVariation( state, blockName, {
+ firstTestAttribute: 1,
+ secondTestAttribute: 2,
+ thirdTestAttribute: 3,
+ } )
+ ).toEqual( variations[ 1 ] );
+ expect(
+ getActiveBlockVariation( state, blockName, {
+ firstTestAttribute: 1,
+ thirdTestAttribute: 3,
+ } )
+ ).toEqual( variations[ 2 ] );
+ } );
it( 'should ignore attributes that are not defined in the block type', () => {
const variations = [
{
diff --git a/packages/browserslist-config/CHANGELOG.md b/packages/browserslist-config/CHANGELOG.md
index 51aa52e81c2b44..6737bb003c1936 100644
--- a/packages/browserslist-config/CHANGELOG.md
+++ b/packages/browserslist-config/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 6.0.0 (2024-05-31)
+
### Breaking Changes
- Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
diff --git a/packages/browserslist-config/package.json b/packages/browserslist-config/package.json
index e78bf84269cb31..4f5a1773c25f9e 100644
--- a/packages/browserslist-config/package.json
+++ b/packages/browserslist-config/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/browserslist-config",
- "version": "5.41.0",
+ "version": "6.0.0",
"description": "WordPress Browserslist shared configuration.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/commands/CHANGELOG.md b/packages/commands/CHANGELOG.md
index a9f5a293061827..17a55cbf221dec 100644
--- a/packages/commands/CHANGELOG.md
+++ b/packages/commands/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 1.0.0 (2024-05-31)
+
### Breaking Changes
- Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
diff --git a/packages/commands/package.json b/packages/commands/package.json
index fc89c6dd2508c2..a4a8e952f3ef1c 100644
--- a/packages/commands/package.json
+++ b/packages/commands/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/commands",
- "version": "0.29.0",
+ "version": "1.0.0",
"description": "Handles the commands menu.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 34c1a6ca410c33..4ad4dd4ec63125 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 28.0.0 (2024-05-31)
+
### Breaking Changes
- Variables like `process.env.IS_GUTENBERG_PLUGIN` have been replaced by `globalThis.IS_GUTENBERG_PLUGIN`. Build systems using `process.env` should be updated ([#61486](https://github.com/WordPress/gutenberg/pull/61486)).
@@ -11,11 +13,14 @@
- `Tabs`: Animate indicator ([#60560](https://github.com/WordPress/gutenberg/pull/60560)).
- `ComboboxControl`: Introduce Combobox expandOnFocus prop ([#61705](https://github.com/WordPress/gutenberg/pull/61705)).
+- `ProgressBar`: Expose as public API ([#61062](https://github.com/WordPress/gutenberg/pull/61062)).
+- `ProgressBar`: Simplify default width implementation and make it more easily overridable ([#61976](https://github.com/WordPress/gutenberg/pull/61976)).
### Bug Fixes
- `Autocomplete`: Stabilize rendering of autocomplete items ([#61877](https://github.com/WordPress/gutenberg/pull/61877)).
- `TabPanel`: Make the the focus styles consistent with `Tabs`. ([#61317](https://github.com/WordPress/gutenberg/pull/61317)).
+- `InputControl`: Fixed z-index issue where slider dots appeared in front of the Appearance dropdown. ([#61937](https://github.com/WordPress/gutenberg/pull/61937))
### Internal
diff --git a/packages/components/package.json b/packages/components/package.json
index 79b01e5f020ee9..89ed60367d88ea 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/components",
- "version": "27.6.0",
+ "version": "28.0.0",
"description": "UI components for WordPress.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/components/src/animate/stories/index.story.tsx b/packages/components/src/animate/stories/index.story.tsx
index be076b4e6976c6..de28495a97fc57 100644
--- a/packages/components/src/animate/stories/index.story.tsx
+++ b/packages/components/src/animate/stories/index.story.tsx
@@ -27,7 +27,12 @@ export const Default = Template.bind( {} );
Default.args = {
children: ( { className } ) => (
-
),
};
diff --git a/packages/components/src/autocomplete/test/index.tsx b/packages/components/src/autocomplete/test/index.tsx
index 7a31680b3dd5e1..0df784f8367cdd 100644
--- a/packages/components/src/autocomplete/test/index.tsx
+++ b/packages/components/src/autocomplete/test/index.tsx
@@ -67,10 +67,10 @@ describe( 'AutocompleterUI', () => {
return (
+
-
+
{ __( 'Page List: Cannot retrieve Pages.' ) }
@@ -73,7 +73,7 @@ function BlockContent( {
if ( pages.length === 0 ) {
return (
-
+
{ __( 'Page List: Cannot retrieve Pages.' ) }
@@ -101,7 +101,7 @@ function BlockContent( {
return (
-
+
{ __( 'Page List: Cannot retrieve Pages.' ) }
diff --git a/packages/block-library/src/paragraph/test/__snapshots__/edit.native.js.snap b/packages/block-library/src/paragraph/test/__snapshots__/edit.native.js.snap
index 2910d1551ca28b..10e599372dfef9 100644
--- a/packages/block-library/src/paragraph/test/__snapshots__/edit.native.js.snap
+++ b/packages/block-library/src/paragraph/test/__snapshots__/edit.native.js.snap
@@ -1,5 +1,11 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
+exports[`Paragraph block should prevent deleting the first Paragraph block when pressing backspace at the start 1`] = `
+"
+A quick brown fox jumps over the lazy dog.
+" +`; + exports[`Paragraph block should render without crashing and match snapshot 1`] = `{ `No default animation. Use one of type = "appear", "slide-in", or "loading".` }
++ { /* eslint-disable react/no-unescaped-entities */ } + No default animation. Use one of type = "appear", "slide-in", or + "loading". + { /* eslint-enable react/no-unescaped-entities */ } +