keep publish panel rendered for post publish panel

WordPress · Apr 1, 2024 · 0b40d06 · 0b40d06
1 parent 5616b5a
commit 0b40d06
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 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
@@ -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
@@ -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( {