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 5d08ae38786c0a..f5cb058600d0e7 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
@@ -49,6 +49,13 @@ export default function ListViewSidebar() {
const [ tab, setTab ] = useState( 'list-view' );
function closeOnEscape( event ) {
+ if ( event.keyCode === ESCAPE && ! event.defaultPrevented ) {
+ event.preventDefault();
+ setIsListViewOpened( false );
+ }
+ }
+
+ function clearSelectionOnEscape( event ) {
// If there is a block selection, then skip closing the list view
// and clear out the block selection instead.
if (
@@ -60,12 +67,6 @@ export default function ListViewSidebar() {
event.preventDefault();
clearSelectedBlock();
speak( __( 'All blocks deselected.' ), 'assertive' );
- return;
- }
-
- if ( event.keyCode === ESCAPE && ! event.defaultPrevented ) {
- event.preventDefault();
- setIsListViewOpened( false );
}
}
@@ -178,7 +179,11 @@ export default function ListViewSidebar() {
className="edit-post-editor__list-view-container"
>
{ tab === 'list-view' && (
-
+ // eslint-disable-next-line jsx-a11y/no-static-element-interactions
+
) }
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 96ba1558c8e3ac..8d9036188d5bd5 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
@@ -39,6 +39,12 @@ export default function ListViewSidebar() {
const contentFocusReturnRef = useFocusReturn();
function closeOnEscape( event ) {
+ if ( event.keyCode === ESCAPE && ! event.defaultPrevented ) {
+ setIsListViewOpened( false );
+ }
+ }
+
+ function clearSelectionOnEscape( event ) {
// If there is a block selection, then skip closing the list view
// and clear out the block selection instead.
if (
@@ -49,11 +55,6 @@ export default function ListViewSidebar() {
event.preventDefault();
clearSelectedBlock();
speak( __( 'All blocks deselected.' ), 'assertive' );
- return;
- }
-
- if ( event.keyCode === ESCAPE && ! event.defaultPrevented ) {
- setIsListViewOpened( false );
}
}
@@ -61,7 +62,7 @@ export default function ListViewSidebar() {
const labelId = `edit-site-editor__list-view-panel-label-${ instanceId }`;
return (
- // eslint-disable-next-line jsx-a11y/no-static-element-interactions
+ /* eslint-disable jsx-a11y/no-static-element-interactions */
+ /* eslint-enable jsx-a11y/no-static-element-interactions */
);
}
diff --git a/packages/edit-widgets/src/components/secondary-sidebar/list-view-sidebar.js b/packages/edit-widgets/src/components/secondary-sidebar/list-view-sidebar.js
index 4d221d15127609..d7235699a4a9c9 100644
--- a/packages/edit-widgets/src/components/secondary-sidebar/list-view-sidebar.js
+++ b/packages/edit-widgets/src/components/secondary-sidebar/list-view-sidebar.js
@@ -37,7 +37,15 @@ export default function ListViewSidebar() {
const focusOnMountRef = useFocusOnMount( 'firstElement' );
const headerFocusReturnRef = useFocusReturn();
const contentFocusReturnRef = useFocusReturn();
+
function closeOnEscape( event ) {
+ if ( event.keyCode === ESCAPE && ! event.defaultPrevented ) {
+ event.preventDefault();
+ setIsListViewOpened( false );
+ }
+ }
+
+ function clearSelectionOnEscape( event ) {
// If there is a block selection, then skip closing the list view
// and clear out the block selection instead.
if (
@@ -48,12 +56,6 @@ export default function ListViewSidebar() {
event.preventDefault();
clearSelectedBlock();
speak( __( 'All blocks deselected.' ), 'assertive' );
- return;
- }
-
- if ( event.keyCode === ESCAPE && ! event.defaultPrevented ) {
- event.preventDefault();
- setIsListViewOpened( false );
}
}
@@ -61,7 +63,7 @@ export default function ListViewSidebar() {
const labelId = `edit-widgets-editor__list-view-panel-label-${ instanceId }`;
return (
- // eslint-disable-next-line jsx-a11y/no-static-element-interactions
+ /* eslint-disable jsx-a11y/no-static-element-interactions */
+ /* eslint-enable jsx-a11y/no-static-element-interactions */
);
}