From 3d9dbd4f4e91d6bb790d7baaf5b974f85a47cad8 Mon Sep 17 00:00:00 2001 From: Robert Anderson Date: Mon, 26 Jun 2023 10:50:04 +1000 Subject: [PATCH] Page Content Focus: Switch to Page panel when deselecting a block --- .../edit-site/src/components/sidebar-edit-mode/index.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/edit-site/src/components/sidebar-edit-mode/index.js b/packages/edit-site/src/components/sidebar-edit-mode/index.js index 80a02c11bd88f4..8a36a0b5395610 100644 --- a/packages/edit-site/src/components/sidebar-edit-mode/index.js +++ b/packages/edit-site/src/components/sidebar-edit-mode/index.js @@ -56,11 +56,13 @@ export function SidebarComplementaryAreaFills() { useEffect( () => { // Don't automatically switch tab when the sidebar is closed or when we // are focused on page content. - if ( ! isEditorSidebarOpened || hasPageContentFocus ) { + if ( ! isEditorSidebarOpened ) { return; } if ( hasBlockSelection ) { - enableComplementaryArea( STORE_NAME, SIDEBAR_BLOCK ); + if ( ! hasPageContentFocus ) { + enableComplementaryArea( STORE_NAME, SIDEBAR_BLOCK ); + } } else { enableComplementaryArea( STORE_NAME, SIDEBAR_TEMPLATE ); }