From f464168589ad8664afba058e0e7923b2fb4d73d2 Mon Sep 17 00:00:00 2001 From: Andrew Serong <14988353+andrewserong@users.noreply.github.com> Date: Mon, 6 Mar 2023 10:14:10 +1100 Subject: [PATCH] Add speak call, use clearSelectedBlock action --- .../src/components/secondary-sidebar/list-view-sidebar.js | 6 ++++-- .../src/components/secondary-sidebar/list-view-sidebar.js | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/edit-post/src/components/secondary-sidebar/list-view-sidebar.js b/packages/edit-post/src/components/secondary-sidebar/list-view-sidebar.js index accf4296ab4eb5..5d08ae38786c0a 100644 --- a/packages/edit-post/src/components/secondary-sidebar/list-view-sidebar.js +++ b/packages/edit-post/src/components/secondary-sidebar/list-view-sidebar.js @@ -19,6 +19,7 @@ import { import { useDispatch, useSelect } from '@wordpress/data'; import { focus } from '@wordpress/dom'; import { useRef, useState } from '@wordpress/element'; +import { speak } from '@wordpress/a11y'; import { __ } from '@wordpress/i18n'; import { closeSmall } from '@wordpress/icons'; import { useShortcut } from '@wordpress/keyboard-shortcuts'; @@ -32,7 +33,7 @@ import ListViewOutline from './list-view-outline'; export default function ListViewSidebar() { const { setIsListViewOpened } = useDispatch( editPostStore ); - const { selectBlock } = useDispatch( blockEditorStore ); + const { clearSelectedBlock } = useDispatch( blockEditorStore ); const { hasBlockSelection } = useSelect( ( select ) => ( { hasBlockSelection: @@ -57,7 +58,8 @@ export default function ListViewSidebar() { hasBlockSelection ) { event.preventDefault(); - selectBlock(); + clearSelectedBlock(); + speak( __( 'All blocks deselected.' ), 'assertive' ); return; } diff --git a/packages/edit-site/src/components/secondary-sidebar/list-view-sidebar.js b/packages/edit-site/src/components/secondary-sidebar/list-view-sidebar.js index e71e976ef960a5..96ba1558c8e3ac 100644 --- a/packages/edit-site/src/components/secondary-sidebar/list-view-sidebar.js +++ b/packages/edit-site/src/components/secondary-sidebar/list-view-sidebar.js @@ -13,6 +13,7 @@ import { useMergeRefs, } from '@wordpress/compose'; import { useDispatch, useSelect } from '@wordpress/data'; +import { speak } from '@wordpress/a11y'; import { __ } from '@wordpress/i18n'; import { closeSmall } from '@wordpress/icons'; import { ESCAPE } from '@wordpress/keycodes'; @@ -24,7 +25,7 @@ import { store as editSiteStore } from '../../store'; export default function ListViewSidebar() { const { setIsListViewOpened } = useDispatch( editSiteStore ); - const { selectBlock } = useDispatch( blockEditorStore ); + const { clearSelectedBlock } = useDispatch( blockEditorStore ); const { hasBlockSelection } = useSelect( ( select ) => ( { hasBlockSelection: @@ -46,7 +47,8 @@ export default function ListViewSidebar() { hasBlockSelection ) { event.preventDefault(); - selectBlock(); + clearSelectedBlock(); + speak( __( 'All blocks deselected.' ), 'assertive' ); return; }