Skip to content
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

Speak 'Block moved up/down' after using keyboard actions to move up/down #64966

Merged
merged 10 commits into from
Nov 1, 2024
Merged

Speak 'Block moved up/down' after using keyboard actions to move up/down #64966

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dd47674
Speak 'Block moved up/down' after using keyboard actions to move up/down
n2erjo00 Sep 1, 2024
372e6d0
Created internal helper function to create description for speak func…
n2erjo00 Sep 27, 2024
9800c85
Refactor away from helper function and simplify
n2erjo00 Oct 2, 2024
83e3584
Merge branch 'trunk' into announce-move-actions-to-screen-reader
n2erjo00 Oct 2, 2024
63341e8
Add short confirmation message after block has been moved up|down
n2erjo00 Oct 26, 2024
76a6ed2
Merge branch 'trunk' into announce-move-actions-to-screen-reader
n2erjo00 Oct 26, 2024
e079648
Merge branch 'trunk' into announce-move-actions-to-screen-reader
n2erjo00 Oct 29, 2024
0556d58
End with period. Speak singular or plural
n2erjo00 Oct 29, 2024
10d4ceb
Merge branch 'trunk' into announce-move-actions-to-screen-reader
n2erjo00 Oct 31, 2024
20deaae
Speak the amount of moved blocks
n2erjo00 Oct 31, 2024
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
36 changes: 26 additions & 10 deletions packages/block-editor/src/components/block-tools/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { __unstableUseShortcutEventMatch as useShortcutEventMatch } from '@wordp
import { useRef } from '@wordpress/element';
import { switchToBlockType, store as blocksStore } from '@wordpress/blocks';
import { speak } from '@wordpress/a11y';
import { __ } from '@wordpress/i18n';
import { __, sprintf, _n } from '@wordpress/i18n';

/**
* Internal dependencies
Expand Down Expand Up @@ -92,19 +92,35 @@ export default function BlockTools( {
return;
}

if ( isMatch( 'core/block-editor/move-up', event ) ) {
if (
isMatch( 'core/block-editor/move-up', event ) ||
isMatch( 'core/block-editor/move-down', event )
) {
const clientIds = getSelectedBlockClientIds();
if ( clientIds.length ) {
event.preventDefault();
const rootClientId = getBlockRootClientId( clientIds[ 0 ] );
moveBlocksUp( clientIds, rootClientId );
}
} else if ( isMatch( 'core/block-editor/move-down', event ) ) {
const clientIds = getSelectedBlockClientIds();
if ( clientIds.length ) {
event.preventDefault();
const rootClientId = getBlockRootClientId( clientIds[ 0 ] );
moveBlocksDown( clientIds, rootClientId );
const direction = isMatch( 'core/block-editor/move-up', event )
? 'up'
: 'down';
if ( direction === 'up' ) {
moveBlocksUp( clientIds, rootClientId );
} else {
moveBlocksDown( clientIds, rootClientId );
}
const blockLength = Array.isArray( clientIds )
? clientIds.length
: 1;
const message = sprintf(
// translators: %d: the name of the block that has been moved
_n(
'%d block moved.',
'%d blocks moved.',
clientIds.length
),
blockLength
);
speak( message );
}
} else if ( isMatch( 'core/block-editor/duplicate', event ) ) {
const clientIds = getSelectedBlockClientIds();
Expand Down
Loading