Connect the dots: publish toggles publish sidebar or publish directly

edit-post/components/header/index.js

@@ -6,7 +6,6 @@ import { IconButton } from '@wordpress/components';
 import {
 	PostPreviewButton,
 	PostSavedState,
-	PostPublishPanelToggle,
 } from '@wordpress/editor';
 import { withDispatch, withSelect } from '@wordpress/data';
 import { compose } from '@wordpress/compose';
@@ -19,13 +18,15 @@ import './style.scss';
 import MoreMenu from './more-menu';
 import HeaderToolbar from './header-toolbar';
 import PinnedPlugins from './pinned-plugins';
+import PublishButton from './publish-button';
 import shortcuts from '../../keyboard-shortcuts';
 
 function Header( {
 	isEditorSidebarOpened,
 	openGeneralSidebar,
 	closeGeneralSidebar,
 	isPublishSidebarOpened,
+	isPublishSidebarEnabled,
 	togglePublishSidebar,
 	hasActiveMetaboxes,
 	isSaving,
@@ -48,8 +49,9 @@ function Header( {
 						forceIsSaving={ isSaving }
 					/>
 					<PostPreviewButton />
-					<PostPublishPanelToggle
-						isOpen={ isPublishSidebarOpened }
+					<PublishButton
+						isSidebarOpen={ isPublishSidebarOpened }
+						isSidebarEnabled={ isPublishSidebarEnabled }
 						onToggle={ togglePublishSidebar }
 						forceIsDirty={ hasActiveMetaboxes }
 						forceIsSaving={ isSaving }
@@ -79,6 +81,7 @@ export default compose(
 	withSelect( ( select ) => ( {
 		isEditorSidebarOpened: select( 'core/edit-post' ).isEditorSidebarOpened(),
 		isPublishSidebarOpened: select( 'core/edit-post' ).isPublishSidebarOpened(),
+		isPublishSidebarEnabled: select( 'core/edit-post' ).isPublishSidebarEnabled(),
 		hasActiveMetaboxes: select( 'core/edit-post' ).hasMetaBoxes(),
 		isSaving: select( 'core/edit-post' ).isSavingMetaBoxes(),
 		hasBlockSelection: !! select( 'core/editor' ).getBlockSelectionStart(),

edit-post/components/header/publish-button/index.js

@@ -0,0 +1,25 @@
+import { PostPublishPanelToggle, PostPublishButton } from '@wordpress/editor';
+
+const PublishButton = function( {
+	isSidebarOpen,
+	isSidebarEnabled,
+	onToggle,
+	forceIsDirty,
+	forceIsSaving } ) {
+	if ( isSidebarEnabled ) {
+		return (
+			<PostPublishPanelToggle
+				isSidebarOpen={ isSidebarOpen }
+				onToggle={ onToggle }
+				forceIsDirty={ forceIsDirty }
+				forceIsSaving={ forceIsSaving }
+			/>
+		);
+	}
+	return <PostPublishButton
+		forceIsDirty={ forceIsDirty }
+		forceIsSaving={ forceIsSaving }
+	/>;
+};
+
+export default PublishButton;