@wordpress/edit-post 7.25.0 → 7.26.0

package/build-style/style.css

@@ -569,6 +569,10 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   color: #757575;
 }
 
+.interface-preferences-modal__section:has(.interface-preferences-modal__section-content:empty) {
+  display: none;
+}
+
 .interface-preferences-modal__option + .interface-preferences-modal__option {
   margin-top: 16px;
 }
@@ -736,21 +740,21 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 .edit-post-header__dropdown .components-menu-items-choice .components-menu-items__item-icon.components-menu-items__item-icon {
   display: block;
 }
-.show-icon-labels.interface-pinned-items .edit-post-header-toolbar__inserter-toggle.edit-post-header-toolbar__inserter-toggle,
+.show-icon-labels.interface-pinned-items .editor-document-tools__inserter-toggle.editor-document-tools__inserter-toggle,
 .show-icon-labels.interface-pinned-items .interface-pinned-items .components-button,
-.show-icon-labels .edit-post-header .edit-post-header-toolbar__inserter-toggle.edit-post-header-toolbar__inserter-toggle,
+.show-icon-labels .edit-post-header .editor-document-tools__inserter-toggle.editor-document-tools__inserter-toggle,
 .show-icon-labels .edit-post-header .interface-pinned-items .components-button,
-.edit-post-header__dropdown .edit-post-header-toolbar__inserter-toggle.edit-post-header-toolbar__inserter-toggle,
+.edit-post-header__dropdown .editor-document-tools__inserter-toggle.editor-document-tools__inserter-toggle,
 .edit-post-header__dropdown .interface-pinned-items .components-button {
   padding-left: 8px;
   padding-right: 8px;
 }
 @media (min-width: 600px) {
-  .show-icon-labels.interface-pinned-items .edit-post-header-toolbar__inserter-toggle.edit-post-header-toolbar__inserter-toggle,
+  .show-icon-labels.interface-pinned-items .editor-document-tools__inserter-toggle.editor-document-tools__inserter-toggle,
 .show-icon-labels.interface-pinned-items .interface-pinned-items .components-button,
-.show-icon-labels .edit-post-header .edit-post-header-toolbar__inserter-toggle.edit-post-header-toolbar__inserter-toggle,
+.show-icon-labels .edit-post-header .editor-document-tools__inserter-toggle.editor-document-tools__inserter-toggle,
 .show-icon-labels .edit-post-header .interface-pinned-items .components-button,
-.edit-post-header__dropdown .edit-post-header-toolbar__inserter-toggle.edit-post-header-toolbar__inserter-toggle,
+.edit-post-header__dropdown .editor-document-tools__inserter-toggle.editor-document-tools__inserter-toggle,
 .edit-post-header__dropdown .interface-pinned-items .components-button {
     padding-left: 12px;
     padding-right: 12px;
@@ -835,7 +839,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 .is-distraction-free .edit-post-header > .edit-post-header__settings > .edit-post-header__post-preview-button {
   visibility: hidden;
 }
-.is-distraction-free .edit-post-header > .edit-post-header__toolbar .edit-post-header-toolbar__inserter-toggle, .is-distraction-free .edit-post-header > .edit-post-header__toolbar .edit-post-header-toolbar__document-overview-toggle, .is-distraction-free .edit-post-header > .edit-post-header__settings > .editor-preview-dropdown, .is-distraction-free .edit-post-header > .edit-post-header__settings > .interface-pinned-items {
+.is-distraction-free .edit-post-header > .edit-post-header__toolbar .editor-document-tools__inserter-toggle, .is-distraction-free .edit-post-header > .edit-post-header__toolbar .editor-document-tools__document-overview-toggle, .is-distraction-free .edit-post-header > .edit-post-header__settings > .editor-preview-dropdown, .is-distraction-free .edit-post-header > .edit-post-header__settings > .interface-pinned-items {
   display: none;
 }
 .is-distraction-free .interface-interface-skeleton__header:focus-within {
@@ -915,114 +919,6 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   margin-top: -1px;
 }
 
-.edit-post-header-toolbar {
-  display: inline-flex;
-  align-items: center;
-}
-.edit-post-header-toolbar .edit-post-header-toolbar__left > .components-button {
-  display: none;
-}
-@media (min-width: 600px) {
-  .edit-post-header-toolbar .edit-post-header-toolbar__left > .components-button {
-    display: inline-flex;
-  }
-}
-.edit-post-header-toolbar .edit-post-header-toolbar__left > .edit-post-header-toolbar__inserter-toggle {
-  display: inline-flex;
-}
-.edit-post-header-toolbar .edit-post-header-toolbar__left > .edit-post-header-toolbar__inserter-toggle svg {
-  transition: transform cubic-bezier(0.165, 0.84, 0.44, 1) 0.2s;
-}
-@media (prefers-reduced-motion: reduce) {
-  .edit-post-header-toolbar .edit-post-header-toolbar__left > .edit-post-header-toolbar__inserter-toggle svg {
-    transition-duration: 0s;
-    transition-delay: 0s;
-  }
-}
-.edit-post-header-toolbar .edit-post-header-toolbar__left > .edit-post-header-toolbar__inserter-toggle.is-pressed svg {
-  transform: rotate(45deg);
-}
-.edit-post-header-toolbar .block-editor-list-view {
-  display: none;
-}
-@media (min-width: 600px) {
-  .edit-post-header-toolbar .block-editor-list-view {
-    display: flex;
-  }
-}
-.edit-post-header-toolbar .edit-post-header-toolbar__left > .components-button.has-icon,
-.edit-post-header-toolbar .edit-post-header-toolbar__left > .components-dropdown > .components-button.has-icon {
-  height: 32px;
-  min-width: 32px;
-  padding: 4px;
-}
-.edit-post-header-toolbar .edit-post-header-toolbar__left > .components-button.has-icon.is-pressed,
-.edit-post-header-toolbar .edit-post-header-toolbar__left > .components-dropdown > .components-button.has-icon.is-pressed {
-  background: #1e1e1e;
-}
-.edit-post-header-toolbar .edit-post-header-toolbar__left > .components-button.has-icon:focus:not(:disabled),
-.edit-post-header-toolbar .edit-post-header-toolbar__left > .components-dropdown > .components-button.has-icon:focus:not(:disabled) {
-  box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color), inset 0 0 0 1px #fff;
-  outline: 1px solid transparent;
-}
-.edit-post-header-toolbar .edit-post-header-toolbar__left > .components-button.has-icon::before,
-.edit-post-header-toolbar .edit-post-header-toolbar__left > .components-dropdown > .components-button.has-icon::before {
-  display: none;
-}
-
-@media (min-width: 600px) {
-  .edit-post-header.has-reduced-ui .edit-post-header-toolbar__left > * + .components-button,
-.edit-post-header.has-reduced-ui .edit-post-header-toolbar__left > * + .components-dropdown > [aria-expanded=false] {
-    transition: opacity 0.1s linear;
-  }
-}
-@media (min-width: 600px) and (prefers-reduced-motion: reduce) {
-  .edit-post-header.has-reduced-ui .edit-post-header-toolbar__left > * + .components-button,
-.edit-post-header.has-reduced-ui .edit-post-header-toolbar__left > * + .components-dropdown > [aria-expanded=false] {
-    transition-duration: 0s;
-    transition-delay: 0s;
-  }
-}
-@media (min-width: 600px) {
-  .edit-post-header.has-reduced-ui:not(:hover) .edit-post-header-toolbar__left > * + .components-button, .edit-post-header.has-reduced-ui:not(:hover) .edit-post-header-toolbar__left > * + .components-dropdown > [aria-expanded=false] {
-    opacity: 0;
-  }
-}
-
-.edit-post-header-toolbar__left {
-  display: inline-flex;
-  align-items: center;
-  padding-left: 16px;
-  gap: 8px;
-  margin-right: 8px;
-}
-@media (min-width: 782px) {
-  .edit-post-header-toolbar__left {
-    padding-left: 20px;
-  }
-}
-@media (min-width: 1280px) {
-  .edit-post-header-toolbar__left {
-    padding-right: 8px;
-  }
-}
-
-.edit-post-header-toolbar .edit-post-header-toolbar__left > .edit-post-header-toolbar__inserter-toggle.has-icon {
-  min-width: 32px;
-  width: 32px;
-  height: 32px;
-  padding: 0;
-}
-.show-icon-labels .edit-post-header-toolbar .edit-post-header-toolbar__left > .edit-post-header-toolbar__inserter-toggle.has-icon {
-  width: auto;
-  height: 32px;
-  padding: 0 8px;
-}
-
-.show-icon-labels .edit-post-header-toolbar__left > * + * {
-  margin-left: 8px;
-}
-
 .edit-post-keyboard-shortcut-help-modal__section {
   margin: 0 0 2rem 0;
 }
@@ -1371,156 +1267,6 @@ body.is-fullscreen-mode .edit-post-layout .components-editor-notices__snackbar {
   clear: both;
 }
 
-/**
- * Note that this CSS file should be in sync with its counterpart in the other editor:
- * packages/edit-site/src/components/secondary-sidebar/style.scss
- */
-.edit-post-editor__inserter-panel,
-.edit-post-editor__document-overview-panel {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-}
-
-@media (min-width: 782px) {
-  .edit-post-editor__document-overview-panel {
-    width: 350px;
-  }
-}
-.edit-post-editor__document-overview-panel .edit-post-editor__document-overview-panel__close-button {
-  position: absolute;
-  right: 8px;
-  top: 6px;
-  z-index: 1;
-  background: #fff;
-}
-.edit-post-editor__document-overview-panel .components-tab-panel__tabs {
-  border-bottom: 1px solid #ddd;
-  box-sizing: border-box;
-  display: flex;
-  width: 100%;
-  padding-right: 56px;
-}
-.edit-post-editor__document-overview-panel .components-tab-panel__tabs .edit-post-sidebar__panel-tab {
-  width: 50%;
-  margin-bottom: -1px;
-}
-.edit-post-editor__document-overview-panel .components-tab-panel__tab-content {
-  height: calc(100% - 47px);
-}
-
-.edit-post-editor__inserter-panel-header {
-  padding-top: 8px;
-  padding-right: 8px;
-  display: flex;
-  justify-content: flex-end;
-}
-
-.edit-post-editor__inserter-panel-content {
-  height: calc(100% - 36px - 8px);
-}
-@media (min-width: 782px) {
-  .edit-post-editor__inserter-panel-content {
-    height: 100%;
-  }
-}
-
-.edit-post-editor__list-view-panel-content,
-.edit-post-editor__list-view-container > .document-outline,
-.edit-post-editor__list-view-empty-headings {
-  height: 100%;
-  scrollbar-width: thin;
-  scrollbar-gutter: stable both-edges;
-  scrollbar-color: transparent transparent;
-  will-change: transform;
-  overflow: auto;
-  scrollbar-gutter: auto;
-  padding: 8px 6px;
-}
-.edit-post-editor__list-view-panel-content::-webkit-scrollbar,
-.edit-post-editor__list-view-container > .document-outline::-webkit-scrollbar,
-.edit-post-editor__list-view-empty-headings::-webkit-scrollbar {
-  width: 12px;
-  height: 12px;
-}
-.edit-post-editor__list-view-panel-content::-webkit-scrollbar-track,
-.edit-post-editor__list-view-container > .document-outline::-webkit-scrollbar-track,
-.edit-post-editor__list-view-empty-headings::-webkit-scrollbar-track {
-  background-color: transparent;
-}
-.edit-post-editor__list-view-panel-content::-webkit-scrollbar-thumb,
-.edit-post-editor__list-view-container > .document-outline::-webkit-scrollbar-thumb,
-.edit-post-editor__list-view-empty-headings::-webkit-scrollbar-thumb {
-  background-color: transparent;
-  border-radius: 8px;
-  border: 3px solid transparent;
-  background-clip: padding-box;
-}
-.edit-post-editor__list-view-panel-content:hover::-webkit-scrollbar-thumb, .edit-post-editor__list-view-panel-content:focus::-webkit-scrollbar-thumb, .edit-post-editor__list-view-panel-content:focus-within::-webkit-scrollbar-thumb,
-.edit-post-editor__list-view-container > .document-outline:hover::-webkit-scrollbar-thumb,
-.edit-post-editor__list-view-container > .document-outline:focus::-webkit-scrollbar-thumb,
-.edit-post-editor__list-view-container > .document-outline:focus-within::-webkit-scrollbar-thumb,
-.edit-post-editor__list-view-empty-headings:hover::-webkit-scrollbar-thumb,
-.edit-post-editor__list-view-empty-headings:focus::-webkit-scrollbar-thumb,
-.edit-post-editor__list-view-empty-headings:focus-within::-webkit-scrollbar-thumb {
-  background-color: #949494;
-}
-.edit-post-editor__list-view-panel-content:hover, .edit-post-editor__list-view-panel-content:focus, .edit-post-editor__list-view-panel-content:focus-within,
-.edit-post-editor__list-view-container > .document-outline:hover,
-.edit-post-editor__list-view-container > .document-outline:focus,
-.edit-post-editor__list-view-container > .document-outline:focus-within,
-.edit-post-editor__list-view-empty-headings:hover,
-.edit-post-editor__list-view-empty-headings:focus,
-.edit-post-editor__list-view-empty-headings:focus-within {
-  scrollbar-color: #949494 transparent;
-}
-@media (hover: none) {
-  .edit-post-editor__list-view-panel-content,
-.edit-post-editor__list-view-container > .document-outline,
-.edit-post-editor__list-view-empty-headings {
-    scrollbar-color: #949494 transparent;
-  }
-}
-
-.edit-post-editor__list-view-empty-headings {
-  text-align: center;
-  color: #757575;
-}
-.edit-post-editor__list-view-empty-headings > svg {
-  margin-top: 28px;
-}
-.edit-post-editor__list-view-empty-headings > p {
-  padding-left: 32px;
-  padding-right: 32px;
-}
-
-.edit-post-editor__list-view-overview {
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-  border-bottom: 1px solid #ddd;
-  padding: 16px;
-}
-.edit-post-editor__list-view-overview > div > span:first-child {
-  width: 90px;
-  display: inline-block;
-}
-.edit-post-editor__list-view-overview > div > span {
-  font-size: 12px;
-  line-height: 1.4;
-  color: #757575;
-}
-
-.edit-post-editor__list-view-container {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-}
-
-.edit-post-editor__document-overview-panel__tab-panel {
-  height: 100%;
-}
-
 .components-panel__header.edit-post-sidebar__panel-tabs {
   padding-left: 0;
   padding-right: 16px;
@@ -1540,15 +1286,6 @@ body.is-fullscreen-mode .edit-post-layout .components-editor-notices__snackbar {
   margin-top: -1px;
 }
 
-.components-panel__body.is-opened.edit-post-last-revision__panel {
-  padding: 0;
-  height: 48px;
-}
-
-.editor-post-last-revision__title.components-button.components-button {
-  padding: 16px;
-}
-
 .edit-post-post-format {
   display: flex;
   flex-direction: column;
@@ -1610,7 +1347,6 @@ h2.edit-post-template-summary__title {
 }
 @media (min-width: 960px) {
   .edit-post-text-editor__body {
-    padding: 16px 24px 96px 24px;
     padding: 0 24px 24px 24px;
   }
 }
@@ -1641,9 +1377,6 @@ h2.edit-post-template-summary__title {
   font-size: 13px;
   color: #1e1e1e;
 }
-.edit-post-text-editor__toolbar .components-button svg {
-  order: 1;
-}
 
 .edit-post-visual-editor {
   position: relative;
@@ -1794,8 +1527,7 @@ body.js.block-editor-page .media-frame select.attachment-filters:last-of-type {
 .edit-post-sidebar,
 .editor-post-publish-panel,
 .components-popover,
-.components-modal__frame,
-.edit-post-editor__inserter-panel {
+.components-modal__frame {
   box-sizing: border-box;
 }
 .edit-post-header *,
@@ -1815,10 +1547,7 @@ body.js.block-editor-page .media-frame select.attachment-filters:last-of-type {
 .components-popover *::after,
 .components-modal__frame *,
 .components-modal__frame *::before,
-.components-modal__frame *::after,
-.edit-post-editor__inserter-panel *,
-.edit-post-editor__inserter-panel *::before,
-.edit-post-editor__inserter-panel *::after {
+.components-modal__frame *::after {
   box-sizing: inherit;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-post",
-	"version": "7.25.0",
+	"version": "7.26.0",
 	"description": "Edit Post module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -27,36 +27,36 @@
 	"react-native": "src/index",
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "^3.48.0",
-		"@wordpress/api-fetch": "^6.45.0",
-		"@wordpress/block-editor": "^12.16.0",
-		"@wordpress/block-library": "^8.25.0",
-		"@wordpress/blocks": "^12.25.0",
-		"@wordpress/commands": "^0.19.0",
-		"@wordpress/components": "^25.14.0",
-		"@wordpress/compose": "^6.25.0",
-		"@wordpress/core-commands": "^0.17.0",
-		"@wordpress/core-data": "^6.25.0",
-		"@wordpress/data": "^9.18.0",
-		"@wordpress/deprecated": "^3.48.0",
-		"@wordpress/dom": "^3.48.0",
-		"@wordpress/editor": "^13.25.0",
-		"@wordpress/element": "^5.25.0",
-		"@wordpress/hooks": "^3.48.0",
-		"@wordpress/i18n": "^4.48.0",
-		"@wordpress/icons": "^9.39.0",
-		"@wordpress/interface": "^5.25.0",
-		"@wordpress/keyboard-shortcuts": "^4.25.0",
-		"@wordpress/keycodes": "^3.48.0",
-		"@wordpress/media-utils": "^4.39.0",
-		"@wordpress/notices": "^4.16.0",
-		"@wordpress/plugins": "^6.16.0",
-		"@wordpress/preferences": "^3.25.0",
-		"@wordpress/private-apis": "^0.30.0",
-		"@wordpress/url": "^3.49.0",
-		"@wordpress/viewport": "^5.25.0",
-		"@wordpress/warning": "^2.48.0",
-		"@wordpress/widgets": "^3.25.0",
+		"@wordpress/a11y": "^3.49.0",
+		"@wordpress/api-fetch": "^6.46.0",
+		"@wordpress/block-editor": "^12.17.0",
+		"@wordpress/block-library": "^8.26.0",
+		"@wordpress/blocks": "^12.26.0",
+		"@wordpress/commands": "^0.20.0",
+		"@wordpress/components": "^25.15.0",
+		"@wordpress/compose": "^6.26.0",
+		"@wordpress/core-commands": "^0.18.0",
+		"@wordpress/core-data": "^6.26.0",
+		"@wordpress/data": "^9.19.0",
+		"@wordpress/deprecated": "^3.49.0",
+		"@wordpress/dom": "^3.49.0",
+		"@wordpress/editor": "^13.26.0",
+		"@wordpress/element": "^5.26.0",
+		"@wordpress/hooks": "^3.49.0",
+		"@wordpress/i18n": "^4.49.0",
+		"@wordpress/icons": "^9.40.0",
+		"@wordpress/interface": "^5.26.0",
+		"@wordpress/keyboard-shortcuts": "^4.26.0",
+		"@wordpress/keycodes": "^3.49.0",
+		"@wordpress/media-utils": "^4.40.0",
+		"@wordpress/notices": "^4.17.0",
+		"@wordpress/plugins": "^6.17.0",
+		"@wordpress/preferences": "^3.26.0",
+		"@wordpress/private-apis": "^0.31.0",
+		"@wordpress/url": "^3.50.0",
+		"@wordpress/viewport": "^5.26.0",
+		"@wordpress/warning": "^2.49.0",
+		"@wordpress/widgets": "^3.26.0",
 		"classnames": "^2.3.1",
 		"memize": "^2.1.0",
 		"rememo": "^4.0.2"
@@ -68,5 +68,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "fcf61b4beff747222c2c81d09d757ca1a0abd925"
+	"gitHead": "5e6f9caa205d3bfdbac131952b7bf9c6ec60569b"
 }

package/src/components/browser-url/index.js

@@ -43,7 +43,8 @@ export class BrowserURL extends Component {
 	}
 
 	componentDidUpdate( prevProps ) {
-		const { postId, postStatus, postType, isSavingPost } = this.props;
+		const { postId, postStatus, postType, isSavingPost, hasHistory } =
+			this.props;
 		const { historyId } = this.state;
 
 		// Posts are still dirty while saving so wait for saving to finish
@@ -56,7 +57,8 @@ export class BrowserURL extends Component {
 		if (
 			( postId !== prevProps.postId || postId !== historyId ) &&
 			postStatus !== 'auto-draft' &&
-			postId
+			postId &&
+			! hasHistory
 		) {
 			this.setBrowserURL( postId );
 		}

package/src/components/header/index.js

@@ -34,15 +34,14 @@ import { store as preferencesStore } from '@wordpress/preferences';
  * Internal dependencies
  */
 import FullscreenModeClose from './fullscreen-mode-close';
-import HeaderToolbar from './header-toolbar';
 import MoreMenu from './more-menu';
 import PostPublishButtonOrToggle from './post-publish-button-or-toggle';
-import ViewLink from '../view-link';
 import MainDashboardButton from './main-dashboard-button';
 import { store as editPostStore } from '../../store';
 import { unlock } from '../../lock-unlock';
 
-const { PreviewDropdown } = unlock( editorPrivateApis );
+const { DocumentTools, PostViewLink, PreviewDropdown } =
+	unlock( editorPrivateApis );
 
 const slideY = {
 	hidden: { y: '-50px' },
@@ -56,48 +55,47 @@ const slideX = {
 	hover: { x: 0, transition: { type: 'tween', delay: 0.2 } },
 };
 
-function Header( {
-	setEntitiesSavedStatesCallback,
-	setListViewToggleElement,
-} ) {
+function Header( { setEntitiesSavedStatesCallback } ) {
 	const isWideViewport = useViewportMatch( 'large' );
 	const isLargeViewport = useViewportMatch( 'medium' );
 	const blockToolbarRef = useRef();
 	const {
-		blockSelectionStart,
+		isTextEditor,
+		hasBlockSelection,
 		hasActiveMetaboxes,
 		hasFixedToolbar,
 		isEditingTemplate,
 		isPublishSidebarOpened,
 		showIconLabels,
+		hasHistory,
 	} = useSelect( ( select ) => {
 		const { get: getPreference } = select( preferencesStore );
+		const { getEditorMode } = select( editPostStore );
 
 		return {
-			blockSelectionStart:
-				select( blockEditorStore ).getBlockSelectionStart(),
+			isTextEditor: getEditorMode() === 'text',
+			hasBlockSelection:
+				!! select( blockEditorStore ).getBlockSelectionStart(),
 			hasActiveMetaboxes: select( editPostStore ).hasMetaBoxes(),
+			hasHistory: !! select( editorStore ).getEditorSettings().goBack,
 			isEditingTemplate:
 				select( editorStore ).getRenderingMode() === 'template-only',
 			isPublishSidebarOpened:
 				select( editPostStore ).isPublishSidebarOpened(),
-			hasFixedToolbar: getPreference( 'core/edit-post', 'fixedToolbar' ),
-			showIconLabels:
-				select( editPostStore ).isFeatureActive( 'showIconLabels' ),
+			hasFixedToolbar: getPreference( 'core', 'fixedToolbar' ),
+			showIconLabels: getPreference( 'core', 'showIconLabels' ),
 		};
 	}, [] );
 
 	const [ isBlockToolsCollapsed, setIsBlockToolsCollapsed ] =
 		useState( true );
 
-	const hasBlockSelected = !! blockSelectionStart;
-
 	useEffect( () => {
 		// If we have a new block selection, show the block tools
-		if ( blockSelectionStart ) {
+		if ( hasBlockSelection ) {
 			setIsBlockToolsCollapsed( false );
 		}
-	}, [ blockSelectionStart ] );
+	}, [ hasBlockSelection ] );
 
 	return (
 		<div className="edit-post-header">
@@ -114,10 +112,7 @@ function Header( {
 				transition={ { type: 'tween', delay: 0.8 } }
 				className="edit-post-header__toolbar"
 			>
-				<HeaderToolbar
-					hasFixedToolbar={ hasFixedToolbar }
-					setListViewToggleElement={ setListViewToggleElement }
-				/>
+				<DocumentTools disableBlockTools={ isTextEditor } />
 				{ hasFixedToolbar && isLargeViewport && (
 					<>
 						<div
@@ -136,7 +131,7 @@ function Header( {
 							ref={ blockToolbarRef }
 							name="block-toolbar"
 						/>
-						{ isEditingTemplate && hasBlockSelected && (
+						{ isEditingTemplate && hasBlockSelection && (
 							<Button
 								className="edit-post-header__block-tools-toggle"
 								icon={ isBlockToolsCollapsed ? next : previous }
@@ -158,13 +153,13 @@ function Header( {
 					className={ classnames( 'edit-post-header__center', {
 						'is-collapsed':
 							isEditingTemplate &&
-							hasBlockSelected &&
+							hasBlockSelection &&
 							! isBlockToolsCollapsed &&
 							hasFixedToolbar &&
 							isLargeViewport,
 					} ) }
 				>
-					{ isEditingTemplate && <DocumentBar /> }
+					{ ( isEditingTemplate || hasHistory ) && <DocumentBar /> }
 				</div>
 			</motion.div>
 			<motion.div
@@ -178,20 +173,14 @@ function Header( {
 					// we want to prevent mounting/unmounting the PostPublishButtonOrToggle DOM node.
 					// We track that DOM node to return focus to the PostPublishButtonOrToggle
 					// when the publish sidebar has been closed.
-					<PostSavedState
-						forceIsDirty={ hasActiveMetaboxes }
-						showIconLabels={ showIconLabels }
-					/>
+					<PostSavedState forceIsDirty={ hasActiveMetaboxes } />
 				) }
-				<PreviewDropdown
-					showIconLabels={ showIconLabels }
-					forceIsAutosaveable={ hasActiveMetaboxes }
-				/>
+				<PreviewDropdown forceIsAutosaveable={ hasActiveMetaboxes } />
 				<PostPreviewButton
 					className="edit-post-header__post-preview-button"
 					forceIsAutosaveable={ hasActiveMetaboxes }
 				/>
-				<ViewLink />
+				<PostViewLink />
 				<PostPublishButtonOrToggle
 					forceIsDirty={ hasActiveMetaboxes }
 					setEntitiesSavedStatesCallback={
@@ -199,14 +188,9 @@ function Header( {
 					}
 				/>
 				{ ( isWideViewport || ! showIconLabels ) && (
-					<>
-						<PinnedItems.Slot scope="core/edit-post" />
-						<MoreMenu showIconLabels={ showIconLabels } />
-					</>
-				) }
-				{ showIconLabels && ! isWideViewport && (
-					<MoreMenu showIconLabels={ showIconLabels } />
+					<PinnedItems.Slot scope="core/edit-post" />
 				) }
+				<MoreMenu showIconLabels={ showIconLabels } />
 			</motion.div>
 		</div>
 	);

package/src/components/header/style.scss

@@ -174,7 +174,7 @@
 	.components-menu-items-choice .components-menu-items__item-icon.components-menu-items__item-icon {
 		display: block;
 	}
-	.edit-post-header-toolbar__inserter-toggle.edit-post-header-toolbar__inserter-toggle,
+	.editor-document-tools__inserter-toggle.editor-document-tools__inserter-toggle,
 	.interface-pinned-items .components-button {
 		padding-left: $grid-unit;
 		padding-right: $grid-unit;
@@ -275,8 +275,8 @@
 			visibility: hidden;
 		}
 
-		& > .edit-post-header__toolbar .edit-post-header-toolbar__inserter-toggle,
-		& > .edit-post-header__toolbar .edit-post-header-toolbar__document-overview-toggle,
+		& > .edit-post-header__toolbar .editor-document-tools__inserter-toggle,
+		& > .edit-post-header__toolbar .editor-document-tools__document-overview-toggle,
 		& > .edit-post-header__settings > .editor-preview-dropdown,
 		& > .edit-post-header__settings > .interface-pinned-items {
 			display: none;