@wordpress/edit-site 5.28.2 → 5.29.0

package/build-style/style.css

@@ -112,6 +112,7 @@
   text-overflow: ellipsis;
   white-space: nowrap;
   width: 100%;
+  margin: 0;
 }
 @media (min-width: 782px) {
   .components-panel__header.interface-complementary-area-header__small {
@@ -123,6 +124,9 @@
   background: #fff;
   padding-right: 4px;
 }
+.interface-complementary-area-header .interface-complementary-area-header__title {
+  margin: 0;
+}
 .interface-complementary-area-header .components-button.has-icon {
   display: none;
   margin-left: auto;
@@ -555,7 +559,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 }
 .dataviews-view-table th {
   text-align: left;
-  color: var(--wp-components-color-foreground, #1e1e1e);
+  color: #1e1e1e;
   font-weight: normal;
   font-size: 13px;
 }
@@ -953,7 +957,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   margin-block-end: 0;
 }
 .dataviews-search-widget-filter-combobox-list .dataviews-search-widget-filter-combobox-item:hover, .dataviews-search-widget-filter-combobox-list .dataviews-search-widget-filter-combobox-item[data-active-item], .dataviews-search-widget-filter-combobox-list .dataviews-search-widget-filter-combobox-item:focus {
-  background-color: var(--wp-components-color-accent, var(--wp-admin-theme-color, #3858e9));
+  background-color: var(--wp-admin-theme-color);
   color: #fff;
 }
 .dataviews-search-widget-filter-combobox-list .dataviews-search-widget-filter-combobox-item:hover .dataviews-search-widget-filter-combobox-item-check, .dataviews-search-widget-filter-combobox-list .dataviews-search-widget-filter-combobox-item[data-active-item] .dataviews-search-widget-filter-combobox-item-check, .dataviews-search-widget-filter-combobox-list .dataviews-search-widget-filter-combobox-item:focus .dataviews-search-widget-filter-combobox-item-check {
@@ -1040,7 +1044,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 }
 .dataviews-search-widget-filter-combobox__wrapper .dataviews-search-widget-filter-combobox__input:focus {
   background: #fff;
-  box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-components-color-accent, var(--wp-admin-theme-color, #007cba));
+  box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
 }
 .dataviews-search-widget-filter-combobox__wrapper .dataviews-search-widget-filter-combobox__input::placeholder {
   color: #757575;
@@ -1727,7 +1731,7 @@ textarea.edit-site-code-editor-text-area.edit-site-code-editor-text-area:-ms-inp
 }
 
 .edit-site-global-styles-screen-css-help-link {
-  display: block;
+  display: inline-block;
   margin-top: 8px;
 }
 
@@ -1795,7 +1799,7 @@ textarea.edit-site-code-editor-text-area.edit-site-code-editor-text-area:-ms-inp
   border-radius: 2px;
   outline: 3px solid transparent;
   outline-offset: -2px;
-  color: var(--wp-components-color-accent, var(--wp-admin-theme-color, #007cba));
+  color: var(--wp-admin-theme-color);
   background: rgba(var(--wp-admin-theme-color--rgb), 0.04);
 }
 .edit-site-global-styles-screen-revisions__revision-item.is-selected .edit-site-global-styles-screen-revisions__revision-button {
@@ -1805,7 +1809,7 @@ textarea.edit-site-code-editor-text-area.edit-site-code-editor-text-area:-ms-inp
   color: var(--wp-admin-theme-color);
 }
 .edit-site-global-styles-screen-revisions__revision-item.is-selected::before {
-  background: var(--wp-components-color-accent, var(--wp-admin-theme-color, #007cba));
+  background: var(--wp-admin-theme-color);
 }
 .edit-site-global-styles-screen-revisions__revision-item.is-selected .edit-site-global-styles-screen-revisions__changes > li,
 .edit-site-global-styles-screen-revisions__revision-item.is-selected .edit-site-global-styles-screen-revisions__meta,
@@ -2380,69 +2384,6 @@ body.is-fullscreen-mode .edit-site-list-header {
   width: 100%;
 }
 
-.edit-site-patterns {
-  background: #1e1e1e;
-  border-left: 1px solid #2f2f2f;
-  margin: 60px 0 0;
-  border-radius: 0;
-  padding: 0;
-  overflow-x: auto;
-  min-height: 100%;
-}
-.edit-site-patterns .components-base-control {
-  width: 100%;
-}
-@media (min-width: 782px) {
-  .edit-site-patterns .components-base-control {
-    width: auto;
-  }
-}
-.edit-site-patterns .components-text {
-  color: #949494;
-}
-.edit-site-patterns .components-heading {
-  color: #e0e0e0;
-}
-@media (min-width: 782px) {
-  .edit-site-patterns {
-    margin: 0;
-  }
-}
-.edit-site-patterns .edit-site-patterns__search-block {
-  min-width: -moz-fit-content;
-  min-width: fit-content;
-  flex-grow: 1;
-}
-.edit-site-patterns .edit-site-patterns__search {
-  --wp-components-color-foreground: #e0e0e0;
-}
-.edit-site-patterns .edit-site-patterns__search .components-input-control__container {
-  background: #2f2f2f;
-}
-.edit-site-patterns .edit-site-patterns__search svg {
-  fill: #949494;
-}
-.edit-site-patterns .edit-site-patterns__sync-status-filter {
-  background: #2f2f2f;
-  border: none;
-  height: 40px;
-  min-width: max-content;
-  width: 100%;
-  max-width: 100%;
-}
-@media (min-width: 782px) {
-  .edit-site-patterns .edit-site-patterns__sync-status-filter {
-    width: 300px;
-  }
-}
-.edit-site-patterns .edit-site-patterns__sync-status-filter-option:not([aria-checked=true]) {
-  color: #949494;
-}
-.edit-site-patterns .edit-site-patterns__sync-status-filter-option:active {
-  background: #757575;
-  color: #f0f0f0;
-}
-
 .edit-site-patterns__header {
   position: sticky;
   top: 0;
@@ -2454,93 +2395,10 @@ body.is-fullscreen-mode .edit-site-list-header {
   color: #949494;
 }
 
-.edit-site-patterns__section {
-  padding: 24px 32px;
-  flex: 1;
-}
-
 .edit-site-patterns__section-header .screen-reader-shortcut:focus {
   top: 0;
 }
 
-.edit-site-patterns__grid {
-  display: grid;
-  grid-template-columns: 1fr;
-  gap: 32px;
-  margin-top: 0;
-  margin-bottom: 0;
-}
-@media (min-width: 960px) {
-  .edit-site-patterns__grid {
-    grid-template-columns: 1fr 1fr;
-  }
-}
-@media (min-width: 1440px) {
-  .edit-site-patterns__grid {
-    grid-template-columns: 1fr 1fr 1fr;
-  }
-}
-@media (min-width: 1920px) {
-  .edit-site-patterns__grid {
-    grid-template-columns: 1fr 1fr 1fr 1fr;
-  }
-}
-.edit-site-patterns__grid .edit-site-patterns__pattern {
-  break-inside: avoid-column;
-  display: flex;
-  flex-direction: column;
-}
-.edit-site-patterns__grid .edit-site-patterns__pattern .edit-site-patterns__preview {
-  box-shadow: none;
-  border: none;
-  padding: 0;
-  background-color: unset;
-  box-sizing: border-box;
-  border-radius: 4px;
-  cursor: pointer;
-  overflow: hidden;
-}
-.edit-site-patterns__grid .edit-site-patterns__pattern .edit-site-patterns__preview:focus {
-  box-shadow: inset 0 0 0 0 #fff, 0 0 0 2px var(--wp-admin-theme-color);
-  outline: 2px solid transparent;
-}
-.edit-site-patterns__grid .edit-site-patterns__pattern .edit-site-patterns__preview.is-inactive {
-  cursor: default;
-}
-.edit-site-patterns__grid .edit-site-patterns__pattern .edit-site-patterns__preview.is-inactive:focus {
-  box-shadow: 0 0 0 var(--wp-admin-border-width-focus) #2f2f2f;
-  opacity: 0.8;
-}
-.edit-site-patterns__grid .edit-site-patterns__pattern .edit-site-patterns__footer,
-.edit-site-patterns__grid .edit-site-patterns__pattern .edit-site-patterns__button {
-  color: #949494;
-}
-.edit-site-patterns__grid .edit-site-patterns__pattern .edit-site-patterns__dropdown {
-  flex-shrink: 0;
-}
-.edit-site-patterns__grid .edit-site-patterns__pattern.is-placeholder .edit-site-patterns__preview {
-  min-height: 64px;
-  color: #949494;
-  border: 1px dashed #2f2f2f;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-.edit-site-patterns__grid .edit-site-patterns__pattern.is-placeholder .edit-site-patterns__preview:focus {
-  box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
-}
-.edit-site-patterns__grid .edit-site-patterns__preview {
-  flex: 0 1 auto;
-  margin-bottom: 12px;
-}
-
-.edit-site-patterns__load-more {
-  align-self: center;
-}
-
-.edit-site-patterns__pattern-title {
-  color: #e0e0e0;
-}
 .edit-site-patterns__pattern-title .is-link {
   text-decoration: none;
   color: #e0e0e0;
@@ -2557,39 +2415,18 @@ body.is-fullscreen-mode .edit-site-list-header {
   fill: currentcolor;
 }
 
-.edit-site-patterns__no-results {
-  color: #949494;
-}
-
 .edit-site-patterns__delete-modal {
   width: 384px;
 }
 
-.edit-site-patterns__pagination {
-  padding: 24px 32px;
-  border-top: 1px solid #2f2f2f;
-  background: #1e1e1e;
-  position: sticky;
-  bottom: 0;
-  color: #f0f0f0;
-  z-index: 2;
-}
-.edit-site-patterns__pagination .components-button.is-tertiary {
-  background-color: #2f2f2f;
-  color: #f0f0f0;
-}
-.edit-site-patterns__pagination .components-button.is-tertiary:disabled {
-  color: #949494;
-  background: none;
+.edit-site-page-patterns-dataviews {
+  margin-top: 60px;
 }
-.edit-site-patterns__pagination .components-button.is-tertiary:hover:not(:disabled) {
-  background-color: #757575;
+@media (min-width: 782px) {
+  .edit-site-page-patterns-dataviews {
+    margin-top: 0;
+  }
 }
-
-/**
- * DataViews patterns styles.
- * TODO: when this becomes stable, consolidate styles with the above.
- */
 .edit-site-page-patterns-dataviews .page-patterns-preview-field {
   display: flex;
   flex-direction: column;
@@ -2638,6 +2475,9 @@ body.is-fullscreen-mode .edit-site-list-header {
   text-overflow: ellipsis;
   color: inherit;
 }
+.edit-site-page-patterns-dataviews .dataviews-pagination {
+  z-index: 2;
+}
 
 .dataviews-action-modal__duplicate-pattern [role=dialog] > [role=document] {
   width: 350px;
@@ -2715,6 +2555,10 @@ body.is-fullscreen-mode .edit-site-list-header {
   white-space: normal;
 }
 
+.edit-site-page-template-template-parts-dataviews .dataviews-pagination {
+  z-index: 2;
+}
+
 .edit-site-table-wrapper {
   width: 100%;
   padding: 32px;
@@ -2786,6 +2630,10 @@ body.is-fullscreen-mode .edit-site-list-header {
   flex: 1;
 }
 
+.edit-site-global-styles-sidebar .edit-site-global-styles-sidebar__header-title {
+  margin: 0;
+}
+
 .edit-site-global-styles-sidebar .interface-complementary-area-header .components-button.has-icon {
   margin-left: 0;
 }
@@ -2950,23 +2798,13 @@ h3.edit-site-template-card__template-areas-title {
   margin: 0 0 8px;
 }
 
-.edit-site-template-panel__replace-template-modal {
-  z-index: 1000001;
+.edit-site-template-card__templates-list {
+  margin-top: 16px;
 }
 
-.edit-site-template-panel__replace-template-modal__content {
-  column-count: 2;
-  column-gap: 24px;
-}
-@media (min-width: 782px) {
-  .edit-site-template-panel__replace-template-modal__content {
-    column-count: 3;
-  }
-}
-@media (min-width: 1280px) {
-  .edit-site-template-panel__replace-template-modal__content {
-    column-count: 4;
-  }
+.edit-site-template-panel .block-editor-block-preview__container {
+  border-radius: 2px;
+  box-shadow: none;
 }
 
 .edit-site-editor__interface-skeleton {
@@ -3310,6 +3148,12 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   flex-direction: column;
 }
 
+.edit-site-layout__mobile {
+  position: relative;
+  width: 100%;
+  z-index: 2;
+}
+
 .edit-site-layout__canvas-container {
   position: relative;
   flex-grow: 1;
@@ -3363,6 +3207,7 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   border-radius: 0;
 }
 
+.edit-site-layout__mobile .interface-interface-skeleton,
 .edit-site-layout__canvas .interface-interface-skeleton,
 .edit-site-template-pages-preview .interface-interface-skeleton {
   position: relative !important;
@@ -3498,7 +3343,7 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   border-top: 1px solid #2f2f2f;
   flex-shrink: 0;
   margin: 0;
-  padding: 20px 16px;
+  padding: 16px 16px;
 }
 
 .edit-site-save-hub__button {
@@ -3579,7 +3424,7 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   outline: none;
 }
 .edit-site-sidebar-button:focus-visible:not(:disabled) {
-  box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-components-color-accent, var(--wp-admin-theme-color, #007cba));
+  box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
   outline: 3px solid transparent;
 }
 .edit-site-sidebar-button:hover, .edit-site-sidebar-button:focus-visible, .edit-site-sidebar-button:focus, .edit-site-sidebar-button:not([aria-disabled=true]):active, .edit-site-sidebar-button[aria-expanded=true] {
@@ -4291,9 +4136,8 @@ body:has(.edit-site-resizable-frame__inner.is-resizing) {
   background-color: #fff;
 }
 
-.font-library-modal__fonts-grid .font-library-modal__fonts-grid__main {
-  display: flex;
-  flex-direction: column;
+.font-library-modal__tabpanel-layout .components-base-control__field {
+  margin-bottom: 0;
 }
 
 .font-library-modal__font-card {
@@ -4442,22 +4286,15 @@ body.js.site-editor-php {
   background: #1e1e1e;
 }
 
-.edit-site,
-.components-modal__frame {
+.edit-site {
   box-sizing: border-box;
+  height: 100vh;
 }
 .edit-site *,
 .edit-site *::before,
-.edit-site *::after,
-.components-modal__frame *,
-.components-modal__frame *::before,
-.components-modal__frame *::after {
+.edit-site *::after {
   box-sizing: inherit;
 }
-
-.edit-site {
-  height: 100vh;
-}
 @media (min-width: 600px) {
   .edit-site {
     bottom: 0;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "5.28.2",
+	"version": "5.29.0",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -27,48 +27,49 @@
 	"react-native": "src/index",
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "^3.51.1",
-		"@wordpress/api-fetch": "^6.48.1",
-		"@wordpress/blob": "^3.51.1",
-		"@wordpress/block-editor": "^12.19.2",
-		"@wordpress/block-library": "^8.28.2",
-		"@wordpress/blocks": "^12.28.2",
-		"@wordpress/commands": "^0.22.2",
-		"@wordpress/components": "^26.0.2",
-		"@wordpress/compose": "^6.28.1",
-		"@wordpress/core-commands": "^0.20.2",
-		"@wordpress/core-data": "^6.28.2",
-		"@wordpress/data": "^9.21.1",
-		"@wordpress/dataviews": "^0.5.2",
-		"@wordpress/date": "^4.51.1",
-		"@wordpress/deprecated": "^3.51.1",
-		"@wordpress/dom": "^3.51.1",
-		"@wordpress/editor": "^13.28.2",
-		"@wordpress/element": "^5.28.1",
-		"@wordpress/escape-html": "^2.51.1",
-		"@wordpress/hooks": "^3.51.1",
-		"@wordpress/html-entities": "^3.51.1",
-		"@wordpress/i18n": "^4.51.1",
-		"@wordpress/icons": "^9.42.1",
-		"@wordpress/interface": "^5.28.2",
-		"@wordpress/keyboard-shortcuts": "^4.28.1",
-		"@wordpress/keycodes": "^3.51.1",
-		"@wordpress/media-utils": "^4.42.1",
-		"@wordpress/notices": "^4.19.1",
-		"@wordpress/patterns": "^1.12.2",
-		"@wordpress/plugins": "^6.19.2",
-		"@wordpress/preferences": "^3.28.2",
-		"@wordpress/primitives": "^3.49.1",
-		"@wordpress/private-apis": "^0.33.1",
-		"@wordpress/reusable-blocks": "^4.28.2",
-		"@wordpress/router": "^0.20.1",
-		"@wordpress/style-engine": "^1.34.1",
-		"@wordpress/url": "^3.52.1",
-		"@wordpress/viewport": "^5.28.1",
-		"@wordpress/widgets": "^3.28.2",
-		"@wordpress/wordcount": "^3.51.1",
+		"@wordpress/a11y": "^3.52.0",
+		"@wordpress/api-fetch": "^6.49.0",
+		"@wordpress/blob": "^3.52.0",
+		"@wordpress/block-editor": "^12.20.0",
+		"@wordpress/block-library": "^8.29.0",
+		"@wordpress/blocks": "^12.29.0",
+		"@wordpress/commands": "^0.23.0",
+		"@wordpress/components": "^27.0.0",
+		"@wordpress/compose": "^6.29.0",
+		"@wordpress/core-commands": "^0.21.0",
+		"@wordpress/core-data": "^6.29.0",
+		"@wordpress/data": "^9.22.0",
+		"@wordpress/dataviews": "^0.6.0",
+		"@wordpress/date": "^4.52.0",
+		"@wordpress/deprecated": "^3.52.0",
+		"@wordpress/dom": "^3.52.0",
+		"@wordpress/editor": "^13.29.0",
+		"@wordpress/element": "^5.29.0",
+		"@wordpress/escape-html": "^2.52.0",
+		"@wordpress/hooks": "^3.52.0",
+		"@wordpress/html-entities": "^3.52.0",
+		"@wordpress/i18n": "^4.52.0",
+		"@wordpress/icons": "^9.43.0",
+		"@wordpress/interface": "^5.29.0",
+		"@wordpress/keyboard-shortcuts": "^4.29.0",
+		"@wordpress/keycodes": "^3.52.0",
+		"@wordpress/media-utils": "^4.43.0",
+		"@wordpress/notices": "^4.20.0",
+		"@wordpress/patterns": "^1.13.0",
+		"@wordpress/plugins": "^6.20.0",
+		"@wordpress/preferences": "^3.29.0",
+		"@wordpress/primitives": "^3.50.0",
+		"@wordpress/private-apis": "^0.34.0",
+		"@wordpress/reusable-blocks": "^4.29.0",
+		"@wordpress/router": "^0.21.0",
+		"@wordpress/style-engine": "^1.35.0",
+		"@wordpress/url": "^3.53.0",
+		"@wordpress/viewport": "^5.29.0",
+		"@wordpress/widgets": "^3.29.0",
+		"@wordpress/wordcount": "^3.52.0",
 		"change-case": "^4.1.2",
 		"classnames": "^2.3.1",
+		"client-zip": "^2.4.4",
 		"colord": "^2.9.2",
 		"deepmerge": "^4.3.0",
 		"fast-deep-equal": "^3.1.3",
@@ -85,5 +86,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "730beb7fd33d3382d6032c3f33e451625a0fcf36"
+	"gitHead": "c139588f4c668b38bafbc5431f2f4e3903dbe683"
 }

package/src/components/add-new-pattern/index.js

@@ -25,10 +25,11 @@ import {
 	PATTERN_DEFAULT_CATEGORY,
 	TEMPLATE_PART_POST_TYPE,
 } from '../../utils/constants';
-import usePatternCategories from '../sidebar-navigation-screen-patterns/use-pattern-categories';
 
 const { useHistory, useLocation } = unlock( routerPrivateApis );
-const { CreatePatternModal } = unlock( editPatternsPrivateApis );
+const { CreatePatternModal, useAddPatternCategory } = unlock(
+	editPatternsPrivateApis
+);
 
 export default function AddNewPattern() {
 	const history = useHistory();
@@ -43,7 +44,6 @@ export default function AddNewPattern() {
 	const { createSuccessNotice, createErrorNotice } =
 		useDispatch( noticesStore );
 	const patternUploadInputRef = useRef();
-	const { patternCategories } = usePatternCategories();
 
 	function handleCreatePattern( { pattern, categoryId } ) {
 		setShowPatternModal( false );
@@ -97,6 +97,7 @@ export default function AddNewPattern() {
 		title: __( 'Import pattern from JSON' ),
 	} );
 
+	const { categoryMap, findOrCreateTerm } = useAddPatternCategory();
 	return (
 		<>
 			<DropdownMenu
@@ -132,12 +133,23 @@ export default function AddNewPattern() {
 					const file = event.target.files?.[ 0 ];
 					if ( ! file ) return;
 					try {
-						const currentCategoryId =
-							params.categoryType !== TEMPLATE_PART_POST_TYPE &&
-							patternCategories.find(
-								( category ) =>
-									category.name === params.categoryId
-							)?.id;
+						let currentCategoryId;
+						// When we're not handling template parts, we should
+						// add or create the proper pattern category.
+						if ( params.categoryType !== TEMPLATE_PART_POST_TYPE ) {
+							const currentCategory = categoryMap
+								.values()
+								.find(
+									( term ) => term.name === params.categoryId
+								);
+							if ( !! currentCategory ) {
+								currentCategoryId =
+									currentCategory.id ||
+									( await findOrCreateTerm(
+										currentCategory.label
+									) );
+							}
+						}
 						const pattern = await createPatternFromFile(
 							file,
 							currentCategoryId
@@ -146,8 +158,12 @@ export default function AddNewPattern() {
 						);
 
 						// Navigate to the All patterns category for the newly created pattern
-						// if we're not on that page already.
-						if ( ! currentCategoryId ) {
+						// if we're not on that page already and if we're not in the `my-patterns`
+						// category.
+						if (
+							! currentCategoryId &&
+							params.categoryId !== 'my-patterns'
+						) {
 							history.push( {
 								path: `/patterns`,
 								categoryType: PATTERN_TYPES.theme,

package/src/components/block-editor/use-site-editor-settings.js

@@ -162,6 +162,7 @@ export function useSpecificEditorSettings() {
 			// I wonder if they should be set in the post editor too
 			__experimentalArchiveTitleTypeLabel: archiveLabels.archiveTypeLabel,
 			__experimentalArchiveTitleNameLabel: archiveLabels.archiveNameLabel,
+			__unstableIsPreviewMode: canvasMode === 'view',
 		};
 	}, [
 		settings,

package/src/components/code-editor/index.js

@@ -14,6 +14,7 @@ import { __ } from '@wordpress/i18n';
 import { Button, VisuallyHidden } from '@wordpress/components';
 import { useMemo } from '@wordpress/element';
 import { useInstanceId } from '@wordpress/compose';
+import { store as editorStore } from '@wordpress/editor';
 
 /**
  * Internal dependencies
@@ -31,7 +32,7 @@ export default function CodeEditor() {
 		const editedRecord = getEditedEntityRecord( 'postType', _type, _id );
 
 		return {
-			shortcut: getShortcutRepresentation( 'core/edit-site/toggle-mode' ),
+			shortcut: getShortcutRepresentation( 'core/editor/toggle-mode' ),
 			content: editedRecord?.content,
 			blocks: editedRecord?.blocks,
 			type: _type,
@@ -52,7 +53,7 @@ export default function CodeEditor() {
 		return content;
 	}, [ content, blocks ] );
 
-	const { switchEditorMode } = useDispatch( editSiteStore );
+	const { switchEditorMode } = useDispatch( editorStore );
 	return (
 		<div className="edit-site-code-editor">
 			<div className="edit-site-code-editor__toolbar">

package/src/components/editor/index.js

@@ -115,14 +115,18 @@ export default function Editor( { isLoading } ) {
 		postTypeLabel,
 	} = useSelect( ( select ) => {
 		const { get } = select( preferencesStore );
-		const { getEditedPostContext, getEditorMode, getCanvasMode } = unlock(
+		const { getEditedPostContext, getCanvasMode } = unlock(
 			select( editSiteStore )
 		);
 		const { __unstableGetEditorMode } = select( blockEditorStore );
 		const { getActiveComplementaryArea } = select( interfaceStore );
 		const { getEntityRecord } = select( coreDataStore );
-		const { isInserterOpened, isListViewOpened, getPostTypeLabel } =
-			select( editorStore );
+		const {
+			isInserterOpened,
+			isListViewOpened,
+			getPostTypeLabel,
+			getEditorMode,
+		} = select( editorStore );
 		const _context = getEditedPostContext();
 
 		// The currently selected entity to display.
@@ -263,11 +267,11 @@ export default function Editor( { isLoading } ) {
 								( shouldShowListView && <ListViewSidebar /> ) )
 						}
 						sidebar={
+							! isDistractionFree &&
 							isEditMode &&
-							isRightSidebarOpen && (
-								<>
-									<ComplementaryArea.Slot scope="core/edit-site" />
-								</>
+							isRightSidebarOpen &&
+							! isDistractionFree && (
+								<ComplementaryArea.Slot scope="core/edit-site" />
 							)
 						}
 						footer={