@wordpress/editor 14.0.0 → 14.0.2

package/build-style/style-rtl.css

@@ -352,10 +352,6 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 .interface-interface-skeleton__sidebar {
     position: relative !important;
   }
-  .is-sidebar-opened .interface-interface-skeleton__secondary-sidebar,
-.is-sidebar-opened .interface-interface-skeleton__sidebar {
-    z-index: 90;
-  }
 }
 
 .interface-interface-skeleton__sidebar {
@@ -592,6 +588,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 .editor-collapsible-block-toolbar .block-editor-block-contextual-toolbar {
   border-bottom: 0;
   height: 100%;
+  background: transparent;
 }
 .editor-collapsible-block-toolbar .block-editor-block-toolbar {
   height: 100%;
@@ -632,8 +629,9 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 }
 @media (min-width: 600px) {
   .editor-collapsible-block-toolbar .block-editor-block-mover:not(.is-horizontal) .block-editor-block-mover__move-button-container {
+    height: 40px;
     position: relative;
-    top: -10px;
+    top: -5px;
   }
 }
 .editor-collapsible-block-toolbar.is-collapsed {
@@ -965,6 +963,10 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   margin-right: 8px;
 }
 
+.editor-editor-interface .entities-saved-states__panel-header {
+  height: 61px;
+}
+
 .components-editor-notices__dismissible,
 .components-editor-notices__pinned {
   position: relative;
@@ -1017,24 +1019,6 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   margin-bottom: 4px;
 }
 
-.edit-post-layout .entities-saved-states__panel-header,
-.edit-site-editor__interface-skeleton .entities-saved-states__panel-header {
-  height: 61px;
-}
-
-.entities-saved-states__post-meta {
-  margin-right: 24px;
-  align-items: center;
-}
-
-.entities-saved-states__connections-icon {
-  flex-grow: 0;
-}
-
-.entities-saved-states__bindings-text {
-  flex-grow: 1;
-}
-
 .editor-error-boundary {
   margin: auto;
   max-width: 780px;
@@ -1214,28 +1198,28 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   }
 }
 
