@wordpress/edit-site 5.31.0 → 5.32.0

package/build-style/style.css

@@ -447,7 +447,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   display: none;
   margin: 0;
 }
-.interface-pinned-items .components-button[aria-controls="edit-post:document"], .interface-pinned-items .components-button[aria-controls="edit-post:block"], .interface-pinned-items .components-button[aria-controls="edit-site:template"], .interface-pinned-items .components-button[aria-controls="edit-site:block-inspector"], .interface-pinned-items .components-button[aria-controls="edit-site:global-styles"] {
+.interface-pinned-items .components-button[aria-controls="edit-post:document"], .interface-pinned-items .components-button[aria-controls="edit-post:block"], .interface-pinned-items .components-button[aria-controls="edit-site:template"], .interface-pinned-items .components-button[aria-controls="edit-site:block-inspector"] {
   display: flex;
 }
 .interface-pinned-items .components-button svg {
@@ -628,6 +628,9 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 .dataviews-view-table tbody .dataviews-view-table__cell-content-wrapper > * {
   flex-grow: 1;
 }
+.dataviews-view-table tbody .dataviews-view-table__cell-content-wrapper.dataviews-view-table__primary-field a {
+  flex-grow: 0;
+}
 .dataviews-view-table .dataviews-view-table-header-button {
   padding: 4px 8px;
   font-size: 11px;
@@ -673,12 +676,12 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   white-space: nowrap;
   overflow: hidden;
   display: block;
-  width: 100%;
+  flex-grow: 0;
 }
 .dataviews-view-list__primary-field a:hover,
 .dataviews-view-grid__primary-field a:hover,
 .dataviews-view-table__primary-field a:hover {
-  color: #1e1e1e;
+  color: var(--wp-admin-theme-color);
 }
 .dataviews-view-list__primary-field a:focus,
 .dataviews-view-grid__primary-field a:focus,
@@ -757,7 +760,22 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   padding: 12px;
   padding-top: 0;
 }
-.dataviews-view-grid .dataviews-view-grid__fields .dataviews-view-grid__field .dataviews-view-grid__field-value {
+.dataviews-view-grid .dataviews-view-grid__fields .dataviews-view-grid__field {
+  align-items: flex-start;
+}
+.dataviews-view-grid .dataviews-view-grid__fields .dataviews-view-grid__field:not(.is-column) {
+  align-items: center;
+}
+.dataviews-view-grid .dataviews-view-grid__fields .dataviews-view-grid__field:not(.is-column) .dataviews-view-grid__field-name {
+  width: 35%;
+}
+.dataviews-view-grid .dataviews-view-grid__fields .dataviews-view-grid__field:not(.is-column) .dataviews-view-grid__field-value {
+  width: 65%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.dataviews-view-grid .dataviews-view-grid__fields .dataviews-view-grid__field .dataviews-view-grid__field-name {
   color: #757575;
 }
 
@@ -767,6 +785,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 }
 .dataviews-view-list li {
   margin: 0;
+  cursor: pointer;
 }
 .dataviews-view-list li .dataviews-view-list__item-wrapper {
   position: relative;
@@ -782,11 +801,15 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   background: #f0f0f0;
   height: 1px;
 }
-.dataviews-view-list li:not(.is-selected):hover {
+.dataviews-view-list li .dataviews-view-list__item-wrapper > * {
+  width: 100%;
+}
+.dataviews-view-list li:not(.is-selected):hover, .dataviews-view-list li:not(.is-selected):focus-within {
   color: var(--wp-admin-theme-color);
 }
 .dataviews-view-list li:not(.is-selected):hover .dataviews-view-list__primary-field,
-.dataviews-view-list li:not(.is-selected):hover .dataviews-view-list__fields {
+.dataviews-view-list li:not(.is-selected):hover .dataviews-view-list__fields, .dataviews-view-list li:not(.is-selected):focus-within .dataviews-view-list__primary-field,
+.dataviews-view-list li:not(.is-selected):focus-within .dataviews-view-list__fields {
   color: var(--wp-admin-theme-color);
 }
 .dataviews-view-list li.is-selected .dataviews-view-list__item-wrapper,
@@ -809,9 +832,9 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 .dataviews-view-list .dataviews-view-list__item {
   padding: 12px 0 12px 24px;
   width: 100%;
-  cursor: pointer;
+  scroll-margin: 8px 0;
 }
-.dataviews-view-list .dataviews-view-list__item:focus::before {
+.dataviews-view-list .dataviews-view-list__item:focus-visible::before {
   position: absolute;
   content: "";
   top: -1px;
@@ -824,6 +847,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 }
 .dataviews-view-list .dataviews-view-list__item .dataviews-view-list__primary-field {
   min-height: 20px;
+  overflow: hidden;
 }
 .dataviews-view-list .dataviews-view-list__media-wrapper {
   width: 40px;
@@ -862,7 +886,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   font-size: 12px;
   line-height: 16px;
 }
-.dataviews-view-list .dataviews-view-list__fields .dataviews-view-list__field:empty {
+.dataviews-view-list .dataviews-view-list__fields .dataviews-view-list__field:has(.dataviews-view-list__field-value:empty) {
   display: none;
 }
 .dataviews-view-list + .dataviews-pagination {
@@ -1579,9 +1603,9 @@ textarea.edit-site-code-editor-text-area.edit-site-code-editor-text-area:-ms-inp
 }
 
 .edit-site-global-styles-preview__iframe {
-  border-radius: 2px;
-  display: block;
+  border-radius: 3px;
   max-width: 100%;
+  display: block;
   width: 100%;
 }
 
@@ -1601,9 +1625,8 @@ textarea.edit-site-code-editor-text-area.edit-site-code-editor-text-area:-ms-inp
   max-width: 100%;
 }
 
-.edit-site-global-styles-screen-typography,
-.edit-site-global-styles-screen-css {
-  margin: 16px;
+.edit-site-global-styles-screen {
+  margin: 12px 16px 16px;
 }
 
 .edit-site-global-styles-screen-typography__indicator {
@@ -1624,13 +1647,16 @@ textarea.edit-site-code-editor-text-area.edit-site-code-editor-text-area:-ms-inp
   justify-content: center;
 }
 
-.edit-site-global-styles-screen-colors {
-  margin: 16px;
-}
-.edit-site-global-styles-screen-colors .color-block-support-panel {
+.edit-site-global-styles-screen .color-block-support-panel {
   padding-left: 0;
   padding-right: 0;
+  padding-top: 0;
   border-top: none;
+  row-gap: calc(4px * 3);
+}
+
+.edit-site-global-styles-screen-colors__palette-count {
+  color: #757575;
 }
 
 .edit-site-global-styles-header__description {
@@ -1683,6 +1709,7 @@ textarea.edit-site-code-editor-text-area.edit-site-code-editor-text-area:-ms-inp
   flex: 1 1 auto;
   display: flex;
   flex-direction: column;
+  margin: 16px;
 }
 .edit-site-global-styles-screen-css .components-v-stack {
   flex: 1 1 auto;
@@ -1922,34 +1949,50 @@ textarea.edit-site-code-editor-text-area.edit-site-code-editor-text-area:-ms-inp
   display: flex;
   border: none;
   align-items: center;
+  flex-grow: 1;
   flex-shrink: 2;
-  overflow: hidden;
   height: 100%;
 }
 @media (min-width: 782px) {
   .edit-site-header-edit-mode .edit-site-header-edit-mode__start {
+    flex-basis: calc(37.5% - 60px);
     padding-right: 2px;
+    overflow: hidden;
   }
 }
 .edit-site-header-edit-mode .edit-site-header-edit-mode__end {
   display: flex;
   justify-content: flex-end;
+  height: 100%;
+  flex-grow: 1;
+  flex-shrink: 1;
+}
+@media (min-width: 782px) {
+  .edit-site-header-edit-mode .edit-site-header-edit-mode__end {
+    flex-basis: 37.5%;
+  }
 }
 .edit-site-header-edit-mode .edit-site-header-edit-mode__center {
-  display: flex;
   align-items: center;
-  height: 100%;
+  display: flex;
+  flex-basis: 100%;
   flex-grow: 1;
-  margin: 0 16px;
+  flex-shrink: 2;
+  height: 100%;
   justify-content: center;
   min-width: 0;
 }
+@media (min-width: 782px) {
+  .edit-site-header-edit-mode .edit-site-header-edit-mode__center {
+    flex-basis: 25%;
+  }
+}
 
 .edit-site-header-edit-mode__toolbar {
-  display: flex;
   align-items: center;
-  padding-left: 16px;
+  display: flex;
   gap: 8px;
+  padding-left: 16px;
 }
 @media (min-width: 782px) {
   .edit-site-header-edit-mode__toolbar {
@@ -1981,14 +2024,10 @@ textarea.edit-site-code-editor-text-area.edit-site-code-editor-text-area:-ms-inp
   display: inline-flex;
   align-items: center;
   flex-wrap: nowrap;
-  padding-right: 4px;
+  padding-left: 8px;
+  padding-right: 8px;
   gap: 8px;
 }
-@media (min-width: 600px) {
-  .edit-site-header-edit-mode__actions {
-    padding-right: 8px;
-  }
-}
 
 .edit-site-header-edit-mode__preview-options {
   opacity: 1;
@@ -2397,6 +2436,11 @@ textarea.edit-site-code-editor-text-area.edit-site-code-editor-text-area:-ms-inp
   fill: currentColor;
 }
 
+.page-templates-author-field__name {
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+
 .edit-site-list__rename-modal {
   z-index: 1000001;
 }
@@ -2584,67 +2628,15 @@ textarea.edit-site-code-editor-text-area.edit-site-code-editor-text-area:-ms-inp
   }
 }
 
-.edit-site-sidebar-card__content {
-  flex-grow: 1;
-}
-.edit-site-sidebar-card__title {
-  width: 100%;
-}
-.edit-site-sidebar-card__title.edit-site-sidebar-card__title {
-  font-size: 16px;
-  line-height: 24px;
-  margin: 0;
-}
-.edit-site-sidebar-card__description {
-  font-size: 13px;
-  color: #757575;
-}
-.edit-site-sidebar-card__icon {
-  flex: 0 0 24px;
-  width: 24px;
-  height: 24px;
-}
-.edit-site-sidebar-card__header {
-  display: flex;
-  justify-content: space-between;
-  margin: 0 0 12px;
-}
-.edit-site-sidebar-card .edit-site-template-card__actions {
-  flex-shrink: 0;
-}
-
-.edit-site-template-card__template-areas {
-  margin-top: 16px;
-}
-.edit-site-template-card__template-areas-list {
-  margin: 0;
-}
-.edit-site-template-card__template-areas-list > li {
-  margin: 0;
-}
-.edit-site-template-card__template-areas-item {
-  width: 100%;
-}
-.edit-site-template-card__template-areas-item.components-button.has-icon {
-  padding: 0;
-}
 .edit-site-template-card__actions {
   line-height: 0;
+  flex-shrink: 0;
 }
 .edit-site-template-card__actions > .components-button.is-small.has-icon {
   padding: 0;
   min-width: auto;
 }
 
-h3.edit-site-template-card__template-areas-title {
-  font-weight: 500;
-  margin: 0 0 8px;
-}
-
-.edit-site-template-card__templates-list {
-  margin-top: 16px;
-}
-
 .edit-site-template-panel .block-editor-block-preview__container {
   border-radius: 2px;
   box-shadow: none;
@@ -3001,6 +2993,7 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   position: relative;
   flex-grow: 1;
   z-index: 2;
+  overflow: visible;
 }
 .edit-site-layout__canvas-container.is-resizing::after {
   position: absolute;
@@ -3388,17 +3381,15 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   font-weight: 500;
 }
 
-.edit-site-sidebar-navigation-screen__content .edit-site-global-styles-style-variations-container .edit-site-global-styles-variations_item-preview {
+.edit-site-sidebar-navigation-screen__content .edit-site-global-styles-variations_item .edit-site-global-styles-variations_item-preview {
   box-shadow: 0 0 0 1px #1e1e1e;
 }
-.edit-site-sidebar-navigation-screen__content .edit-site-global-styles-style-variations-container .edit-site-global-styles-variations_item.is-active .edit-site-global-styles-variations_item-preview {
-  box-shadow: 0 0 0 1px #f0f0f0;
+.edit-site-sidebar-navigation-screen__content .edit-site-global-styles-variations_item:focus .edit-site-global-styles-variations_item-preview, .edit-site-sidebar-navigation-screen__content .edit-site-global-styles-variations_item.is-active .edit-site-global-styles-variations_item-preview {
+  box-shadow: inset 0 0 0 1px #1e1e1e, 0 0 0 var(--wp-admin-border-width-focus) #fff;
+  outline-width: 3px;
 }
-.edit-site-sidebar-navigation-screen__content .edit-site-global-styles-style-variations-container .edit-site-global-styles-variations_item:hover .edit-site-global-styles-variations_item-preview {
-  box-shadow: 0 0 0 1px var(--wp-admin-theme-color);
-}
-.edit-site-sidebar-navigation-screen__content .edit-site-global-styles-style-variations-container .edit-site-global-styles-variations_item:focus .edit-site-global-styles-variations_item-preview {
-  box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+.edit-site-sidebar-navigation-screen__content .edit-site-global-styles-variations_item:focus .edit-site-global-styles-variations_item-preview::after, .edit-site-sidebar-navigation-screen__content .edit-site-global-styles-variations_item.is-active .edit-site-global-styles-variations_item-preview::after {
+  box-shadow: inset 0 0 0 1px #1e1e1e;
 }
 
 .edit-site-sidebar-navigation-screen__footer {
@@ -4093,27 +4084,48 @@ button.font-library-modal__upload-area {
   cursor: pointer;
 }
 .edit-site-global-styles-variations_item .edit-site-global-styles-variations_item-preview {
-  padding: 2px;
   border-radius: 2px;
-  box-shadow: 0 0 0 1px #e0e0e0;
   outline: 1px solid transparent;
+  position: relative;
+  transition: box-shadow 0.1s linear;
+}
+@media (prefers-reduced-motion: reduce) {
+  .edit-site-global-styles-variations_item .edit-site-global-styles-variations_item-preview {
+    transition-duration: 0s;
+    transition-delay: 0s;
+  }
+}
+.edit-site-global-styles-variations_item .edit-site-global-styles-variations_item-preview::after {
+  content: "";
+  position: absolute;
+  top: -1px;
+  left: -1px;
+  bottom: -1px;
+  right: -1px;
+  border-radius: 3px;
+  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.2);
+  border: 1px solid transparent;
+  box-sizing: inherit;
+  transition: box-shadow 0.1s linear;
+}
+@media (prefers-reduced-motion: reduce) {
+  .edit-site-global-styles-variations_item .edit-site-global-styles-variations_item-preview::after {
+    transition-duration: 0s;
+    transition-delay: 0s;
+  }
 }
 .edit-site-global-styles-color-variations .edit-site-global-styles-variations_item .edit-site-global-styles-variations_item-preview {
   padding: 8px;
 }
-.edit-site-global-styles-variations_item.is-active .edit-site-global-styles-variations_item-preview {
-  box-shadow: 0 0 0 1px #1e1e1e;
-  outline-width: 3px;
-}
-.edit-site-global-styles-variations_item:hover .edit-site-global-styles-variations_item-preview {
-  box-shadow: 0 0 0 1px var(--wp-admin-theme-color);
+.edit-site-global-styles-variations_item:not(.is-active):hover .edit-site-global-styles-variations_item-preview::after {
+  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.4);
 }
-.edit-site-global-styles-variations_item:focus .edit-site-global-styles-variations_item-preview {
-  box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+.edit-site-global-styles-variations_item.is-active .edit-site-global-styles-variations_item-preview, .edit-site-global-styles-variations_item:focus-visible .edit-site-global-styles-variations_item-preview {
+  box-shadow: inset 0 0 0 1px #fff, 0 0 0 var(--wp-admin-border-width-focus) #1e1e1e;
+  outline-width: 3px;
 }
-.edit-site-global-styles-variations_item:focus-visible {
-  outline: 3px solid transparent;
-  outline-offset: 0;
+.edit-site-global-styles-variations_item.is-active .edit-site-global-styles-variations_item-preview::after, .edit-site-global-styles-variations_item:focus-visible .edit-site-global-styles-variations_item-preview::after {
+  box-shadow: inset 0 0 0 1px #fff;
 }
 
 body.js #wpadminbar {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "5.31.0",
+	"version": "5.32.0",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -27,46 +27,47 @@
 	"react-native": "src/index",
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "^3.54.0",
-		"@wordpress/api-fetch": "^6.51.0",
-		"@wordpress/blob": "^3.54.0",
-		"@wordpress/block-editor": "^12.22.0",
-		"@wordpress/block-library": "^8.31.0",
-		"@wordpress/blocks": "^12.31.0",
-		"@wordpress/commands": "^0.25.0",
-		"@wordpress/components": "^27.2.0",
-		"@wordpress/compose": "^6.31.0",
-		"@wordpress/core-commands": "^0.23.0",
-		"@wordpress/core-data": "^6.31.0",
-		"@wordpress/data": "^9.24.0",
-		"@wordpress/dataviews": "^0.8.0",
-		"@wordpress/date": "^4.54.0",
-		"@wordpress/deprecated": "^3.54.0",
-		"@wordpress/dom": "^3.54.0",
-		"@wordpress/editor": "^13.31.0",
-		"@wordpress/element": "^5.31.0",
-		"@wordpress/escape-html": "^2.54.0",
-		"@wordpress/hooks": "^3.54.0",
-		"@wordpress/html-entities": "^3.54.0",
-		"@wordpress/i18n": "^4.54.0",
-		"@wordpress/icons": "^9.45.0",
-		"@wordpress/interface": "^5.31.0",
-		"@wordpress/keyboard-shortcuts": "^4.31.0",
-		"@wordpress/keycodes": "^3.54.0",
-		"@wordpress/media-utils": "^4.45.0",
-		"@wordpress/notices": "^4.22.0",
-		"@wordpress/patterns": "^1.15.0",
-		"@wordpress/plugins": "^6.22.0",
-		"@wordpress/preferences": "^3.31.0",
-		"@wordpress/primitives": "^3.52.0",
-		"@wordpress/private-apis": "^0.36.0",
-		"@wordpress/reusable-blocks": "^4.31.0",
-		"@wordpress/router": "^0.23.0",
-		"@wordpress/style-engine": "^1.37.0",
-		"@wordpress/url": "^3.55.0",
-		"@wordpress/viewport": "^5.31.0",
-		"@wordpress/widgets": "^3.31.0",
-		"@wordpress/wordcount": "^3.54.0",
+		"@react-spring/web": "^9.4.5",
+		"@wordpress/a11y": "^3.55.0",
+		"@wordpress/api-fetch": "^6.52.0",
+		"@wordpress/blob": "^3.55.0",
+		"@wordpress/block-editor": "^12.23.0",
+		"@wordpress/block-library": "^8.32.0",
+		"@wordpress/blocks": "^12.32.0",
+		"@wordpress/commands": "^0.26.0",
+		"@wordpress/components": "^27.3.0",
+		"@wordpress/compose": "^6.32.0",
+		"@wordpress/core-commands": "^0.24.0",
+		"@wordpress/core-data": "^6.32.0",
+		"@wordpress/data": "^9.25.0",
+		"@wordpress/dataviews": "^0.9.0",
+		"@wordpress/date": "^4.55.0",
+		"@wordpress/deprecated": "^3.55.0",
+		"@wordpress/dom": "^3.55.0",
+		"@wordpress/editor": "^13.32.0",
+		"@wordpress/element": "^5.32.0",
+		"@wordpress/escape-html": "^2.55.0",
+		"@wordpress/hooks": "^3.55.0",
+		"@wordpress/html-entities": "^3.55.0",
+		"@wordpress/i18n": "^4.55.0",
+		"@wordpress/icons": "^9.46.0",
+		"@wordpress/interface": "^5.32.0",
+		"@wordpress/keyboard-shortcuts": "^4.32.0",
+		"@wordpress/keycodes": "^3.55.0",
+		"@wordpress/media-utils": "^4.46.0",
+		"@wordpress/notices": "^4.23.0",
+		"@wordpress/patterns": "^1.16.0",
+		"@wordpress/plugins": "^6.23.0",
+		"@wordpress/preferences": "^3.32.0",
+		"@wordpress/primitives": "^3.53.0",
+		"@wordpress/private-apis": "^0.37.0",
+		"@wordpress/reusable-blocks": "^4.32.0",
+		"@wordpress/router": "^0.24.0",
+		"@wordpress/style-engine": "^1.38.0",
+		"@wordpress/url": "^3.56.0",
+		"@wordpress/viewport": "^5.32.0",
+		"@wordpress/widgets": "^3.32.0",
+		"@wordpress/wordcount": "^3.55.0",
 		"change-case": "^4.1.2",
 		"classnames": "^2.3.1",
 		"client-zip": "^2.4.4",
@@ -76,8 +77,7 @@
 		"is-plain-object": "^5.0.0",
 		"memize": "^2.1.0",
 		"react-autosize-textarea": "^7.1.0",
-		"rememo": "^4.0.2",
-		"remove-accents": "^0.5.0"
+		"rememo": "^4.0.2"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0",
@@ -86,5 +86,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "ffc07735d0abfb3f69e91d48f25b7fe8d1ef92d2"
+	"gitHead": "ac2b13783c28f959770cf029a797a712f59e1958"
 }

package/src/components/block-editor/editor-canvas.js

@@ -26,7 +26,13 @@ import { computeIFrameScale } from '../../utils/math';
 
 const { EditorCanvas: EditorCanvasRoot } = unlock( editorPrivateApis );
 
-function EditorCanvas( { enableResizing, settings, children, ...props } ) {
+function EditorCanvas( {
+	enableResizing,
+	settings,
+	children,
+	onClick,
+	...props
+} ) {
 	const { hasBlocks, isFocusMode, templateType, canvasMode, isZoomOutMode } =
 		useSelect( ( select ) => {
 			const { getBlockCount, __unstableGetEditorMode } =
@@ -69,7 +75,13 @@ function EditorCanvas( { enableResizing, settings, children, ...props } ) {
 				setCanvasMode( 'edit' );
 			}
 		},
-		onClick: () => setCanvasMode( 'edit' ),
+		onClick: () => {
+			if ( !! onClick ) {
+				onClick();
+			} else {
+				setCanvasMode( 'edit' );
+			}
+		},
 		readonly: true,
 	};
 	const isTemplateTypeNavigation = templateType === NAVIGATION_POST_TYPE;

package/src/components/block-editor/site-editor-canvas.js

@@ -7,6 +7,7 @@ import classnames from 'classnames';
  */
 import { useSelect } from '@wordpress/data';
 import { useViewportMatch, useResizeObserver } from '@wordpress/compose';
+import { store as blockEditorStore } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
@@ -26,24 +27,23 @@ import { privateApis as routerPrivateApis } from '@wordpress/router';
 
 const { useLocation } = unlock( routerPrivateApis );
 
-export default function SiteEditorCanvas() {
+export default function SiteEditorCanvas( { onClick } ) {
 	const location = useLocation();
-	const { templateType, isFocusableEntity, isViewMode } = useSelect(
-		( select ) => {
+	const { templateType, isFocusableEntity, isViewMode, isZoomOutMode } =
+		useSelect( ( select ) => {
 			const { getEditedPostType, getCanvasMode } = unlock(
 				select( editSiteStore )
 			);
-
+			const { __unstableGetEditorMode } = select( blockEditorStore );
 			const _templateType = getEditedPostType();
 
 			return {
 				templateType: _templateType,
 				isFocusableEntity: FOCUSABLE_ENTITIES.includes( _templateType ),
 				isViewMode: getCanvasMode() === 'view',
+				isZoomOutMode: __unstableGetEditorMode() === 'zoom-out',
 			};
-		},
-		[]
-	);
+		}, [] );
 	const isFocusMode = location.params.focusMode || isFocusableEntity;
 	const [ resizeObserver, sizes ] = useResizeObserver();
 
@@ -55,6 +55,8 @@ export default function SiteEditorCanvas() {
 		! isViewMode &&
 		// Disable resizing in mobile viewport.
 		! isMobileViewport &&
+		// Dsiable resizing in zoomed-out mode.
+		! isZoomOutMode &&
 		// Disable resizing when editing a template in focus mode.
 		templateType !== TEMPLATE_POST_TYPE;
 
@@ -87,6 +89,7 @@ export default function SiteEditorCanvas() {
 							<EditorCanvas
 								enableResizing={ enableResizing }
 								settings={ settings }
+								onClick={ onClick }
 							>
 								{ resizeObserver }
 							</EditorCanvas>

package/src/components/editor/index.js

@@ -6,7 +6,7 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { useSelect } from '@wordpress/data';
+import { useDispatch, useSelect } from '@wordpress/data';
 import { Notice } from '@wordpress/components';
 import { useInstanceId, useViewportMatch } from '@wordpress/compose';
 import { store as preferencesStore } from '@wordpress/preferences';
@@ -72,7 +72,7 @@ const interfaceLabels = {
 	footer: __( 'Editor footer' ),
 };
 
-export default function Editor( { isLoading } ) {
+export default function Editor( { isLoading, onClick } ) {
 	const {
 		record: editedPost,
 		getTitle,
@@ -174,6 +174,8 @@ export default function Editor( { isLoading } ) {
 		'edit-site-editor__loading-progress'
 	);
 
+	const { closeGeneralSidebar } = useDispatch( editSiteStore );
+
 	const settings = useSpecificEditorSettings();
 	const isReady =
 		! isLoading &&
@@ -225,7 +227,7 @@ export default function Editor( { isLoading } ) {
 										{ ! isLargeViewport && (
 											<BlockToolbar hideDragHandle />
 										) }
-										<SiteEditorCanvas />
+										<SiteEditorCanvas onClick={ onClick } />
 										<PatternModal />
 									</>
 								) }
@@ -243,7 +245,12 @@ export default function Editor( { isLoading } ) {
 						}
 						secondarySidebar={
 							isEditMode &&
-							( ( shouldShowInserter && <InserterSidebar /> ) ||
+							( ( shouldShowInserter && (
+								<InserterSidebar
+									closeGeneralSidebar={ closeGeneralSidebar }
+									isRightSidebarOpen={ isRightSidebarOpen }
+								/>
+							) ) ||
 								( shouldShowListView && <ListViewSidebar /> ) )
 						}
 						sidebar={

package/src/components/editor-canvas-container/index.js

@@ -134,7 +134,6 @@ function EditorCanvasContainer( {
 							icon={ closeSmall }
 							label={ closeButtonLabel || __( 'Close' ) }
 							onClick={ onCloseContainer }
-							showTooltip={ false }
 						/>
 					) }
 					{ childrenWithProps }