Skip to content

Inserter: Fix error being thrown for spoken message when inserting default/direct block #79004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
talldan merged 5 commits into from
Jun 9, 2026
Merged

Inserter: Fix error being thrown for spoken message when inserting default/direct block #79004

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
236dfb4
Fix `null` `allowedBlockType` causing error to be thrown when accessi…
talldan Jun 8, 2026
93533b8
Calculate proper title from variations
talldan Jun 8, 2026
fd1e801
Small tidy up
talldan Jun 8, 2026
edae00d
Use useSelect shorthand and calculate label in callback
talldan Jun 9, 2026
ee41f7e
Remove allowedBlockType fallback
talldan Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 38 additions & 20 deletions packages/block-editor/src/components/inserter/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,12 @@ import clsx from 'clsx';
import { speak } from '@wordpress/a11y';
import { __, _x, sprintf } from '@wordpress/i18n';
import { Dropdown, Button } from '@wordpress/components';
import { useDispatch, useRegistry, useSelect } from '@wordpress/data';
import { createBlock, store as blocksStore } from '@wordpress/blocks';
import { useDispatch, useSelect } from '@wordpress/data';
import {
createBlock,
store as blocksStore,
__experimentalGetBlockLabel as getBlockLabel,
} from '@wordpress/blocks';
import { forwardRef } from '@wordpress/element';
import { plus } from '@wordpress/icons';

Expand Down Expand Up @@ -156,7 +160,6 @@ const UnforwardedInserter = (
const defaultBlockType = directInsertBlock
? getBlockType( directInsertBlock.name )
: null;

return {
hasItems: hasInserterItems( _targetRootClientId ),
hasSingleBlockType: _hasSingleBlockType,
Expand All @@ -173,8 +176,16 @@ const UnforwardedInserter = (
[ rootClientId, clientId, shouldDirectInsert ]
);

const registry = useRegistry();
const { insertBlock } = useDispatch( blockEditorStore );
const {
getBlock,
getBlockIndex,
getBlockOrder,
getBlockRootClientId,
getBlockSelectionEnd,
getPreviousBlockClientId,
} = useSelect( blockEditorStore );

@Mamaduka Mamaduka Jun 9, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason for switching to static useSelect instead of continuing to use useRegistry?

@talldan talldan Jun 9, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really, I prompted codex with "perhaps use the useSelect shorthand", I didn't actually spot that there were existing useRegistry calls in the file, but it replaced them 😊

I do actually prefer this though, it feels more idiomatic / higher level than useRegistry.

@Mamaduka Mamaduka Jun 9, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely, not a blocker 👍

const { getActiveBlockVariation, getBlockType } = useSelect( blocksStore );

// The global inserter (no isAppender, no rootClientId, no clientId) should
// always render, even with no items.
Expand All @@ -190,9 +201,6 @@ const UnforwardedInserter = (
return {};
}

const { getBlock, getPreviousBlockClientId } =
registry.select( blockEditorStore );

// 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.
Expand Down Expand Up @@ -225,13 +233,6 @@ const UnforwardedInserter = (
}

function getInsertionIndex() {
const {
getBlockIndex,
getBlockSelectionEnd,
getBlockOrder,
getBlockRootClientId,
} = registry.select( blockEditorStore );

// If the clientId is defined, we insert at the position of the block.
if ( clientId ) {
return getBlockIndex( clientId );
Expand Down Expand Up @@ -272,12 +273,29 @@ const UnforwardedInserter = (

onSelectOrClose?.( newBlock );

const message = sprintf(
// translators: %s: the name of the block that has been added
__( '%s block added' ),
allowedBlockType.title
);
speak( message );
const blockTypeToInsert = getBlockType( blockName );
let blockLabelToInsert;
if ( blockTypeToInsert ) {
blockLabelToInsert = getBlockLabel(
blockTypeToInsert,
newBlock.attributes
);

if ( blockLabelToInsert === blockTypeToInsert.title ) {
blockLabelToInsert =
getActiveBlockVariation( blockName, newBlock.attributes )
?.title || blockLabelToInsert;
}
}

if ( blockLabelToInsert ) {
const message = sprintf(
// translators: %s: the name of the block that has been added
__( '%s block added' ),
blockLabelToInsert
);
speak( message );
}
}

function renderToggle( { onToggle: dropdownOnToggle, isOpen } ) {
Expand Down
Loading