-.is-distraction-free .interface-interface-skeleton__header {
+.editor-editor-interface.is-distraction-free .interface-interface-skeleton__header {
   border-bottom: none;
 }
-.is-distraction-free .editor-header {
+.editor-editor-interface.is-distraction-free .editor-header {
   background-color: #fff;
   border-bottom: 1px solid #e0e0e0;
   position: absolute;
   width: 100%;
 }
-.is-distraction-free .editor-header > .edit-post-header__settings > .edit-post-header__post-preview-button {
+.editor-editor-interface.is-distraction-free .editor-header > .edit-post-header__settings > .edit-post-header__post-preview-button {
   visibility: hidden;
 }
-.is-distraction-free .editor-header > .editor-header__toolbar .editor-document-tools__document-overview-toggle, .is-distraction-free .editor-header > .editor-header__settings > .editor-preview-dropdown, .is-distraction-free .editor-header > .editor-header__settings > .interface-pinned-items {
+.editor-editor-interface.is-distraction-free .editor-header > .editor-header__toolbar .editor-document-tools__document-overview-toggle, .editor-editor-interface.is-distraction-free .editor-header > .editor-header__settings > .editor-preview-dropdown, .editor-editor-interface.is-distraction-free .editor-header > .editor-header__settings > .interface-pinned-items {
   display: none;
 }
-.is-distraction-free .interface-interface-skeleton__header:focus-within {
+.editor-editor-interface.is-distraction-free .interface-interface-skeleton__header:focus-within {
   opacity: 1 !important;
 }
-.is-distraction-free .interface-interface-skeleton__header:focus-within div {
+.editor-editor-interface.is-distraction-free .interface-interface-skeleton__header:focus-within div {
   transform: translateX(0) translateZ(0) !important;
 }
-.is-distraction-free .components-editor-notices__dismissible {
+.editor-editor-interface.is-distraction-free .components-editor-notices__dismissible {
   position: absolute;
   z-index: 35;
 }
@@ -1665,6 +1649,10 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   padding: 16px;
 }
 
+.editor-private-post-last-revision__button {
+  display: inline-block;
+}
+
 .editor-post-locked-modal__buttons {
   margin-top: 24px;
 }
@@ -1703,6 +1691,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 .editor-post-panel__row-control .components-button {
   max-width: 100%;
   text-align: right;
+  text-wrap: balance;
   text-wrap: pretty;
   height: auto;
   min-height: 32px;
@@ -1715,10 +1704,6 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   padding: 16px;
 }
 
-.editor-post-publish-panel {
-  background: #fff;
-}
-
 .editor-post-publish-panel__content {
   min-height: calc(100% - 144px);
 }
@@ -1784,6 +1769,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 
 .editor-post-publish-panel__header-publish-button {
   padding-left: 4px;
+  justify-content: center;
 }
 
 .editor-post-publish-panel__header-cancel-button {
@@ -1830,6 +1816,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 }
 .editor-post-publish-panel__prepublish .components-panel__body-title .components-button {
   align-items: flex-start;
+  text-wrap: balance;
   text-wrap: pretty;
 }
 
@@ -1891,19 +1878,18 @@ body.is-fullscreen-mode .interface-interface-skeleton {
     height: 40px;
   }
 }
-.edit-post-layout .editor-post-publish-panel,
-.edit-site-editor__interface-skeleton .editor-post-publish-panel {
+.editor-post-publish-panel {
   position: fixed;
   z-index: 100001;
-  top: 46px;
+  background: #fff;
+  top: 0;
   bottom: 0;
   left: 0;
   right: 0;
   overflow: auto;
 }
 @media (min-width: 782px) {
-  .edit-post-layout .editor-post-publish-panel,
-.edit-site-editor__interface-skeleton .editor-post-publish-panel {
+  .editor-post-publish-panel {
     z-index: 99998;
     top: 32px;
     right: auto;
@@ -1914,28 +1900,21 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   }
 }
 @media (min-width: 782px) and (prefers-reduced-motion: reduce) {
-  .edit-post-layout .editor-post-publish-panel,
-.edit-site-editor__interface-skeleton .editor-post-publish-panel {
+  .editor-post-publish-panel {
     animation-duration: 1ms;
     animation-delay: 0s;
   }
 }
 @media (min-width: 782px) {
-  body.is-fullscreen-mode .edit-post-layout .editor-post-publish-panel,
-body.is-fullscreen-mode .edit-site-editor__interface-skeleton .editor-post-publish-panel {
+  body.is-fullscreen-mode .editor-post-publish-panel {
     top: 0;
   }
 }
 @media (min-width: 782px) {
-  [role=region]:focus .edit-post-layout .editor-post-publish-panel,
-[role=region]:focus .edit-site-editor__interface-skeleton .editor-post-publish-panel {
+  [role=region]:focus .editor-post-publish-panel {
     transform: translateX(0%);
   }
 }
-.edit-post-layout .editor-post-publish-panel__header-publish-button,
-.edit-site-editor__interface-skeleton .editor-post-publish-panel__header-publish-button {
-  justify-content: center;
-}
 
 @keyframes editor-post-publish-panel__slide-in-animation {
   100% {
@@ -2349,8 +2328,7 @@ textarea.editor-post-text-editor:-ms-input-placeholder {
   padding: 0;
   margin: auto 0;
   width: 12px;
-  -webkit-appearance: none;
-          appearance: none;
+  appearance: none;
   cursor: ew-resize;
   outline: none;
   background: none;
@@ -2408,11 +2386,6 @@ textarea.editor-post-text-editor:-ms-input-placeholder {
   bottom: 0;
 }
 
-.interface-interface-skeleton__sidebar:focus .edit-post-layout__toggle-sidebar-panel, .interface-interface-skeleton__sidebar:focus-within .edit-post-layout__toggle-sidebar-panel {
-  top: auto;
-  bottom: 0;
-}
-
 .editor-start-page-options__modal-content .block-editor-block-patterns-list {
   column-count: 2;
   column-gap: 24px;

package/build-style/style.css

@@ -352,10 +352,6 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 .interface-interface-skeleton__sidebar {
     position: relative !important;
   }
-  .is-sidebar-opened .interface-interface-skeleton__secondary-sidebar,
-.is-sidebar-opened .interface-interface-skeleton__sidebar {
-    z-index: 90;
-  }
 }
 
 .interface-interface-skeleton__sidebar {
@@ -592,6 +588,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 .editor-collapsible-block-toolbar .block-editor-block-contextual-toolbar {
   border-bottom: 0;
   height: 100%;
+  background: transparent;
 }
 .editor-collapsible-block-toolbar .block-editor-block-toolbar {
   height: 100%;
@@ -632,8 +629,9 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 }
 @media (min-width: 600px) {
   .editor-collapsible-block-toolbar .block-editor-block-mover:not(.is-horizontal) .block-editor-block-mover__move-button-container {
+    height: 40px;
     position: relative;
-    top: -10px;
+    top: -5px;
   }
 }
 .editor-collapsible-block-toolbar.is-collapsed {
@@ -965,6 +963,10 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   margin-left: 8px;
 }
 
+.editor-editor-interface .entities-saved-states__panel-header {
+  height: 61px;
+}
+
 .components-editor-notices__dismissible,
 .components-editor-notices__pinned {
   position: relative;
@@ -1017,24 +1019,6 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   margin-bottom: 4px;
 }
 
-.edit-post-layout .entities-saved-states__panel-header,
-.edit-site-editor__interface-skeleton .entities-saved-states__panel-header {
-  height: 61px;
-}
-
-.entities-saved-states__post-meta {
-  margin-left: 24px;
-  align-items: center;
-}
-
-.entities-saved-states__connections-icon {
-  flex-grow: 0;
-}
-
-.entities-saved-states__bindings-text {
-  flex-grow: 1;
-}
-
 .editor-error-boundary {
   margin: auto;
   max-width: 780px;
@@ -1214,28 +1198,28 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   }
 }
 
-.is-distraction-free .interface-interface-skeleton__header {
+.editor-editor-interface.is-distraction-free .interface-interface-skeleton__header {
   border-bottom: none;
 }
-.is-distraction-free .editor-header {
+.editor-editor-interface.is-distraction-free .editor-header {
   background-color: #fff;
   border-bottom: 1px solid #e0e0e0;
   position: absolute;
   width: 100%;
 }
-.is-distraction-free .editor-header > .edit-post-header__settings > .edit-post-header__post-preview-button {
+.editor-editor-interface.is-distraction-free .editor-header > .edit-post-header__settings > .edit-post-header__post-preview-button {
   visibility: hidden;
 }
-.is-distraction-free .editor-header > .editor-header__toolbar .editor-document-tools__document-overview-toggle, .is-distraction-free .editor-header > .editor-header__settings > .editor-preview-dropdown, .is-distraction-free .editor-header > .editor-header__settings > .interface-pinned-items {
+.editor-editor-interface.is-distraction-free .editor-header > .editor-header__toolbar .editor-document-tools__document-overview-toggle, .editor-editor-interface.is-distraction-free .editor-header > .editor-header__settings > .editor-preview-dropdown, .editor-editor-interface.is-distraction-free .editor-header > .editor-header__settings > .interface-pinned-items {
   display: none;
 }
-.is-distraction-free .interface-interface-skeleton__header:focus-within {
+.editor-editor-interface.is-distraction-free .interface-interface-skeleton__header:focus-within {
   opacity: 1 !important;
 }
-.is-distraction-free .interface-interface-skeleton__header:focus-within div {
+.editor-editor-interface.is-distraction-free .interface-interface-skeleton__header:focus-within div {
   transform: translateX(0) translateZ(0) !important;
 }
-.is-distraction-free .components-editor-notices__dismissible {
+.editor-editor-interface.is-distraction-free .components-editor-notices__dismissible {
   position: absolute;
   z-index: 35;
 }
@@ -1665,6 +1649,10 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   padding: 16px;
 }
 
+.editor-private-post-last-revision__button {
+  display: inline-block;
+}
+
 .editor-post-locked-modal__buttons {
   margin-top: 24px;
 }
@@ -1703,6 +1691,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 .editor-post-panel__row-control .components-button {
   max-width: 100%;
   text-align: left;
+  text-wrap: balance;
   text-wrap: pretty;
   height: auto;
   min-height: 32px;
@@ -1715,10 +1704,6 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   padding: 16px;
 }
 
-.editor-post-publish-panel {
-  background: #fff;
-}
-
 .editor-post-publish-panel__content {
   min-height: calc(100% - 144px);
 }
@@ -1784,6 +1769,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 
 .editor-post-publish-panel__header-publish-button {
   padding-right: 4px;
+  justify-content: center;
 }
 
 .editor-post-publish-panel__header-cancel-button {
@@ -1830,6 +1816,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 }
 .editor-post-publish-panel__prepublish .components-panel__body-title .components-button {
   align-items: flex-start;
+  text-wrap: balance;
   text-wrap: pretty;
 }
 
@@ -1891,19 +1878,18 @@ body.is-fullscreen-mode .interface-interface-skeleton {
     height: 40px;
   }
 }
-.edit-post-layout .editor-post-publish-panel,
-.edit-site-editor__interface-skeleton .editor-post-publish-panel {
+.editor-post-publish-panel {
   position: fixed;
   z-index: 100001;
-  top: 46px;
+  background: #fff;
+  top: 0;
   bottom: 0;
   right: 0;
   left: 0;
   overflow: auto;
 }
 @media (min-width: 782px) {
-  .edit-post-layout .editor-post-publish-panel,
-.edit-site-editor__interface-skeleton .editor-post-publish-panel {
+  .editor-post-publish-panel {
     z-index: 99998;
     top: 32px;
     left: auto;
@@ -1914,28 +1900,21 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   }
 }
 @media (min-width: 782px) and (prefers-reduced-motion: reduce) {
-  .edit-post-layout .editor-post-publish-panel,
-.edit-site-editor__interface-skeleton .editor-post-publish-panel {
+  .editor-post-publish-panel {
     animation-duration: 1ms;
     animation-delay: 0s;
   }
 }
 @media (min-width: 782px) {
-  body.is-fullscreen-mode .edit-post-layout .editor-post-publish-panel,
-body.is-fullscreen-mode .edit-site-editor__interface-skeleton .editor-post-publish-panel {
+  body.is-fullscreen-mode .editor-post-publish-panel {
     top: 0;
   }
 }
 @media (min-width: 782px) {
-  [role=region]:focus .edit-post-layout .editor-post-publish-panel,
-[role=region]:focus .edit-site-editor__interface-skeleton .editor-post-publish-panel {
+  [role=region]:focus .editor-post-publish-panel {
     transform: translateX(0%);
   }
 }
-.edit-post-layout .editor-post-publish-panel__header-publish-button,
-.edit-site-editor__interface-skeleton .editor-post-publish-panel__header-publish-button {
-  justify-content: center;
-}
 
 @keyframes editor-post-publish-panel__slide-in-animation {
   100% {
@@ -2353,8 +2332,7 @@ textarea.editor-post-text-editor:-ms-input-placeholder {
   padding: 0;
   margin: auto 0;
   width: 12px;
-  -webkit-appearance: none;
-          appearance: none;
+  appearance: none;
   cursor: ew-resize;
   outline: none;
   background: none;
@@ -2412,11 +2390,6 @@ textarea.editor-post-text-editor:-ms-input-placeholder {
   bottom: 0;
 }
 
-.interface-interface-skeleton__sidebar:focus .edit-post-layout__toggle-sidebar-panel, .interface-interface-skeleton__sidebar:focus-within .edit-post-layout__toggle-sidebar-panel {
-  top: auto;
-  bottom: 0;
-}
-
 .editor-start-page-options__modal-content .block-editor-block-patterns-list {
   column-count: 2;
   column-gap: 24px;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/editor",
-	"version": "14.0.0",
+	"version": "14.0.2",
 	"description": "Enhanced block editor for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -32,39 +32,39 @@
 	],
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "^4.0.0",
-		"@wordpress/api-fetch": "^7.0.0",
-		"@wordpress/blob": "^4.0.0",
-		"@wordpress/block-editor": "^13.0.0",
-		"@wordpress/blocks": "^13.0.0",
-		"@wordpress/commands": "^1.0.0",
-		"@wordpress/components": "^28.0.0",
-		"@wordpress/compose": "^7.0.0",
-		"@wordpress/core-data": "^7.0.0",
-		"@wordpress/data": "^10.0.0",
-		"@wordpress/date": "^5.0.0",
-		"@wordpress/deprecated": "^4.0.0",
-		"@wordpress/dom": "^4.0.0",
-		"@wordpress/element": "^6.0.0",
-		"@wordpress/hooks": "^4.0.0",
-		"@wordpress/html-entities": "^4.0.0",
-		"@wordpress/i18n": "^5.0.0",
-		"@wordpress/icons": "^10.0.0",
-		"@wordpress/interface": "^6.0.0",
-		"@wordpress/keyboard-shortcuts": "^5.0.0",
-		"@wordpress/keycodes": "^4.0.0",
-		"@wordpress/media-utils": "^5.0.0",
-		"@wordpress/notices": "^5.0.0",
-		"@wordpress/patterns": "^2.0.0",
-		"@wordpress/plugins": "^7.0.0",
-		"@wordpress/preferences": "^4.0.0",
-		"@wordpress/private-apis": "^1.0.0",
-		"@wordpress/reusable-blocks": "^5.0.0",
-		"@wordpress/rich-text": "^7.0.0",
-		"@wordpress/server-side-render": "^5.0.0",
-		"@wordpress/url": "^4.0.0",
-		"@wordpress/warning": "^3.0.0",
-		"@wordpress/wordcount": "^4.0.0",
+		"@wordpress/a11y": "^4.0.1",
+		"@wordpress/api-fetch": "^7.0.1",
+		"@wordpress/blob": "^4.0.1",
+		"@wordpress/block-editor": "^13.0.2",
+		"@wordpress/blocks": "^13.0.2",
+		"@wordpress/commands": "^1.0.2",
+		"@wordpress/components": "^28.0.2",
+		"@wordpress/compose": "^7.0.1",
+		"@wordpress/core-data": "^7.0.2",
+		"@wordpress/data": "^10.0.2",
+		"@wordpress/date": "^5.0.1",
+		"@wordpress/deprecated": "^4.0.1",
+		"@wordpress/dom": "^4.0.1",
+		"@wordpress/element": "^6.0.1",
+		"@wordpress/hooks": "^4.0.1",
+		"@wordpress/html-entities": "^4.0.1",
+		"@wordpress/i18n": "^5.0.1",
+		"@wordpress/icons": "^10.0.1",
+		"@wordpress/interface": "^6.0.2",
+		"@wordpress/keyboard-shortcuts": "^5.0.2",
+		"@wordpress/keycodes": "^4.0.1",
+		"@wordpress/media-utils": "^5.0.1",
+		"@wordpress/notices": "^5.0.2",
+		"@wordpress/patterns": "^2.0.2",
+		"@wordpress/plugins": "^7.0.2",
+		"@wordpress/preferences": "^4.0.2",
+		"@wordpress/private-apis": "^1.0.2",
+		"@wordpress/reusable-blocks": "^5.0.2",
+		"@wordpress/rich-text": "^7.0.2",
+		"@wordpress/server-side-render": "^5.0.2",
+		"@wordpress/url": "^4.0.1",
+		"@wordpress/warning": "^3.0.1",
+		"@wordpress/wordcount": "^4.0.1",
 		"change-case": "^4.1.2",
 		"client-zip": "^2.4.5",
 		"clsx": "^2.1.1",
@@ -83,5 +83,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "2f30cddff15723ac7017fd009fc5913b7b419400"
+	"gitHead": "a68c6b5ef53956cccf4961d53d79b6af7e00ae60"
 }

package/src/components/block-settings-menu/content-only-settings-menu.js

@@ -19,7 +19,7 @@ import { store as editorStore } from '../../store';
 import { unlock } from '../../lock-unlock';
 
 function ContentOnlySettingsMenuItems( { clientId, onClose } ) {
-	const { entity, onNavigateToEntityRecord } = useSelect(
+	const { entity, onNavigateToEntityRecord, canEditTemplates } = useSelect(
 		( select ) => {
 			const {
 				getBlockEditingMode,
@@ -46,11 +46,12 @@ function ContentOnlySettingsMenuItems( { clientId, onClose } ) {
 					getBlockAttributes( patternParent ).ref
 				);
 			} else {
-				const { getCurrentPostType, getCurrentTemplateId } =
-					select( editorStore );
-				const currentPostType = getCurrentPostType();
+				const { getCurrentTemplateId } = select( editorStore );
 				const templateId = getCurrentTemplateId();
-				if ( currentPostType === 'page' && templateId ) {
+				const { getContentLockingParent } = unlock(
+					select( blockEditorStore )
+				);
+				if ( ! getContentLockingParent( clientId ) && templateId ) {
 					record = select( coreStore ).getEntityRecord(
 						'postType',
 						'wp_template',
@@ -58,7 +59,12 @@ function ContentOnlySettingsMenuItems( { clientId, onClose } ) {
 					);
 				}
 			}
+			const _canEditTemplates = select( coreStore ).canUser(
+				'create',
+				'templates'
+			);
 			return {
+				canEditTemplates: _canEditTemplates,
 				entity: record,
 				onNavigateToEntityRecord:
 					getSettings().onNavigateToEntityRecord,
@@ -77,6 +83,19 @@ function ContentOnlySettingsMenuItems( { clientId, onClose } ) {
 	}
 
 	const isPattern = entity.type === 'wp_block';
+	let helpText = isPattern
+		? __(
+				'Edit the pattern to move, delete, or make further changes to this block.'
+		  )
+		: __(
+				'Edit the template to move, delete, or make further changes to this block.'
+		  );
+
+	if ( ! canEditTemplates ) {
+		helpText = __(
+			'Only users with permissions to edit the template can move or delete this block'
+		);
+	}
 
 	return (
 		<>
@@ -88,6 +107,7 @@ function ContentOnlySettingsMenuItems( { clientId, onClose } ) {
 							postType: entity.type,
 						} );
 					} }
+					disabled={ ! canEditTemplates }
 				>
 					{ isPattern ? __( 'Edit pattern' ) : __( 'Edit template' ) }
 				</MenuItem>
@@ -97,13 +117,7 @@ function ContentOnlySettingsMenuItems( { clientId, onClose } ) {
 				as="p"
 				className="editor-content-only-settings-menu__description"
 			>
-				{ isPattern
-					? __(
-							'Edit the pattern to move, delete, or make further changes to this block.'
-					  )
-					: __(
-							'Edit the template to move, delete, or make further changes to this block.'
-					  ) }
+				{ helpText }
 			</Text>
 		</>
 	);

package/src/components/collapsible-block-toolbar/style.scss

@@ -7,6 +7,7 @@
 	.block-editor-block-contextual-toolbar {
 		border-bottom: 0;
 		height: 100%;
+		background: transparent;
 	}
 
 	// These rules ensure that icons are always positioned in a way that lines up with the rest of the icons in the toolbar.
@@ -64,8 +65,9 @@
 		// Move up a little to prevent the toolbar shift when focus is on the vertical movers.
 		@include break-small() {
 			&:not(.is-horizontal) .block-editor-block-mover__move-button-container {
+				height: $grid-unit-50;
 				position: relative;
-				top: -10px;
+				top: -5px; // Should be -4px, but that causes scrolling when focus lands on the movers, in a 60px header.
 			}
 		}
 	}

package/src/components/document-tools/index.js

@@ -28,10 +28,6 @@ import { store as editorStore } from '../../store';
 import EditorHistoryRedo from '../editor-history/redo';
 import EditorHistoryUndo from '../editor-history/undo';
 
-const preventDefault = ( event ) => {
-	event.preventDefault();
-};
-
 function DocumentTools( { className, disableBlockTools = false } ) {
 	const { setIsInserterOpened, setIsListViewOpened } =
 		useDispatch( editorStore );
@@ -72,6 +68,19 @@ function DocumentTools( { className, disableBlockTools = false } ) {
 		};
 	}, [] );
 
+	const preventDefault = ( event ) => {
+		// Because the inserter behaves like a dialog,
+		// if the inserter is opened already then when we click on the toggle button
+		// then the initial click event will close the inserter and then be propagated
+		// to the inserter toggle and it will open it again.
+		// To prevent this we need to stop the propagation of the event.
+		// This won't be necessary when the inserter no longer behaves like a dialog.
+
+		if ( isInserterOpened ) {
+			event.preventDefault();
+		}
+	};
+
 	const isLargeViewport = useViewportMatch( 'medium' );
 	const isWideViewport = useViewportMatch( 'wide' );