From 0b40d06e494270ba70b3240d99a28deb47b656e4 Mon Sep 17 00:00:00 2001
From: ntsekouras <ntsekouras@outlook.com>
Date: Fri, 29 Mar 2024 08:57:16 +0200
Subject: [PATCH] keep publish panel rendered for post publish panel

---
 .../edit-site/src/components/header-edit-mode/index.js |  2 --
 packages/edit-site/src/components/layout/index.js      | 10 +++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/edit-site/src/components/header-edit-mode/index.js b/packages/edit-site/src/components/header-edit-mode/index.js
index e0f180bd71651..8c3a2142e5bf1 100644
--- a/packages/edit-site/src/components/header-edit-mode/index.js
+++ b/packages/edit-site/src/components/header-edit-mode/index.js
@@ -79,8 +79,6 @@ export default function HeaderEditMode( { setEntitiesSavedStatesCallback } ) {
 				select( editSiteStore )
 			).getEditorCanvasContainerView(),
 			isDistractionFree: getPreference( 'core', 'distractionFree' ),
-			// TODO: by unmounting the `publish` button, we cannot render
-			// post-publish panel...
 			showPublishButton:
 				currentPostIsDraft && ! hasNonPostEntityChanges(),
 		};
diff --git a/packages/edit-site/src/components/layout/index.js b/packages/edit-site/src/components/layout/index.js
index 2e19fdd8291d4..e60b96c3aadb7 100644
--- a/packages/edit-site/src/components/layout/index.js
+++ b/packages/edit-site/src/components/layout/index.js
@@ -84,8 +84,11 @@ export default function Layout() {
 			keyboardShortcutsStore
 		);
 		const { getCanvasMode } = unlock( select( editSiteStore ) );
-		const { getCurrentPostAttribute, hasNonPostEntityChanges } =
-			select( editorStore );
+		const {
+			getCurrentPostAttribute,
+			hasNonPostEntityChanges,
+			isPublishSidebarOpened,
+		} = select( editorStore );
 		const currentPostIsDraft =
 			getCurrentPostAttribute( 'status' ) === 'draft';
 		return {
@@ -110,7 +113,8 @@ export default function Layout() {
 			hasBlockSelected:
 				select( blockEditorStore ).getBlockSelectionStart(),
 			showPublishButton:
-				currentPostIsDraft && ! hasNonPostEntityChanges(),
+				! hasNonPostEntityChanges() &&
+				( currentPostIsDraft || isPublishSidebarOpened() ),
 		};
 	}, [] );
 	const navigateRegionsProps = useNavigateRegions( {