@wordpress/edit-site 7.4.0 → 7.5.1-next.v.202609171837.0

package/build-style/style-rtl.css

@@ -779,7 +779,7 @@
   vertical-align: middle;
   width: 16px;
   /* stylelint-disable-next-line font-family-no-missing-generic-family-keyword -- dashicons don't need a generic family keyword. */
-  font: normal 30px/1 dashicons;
+  font: 400 30px/1 dashicons;
   speak: none;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
@@ -792,8 +792,8 @@
   }
 }
 .dataviews-filters__search-widget-listitem .dataviews-filters__search-widget-listitem-multi-selection[aria-disabled=true], .dataviews-filters__search-widget-listitem .dataviews-filters__search-widget-listitem-multi-selection:disabled {
-  background: #f0f0f0;
-  border-color: #ddd;
+  background: var(--wpds-color-background-interactive-neutral-disabled, #fff);
+  border-color: var(--wpds-color-stroke-interactive-neutral-disabled, #dbdbdb);
   cursor: default;
   opacity: 1;
 }
@@ -1735,7 +1735,7 @@ div.dataviews-view-list {
 .dataviews-view-table th {
   text-align: right;
   color: var(--wpds-color-foreground-content-neutral, #1e1e1e);
-  font-weight: normal;
+  font-weight: 400;
   font-size: var(--wpds-typography-font-size-md, 13px);
 }
 
@@ -2837,7 +2837,8 @@ div.dataviews-view-list {
   overflow: clip;
   padding-inline: var(--wpds-border-width-focus, var(--wp-admin-border-width-focus, 2px));
   margin-inline: calc(-1 * var(--wpds-border-width-focus, var(--wp-admin-border-width-focus, 2px)));
-  word-break: break-word;
+  word-break: normal;
+  overflow-wrap: anywhere;
   font-weight: var(--wpds-typography-font-weight-emphasis, 600);
 }
 
@@ -3487,7 +3488,8 @@ fieldset.fields__media-edit .fields__media-edit-expanded:not(.is-empty) .fields_
 }
 
 .fields-controls__slug .fields-controls__slug-help-link {
-  word-break: break-word;
+  word-break: normal;
+  overflow-wrap: anywhere;
 }
 
 .fields-controls__slug .fields-controls__slug-help {
@@ -3764,7 +3766,7 @@ fieldset.fields__media-edit .fields__media-edit-expanded:not(.is-empty) .fields_
 }
 
 .font-library__font-card .font-library__font-card__name {
-  font-weight: bold;
+  font-weight: 700;
 }
 
 .font-library__font-card .font-library__font-card__count {
@@ -4224,7 +4226,8 @@ button.font-library__upload-area {
   overflow: hidden;
 }
 
-.global-styles-ui__shadow-preview-panel {
+.global-styles-ui__shadow-preview-panel,
+.global-styles-ui__text-shadow-preview-panel {
   height: 144px;
   border: #ddd 1px solid;
   border-radius: 2px;
@@ -4234,7 +4237,7 @@ button.font-library__upload-area {
   background-size: 16px 16px;
 }
 
-.global-styles-ui__shadow-preview-panel .global-styles-ui__shadow-preview-block {
+.global-styles-ui__shadow-preview-block {
   border: #ddd 1px solid;
   border-radius: 2px;
   background-color: #fff;
@@ -4242,20 +4245,42 @@ button.font-library__upload-area {
   height: 60px;
 }
 
-.global-styles-ui__shadow-editor__dropdown-content {
+.global-styles-ui__text-shadow-preview-panel {
+  margin-block: -8px 16px;
+}
+
+.global-styles-ui__text-shadow-preview-text {
+  font-size: 24px;
+}
+
+.global-styles-ui__text-shadow-editor__header {
+  margin-block-end: 8px;
+}
+
+.global-styles-ui__text-shadow-editor__inputs {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 16px;
+}
+
+.global-styles-ui__shadow-editor__dropdown-content,
+.global-styles-ui__text-shadow-editor__dropdown-content {
   width: 280px;
 }
 
-.global-styles-ui__shadow-editor-panel {
+.global-styles-ui__shadow-editor-panel,
+.global-styles-ui__text-shadow-editor-panel {
   margin-bottom: 4px;
 }
 
-.global-styles-ui__shadow-editor__dropdown {
+.global-styles-ui__shadow-editor__dropdown,
+.global-styles-ui__text-shadow-editor__dropdown {
   width: 100%;
   position: relative;
 }
 
-.global-styles-ui__shadow-editor__dropdown-toggle {
+.global-styles-ui__shadow-editor__dropdown-toggle,
+.global-styles-ui__text-shadow-editor__dropdown-toggle {
   width: 100%;
   height: auto;
   padding-top: 8px;
@@ -4264,24 +4289,31 @@ button.font-library__upload-area {
   border-radius: inherit;
 }
 
-.global-styles-ui__shadow-editor__dropdown-toggle.is-open {
+.global-styles-ui__shadow-editor__dropdown-toggle.is-open,
+.global-styles-ui__text-shadow-editor__dropdown-toggle.is-open {
   background: #f0f0f0;
   color: var(--wp-admin-theme-color);
 }
 
-.global-styles-ui__shadow-editor__remove-button {
+.global-styles-ui__shadow-editor__remove-button,
+.global-styles-ui__text-shadow-editor__remove-button {
   position: absolute;
   left: 8px;
   top: 8px;
   opacity: 0;
 }
 
-.global-styles-ui__shadow-editor__dropdown-toggle:hover + .global-styles-ui__shadow-editor__remove-button, .global-styles-ui__shadow-editor__remove-button:focus, .global-styles-ui__shadow-editor__remove-button:hover {
+.global-styles-ui__shadow-editor__dropdown-toggle:hover + .global-styles-ui__shadow-editor__remove-button, .global-styles-ui__text-shadow-editor__dropdown-toggle:hover + .global-styles-ui__shadow-editor__remove-button, .global-styles-ui__shadow-editor__remove-button:focus, .global-styles-ui__shadow-editor__remove-button:hover,
+.global-styles-ui__shadow-editor__dropdown-toggle:hover + .global-styles-ui__text-shadow-editor__remove-button,
+.global-styles-ui__text-shadow-editor__dropdown-toggle:hover + .global-styles-ui__text-shadow-editor__remove-button,
+.global-styles-ui__text-shadow-editor__remove-button:focus,
+.global-styles-ui__text-shadow-editor__remove-button:hover {
   opacity: 1;
 }
 
 @media (hover: none) {
-  .global-styles-ui__shadow-editor__remove-button {
+  .global-styles-ui__shadow-editor__remove-button,
+  .global-styles-ui__text-shadow-editor__remove-button {
     opacity: 1;
   }
 }

package/build-style/style.css

@@ -779,7 +779,7 @@
   vertical-align: middle;
   width: 16px;
   /* stylelint-disable-next-line font-family-no-missing-generic-family-keyword -- dashicons don't need a generic family keyword. */
-  font: normal 30px/1 dashicons;
+  font: 400 30px/1 dashicons;
   speak: none;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
@@ -792,8 +792,8 @@
   }
 }
 .dataviews-filters__search-widget-listitem .dataviews-filters__search-widget-listitem-multi-selection[aria-disabled=true], .dataviews-filters__search-widget-listitem .dataviews-filters__search-widget-listitem-multi-selection:disabled {
-  background: #f0f0f0;
-  border-color: #ddd;
+  background: var(--wpds-color-background-interactive-neutral-disabled, #fff);
+  border-color: var(--wpds-color-stroke-interactive-neutral-disabled, #dbdbdb);
   cursor: default;
   opacity: 1;
 }
@@ -1735,7 +1735,7 @@ div.dataviews-view-list {
 .dataviews-view-table th {
   text-align: left;
   color: var(--wpds-color-foreground-content-neutral, #1e1e1e);
-  font-weight: normal;
+  font-weight: 400;
   font-size: var(--wpds-typography-font-size-md, 13px);
 }
 
@@ -2837,7 +2837,8 @@ div.dataviews-view-list {
   overflow: clip;
   padding-inline: var(--wpds-border-width-focus, var(--wp-admin-border-width-focus, 2px));
   margin-inline: calc(-1 * var(--wpds-border-width-focus, var(--wp-admin-border-width-focus, 2px)));
-  word-break: break-word;
+  word-break: normal;
+  overflow-wrap: anywhere;
   font-weight: var(--wpds-typography-font-weight-emphasis, 600);
 }
 
@@ -3487,7 +3488,8 @@ fieldset.fields__media-edit .fields__media-edit-expanded:not(.is-empty) .fields_
 }
 
 .fields-controls__slug .fields-controls__slug-help-link {
-  word-break: break-word;
+  word-break: normal;
+  overflow-wrap: anywhere;
 }
 
 .fields-controls__slug .fields-controls__slug-help {
@@ -3764,7 +3766,7 @@ fieldset.fields__media-edit .fields__media-edit-expanded:not(.is-empty) .fields_
 }
 
 .font-library__font-card .font-library__font-card__name {
-  font-weight: bold;
+  font-weight: 700;
 }
 
 .font-library__font-card .font-library__font-card__count {
@@ -4224,7 +4226,8 @@ button.font-library__upload-area {
   overflow: hidden;
 }
 
-.global-styles-ui__shadow-preview-panel {
+.global-styles-ui__shadow-preview-panel,
+.global-styles-ui__text-shadow-preview-panel {
   height: 144px;
   border: #ddd 1px solid;
   border-radius: 2px;
@@ -4236,7 +4239,7 @@ button.font-library__upload-area {
   background-size: 16px 16px;
 }
 
-.global-styles-ui__shadow-preview-panel .global-styles-ui__shadow-preview-block {
+.global-styles-ui__shadow-preview-block {
   border: #ddd 1px solid;
   border-radius: 2px;
   background-color: #fff;
@@ -4244,20 +4247,42 @@ button.font-library__upload-area {
   height: 60px;
 }
 
-.global-styles-ui__shadow-editor__dropdown-content {
+.global-styles-ui__text-shadow-preview-panel {
+  margin-block: -8px 16px;
+}
+
+.global-styles-ui__text-shadow-preview-text {
+  font-size: 24px;
+}
+
+.global-styles-ui__text-shadow-editor__header {
+  margin-block-end: 8px;
+}
+
+.global-styles-ui__text-shadow-editor__inputs {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 16px;
+}
+
+.global-styles-ui__shadow-editor__dropdown-content,
+.global-styles-ui__text-shadow-editor__dropdown-content {
   width: 280px;
 }
 
-.global-styles-ui__shadow-editor-panel {
+.global-styles-ui__shadow-editor-panel,
+.global-styles-ui__text-shadow-editor-panel {
   margin-bottom: 4px;
 }
 
-.global-styles-ui__shadow-editor__dropdown {
+.global-styles-ui__shadow-editor__dropdown,
+.global-styles-ui__text-shadow-editor__dropdown {
   width: 100%;
   position: relative;
 }
 
-.global-styles-ui__shadow-editor__dropdown-toggle {
+.global-styles-ui__shadow-editor__dropdown-toggle,
+.global-styles-ui__text-shadow-editor__dropdown-toggle {
   width: 100%;
   height: auto;
   padding-top: 8px;
@@ -4266,24 +4291,31 @@ button.font-library__upload-area {
   border-radius: inherit;
 }
 
-.global-styles-ui__shadow-editor__dropdown-toggle.is-open {
+.global-styles-ui__shadow-editor__dropdown-toggle.is-open,
+.global-styles-ui__text-shadow-editor__dropdown-toggle.is-open {
   background: #f0f0f0;
   color: var(--wp-admin-theme-color);
 }
 
-.global-styles-ui__shadow-editor__remove-button {
+.global-styles-ui__shadow-editor__remove-button,
+.global-styles-ui__text-shadow-editor__remove-button {
   position: absolute;
   right: 8px;
   top: 8px;
   opacity: 0;
 }
 
-.global-styles-ui__shadow-editor__dropdown-toggle:hover + .global-styles-ui__shadow-editor__remove-button, .global-styles-ui__shadow-editor__remove-button:focus, .global-styles-ui__shadow-editor__remove-button:hover {
+.global-styles-ui__shadow-editor__dropdown-toggle:hover + .global-styles-ui__shadow-editor__remove-button, .global-styles-ui__text-shadow-editor__dropdown-toggle:hover + .global-styles-ui__shadow-editor__remove-button, .global-styles-ui__shadow-editor__remove-button:focus, .global-styles-ui__shadow-editor__remove-button:hover,
+.global-styles-ui__shadow-editor__dropdown-toggle:hover + .global-styles-ui__text-shadow-editor__remove-button,
+.global-styles-ui__text-shadow-editor__dropdown-toggle:hover + .global-styles-ui__text-shadow-editor__remove-button,
+.global-styles-ui__text-shadow-editor__remove-button:focus,
+.global-styles-ui__text-shadow-editor__remove-button:hover {
   opacity: 1;
 }
 
 @media (hover: none) {
-  .global-styles-ui__shadow-editor__remove-button {
+  .global-styles-ui__shadow-editor__remove-button,
+  .global-styles-ui__text-shadow-editor__remove-button {
     opacity: 1;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "7.4.0",
+	"version": "7.5.1-next.v.202609171837.0",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -47,42 +47,42 @@
 	],
 	"dependencies": {
 		"@react-spring/web": "^9.4.5",
-		"@wordpress/a11y": "^4.55.0",
-		"@wordpress/admin-ui": "^2.10.0",
-		"@wordpress/api-fetch": "^7.55.0",
-		"@wordpress/base-styles": "^13.1.0",
-		"@wordpress/block-editor": "^17.1.0",
-		"@wordpress/block-library": "^11.0.0",
-		"@wordpress/blocks": "^16.0.0",
-		"@wordpress/commands": "^1.55.0",
-		"@wordpress/components": "^40.1.0",
-		"@wordpress/compose": "^8.8.0",
-		"@wordpress/core-data": "^8.0.0",
-		"@wordpress/data": "^10.55.0",
-		"@wordpress/dataviews": "^19.0.0",
-		"@wordpress/deprecated": "^4.55.0",
-		"@wordpress/dom": "^4.55.0",
-		"@wordpress/editor": "^15.0.0",
-		"@wordpress/element": "^8.7.0",
-		"@wordpress/fields": "^0.47.0",
-		"@wordpress/global-styles-engine": "^1.22.0",
-		"@wordpress/global-styles-ui": "^1.22.0",
-		"@wordpress/html-entities": "^4.55.0",
-		"@wordpress/i18n": "^6.28.0",
-		"@wordpress/icons": "^16.0.0",
-		"@wordpress/keyboard-shortcuts": "^5.55.0",
-		"@wordpress/keycodes": "^4.55.0",
-		"@wordpress/notices": "^5.55.0",
-		"@wordpress/patterns": "^2.55.0",
-		"@wordpress/plugins": "^7.55.0",
-		"@wordpress/preferences": "^4.55.0",
-		"@wordpress/private-apis": "^1.55.0",
-		"@wordpress/router": "^1.55.0",
-		"@wordpress/theme": "^2.1.0",
-		"@wordpress/ui": "^0.22.0",
-		"@wordpress/url": "^4.55.0",
-		"@wordpress/views": "^1.22.0",
-		"@wordpress/widgets": "^4.55.0",
+		"@wordpress/a11y": "^4.55.1-next.v.202609171837.0",
+		"@wordpress/admin-ui": "^2.10.1-next.v.202609171837.0",
+		"@wordpress/api-fetch": "^7.55.1-next.v.202609171837.0",
+		"@wordpress/base-styles": "^13.2.1-next.v.202609171837.0",
+		"@wordpress/block-editor": "^17.2.1-next.v.202609171837.0",
+		"@wordpress/block-library": "^11.0.2-next.v.202609171837.0",
+		"@wordpress/blocks": "^16.1.1-next.v.202609171837.0",
+		"@wordpress/commands": "^1.55.2-next.v.202609171837.0",
+		"@wordpress/components": "^41.0.1-next.v.202609171837.0",
+		"@wordpress/compose": "^8.8.2-next.v.202609171837.0",
+		"@wordpress/core-data": "^8.0.2-next.v.202609171837.0",
+		"@wordpress/data": "^10.56.1-next.v.202609171837.0",
+		"@wordpress/dataviews": "^19.0.2-next.v.202609171837.0",
+		"@wordpress/deprecated": "^4.55.1-next.v.202609171837.0",
+		"@wordpress/dom": "^4.55.2-next.v.202609171837.0",
+		"@wordpress/editor": "^15.1.1-next.v.202609171837.0",
+		"@wordpress/element": "^8.7.1-next.v.202609171837.0",
+		"@wordpress/fields": "^0.47.2-next.v.202609171837.0",
+		"@wordpress/global-styles-engine": "^1.23.1-next.v.202609171837.0",
+		"@wordpress/global-styles-ui": "^1.23.1-next.v.202609171837.0",
+		"@wordpress/html-entities": "^4.55.1-next.v.202609171837.0",
+		"@wordpress/i18n": "^6.28.1-next.v.202609171837.0",
+		"@wordpress/icons": "^17.0.1-next.v.202609171837.0",
+		"@wordpress/keyboard-shortcuts": "^5.56.1-next.v.202609171837.0",
+		"@wordpress/keycodes": "^4.56.1-next.v.202609171837.0",
+		"@wordpress/notices": "^5.55.1-next.v.202609171837.0",
+		"@wordpress/patterns": "^2.55.1-next.v.202609171837.0",
+		"@wordpress/plugins": "^7.55.1-next.v.202609171837.0",
+		"@wordpress/preferences": "^4.55.1-next.v.202609171837.0",
+		"@wordpress/private-apis": "^1.55.1-next.v.202609171837.0",
+		"@wordpress/router": "^1.55.1-next.v.202609171837.0",
+		"@wordpress/theme": "^2.1.2-next.v.202609171837.0",
+		"@wordpress/ui": "^0.23.1-next.v.202609171837.0",
+		"@wordpress/url": "^4.55.1-next.v.202609171837.0",
+		"@wordpress/views": "^1.22.1-next.v.202609171837.0",
+		"@wordpress/widgets": "^4.55.1-next.v.202609171837.0",
 		"change-case": "^4.1.2",
 		"clsx": "^2.1.1"
 	},
@@ -96,5 +96,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "485f42ae8a1c58ceea18371a507fd4acfa86fbd8"
+	"gitHead": "7fc9f6676debc888d2f071d17cb71837040d4b48"
 }

package/src/components/add-new-post/index.jsx

@@ -51,7 +51,7 @@ export default function AddNewPostModal( { postType, onSave, onClose } ) {
 										[],
 										postTypeObject.template
 									)
-							  )
+								)
 							: undefined,
 				},
 				{ throwOnError: true }

package/src/components/add-new-template/utils.js

@@ -267,7 +267,7 @@ export const usePostTypeMenuItems = ( onClickMenuItem ) => {
 							_x( '%1$s (%2$s)', 'post type menu label' ),
 							labels.template_name,
 							slug
-					  )
+						)
 					: sprintf(
 							// translators: 1: Name of the post type e.g: "Post". 2: Slug of the post type e.g: "book".
 							_x(
@@ -276,13 +276,13 @@ export const usePostTypeMenuItems = ( onClickMenuItem ) => {
 							),
 							labels.singular_name,
 							slug
-					  );
+						);
 			}
 			const menuItem = defaultTemplateType
 				? {
 						...defaultTemplateType,
 						templatePrefix: templatePrefixes[ slug ],
-				  }
+					}
 				: {
 						slug: generalTemplateSlug,
 						title: menuItemTitle,
@@ -300,7 +300,7 @@ export const usePostTypeMenuItems = ( onClickMenuItem ) => {
 								? icon.slice( 10 )
 								: post,
 						templatePrefix: templatePrefixes[ slug ],
-				  };
+					};
 			const hasEntities = postTypesInfo?.[ slug ]?.hasEntities;
 			// We have a different template creation flow only if they have entities.
 			if ( hasEntities ) {
@@ -437,19 +437,19 @@ export const useTaxonomiesMenuItems = ( onClickMenuItem ) => {
 							_x( '%1$s (%2$s)', 'taxonomy template menu label' ),
 							labels.template_name,
 							slug
-					  )
+						)
 					: sprintf(
 							// translators: 1: Name of the taxonomy e.g: "Category". 2: Slug of the taxonomy e.g: "product_cat".
 							_x( '%1$s (%2$s)', 'taxonomy menu label' ),
 							labels.singular_name,
 							slug
-					  );
+						);
 			}
 			const menuItem = defaultTemplateType
 				? {
 						...defaultTemplateType,
 						templatePrefix: templatePrefixes[ slug ],
-				  }
+					}
 				: {
 						slug: generalTemplateSlug,
 						title: menuItemTitle,
@@ -460,7 +460,7 @@ export const useTaxonomiesMenuItems = ( onClickMenuItem ) => {
 						),
 						icon: blockMeta,
 						templatePrefix: templatePrefixes[ slug ],
-				  };
+					};
 			const hasEntities = taxonomiesInfo?.[ slug ]?.hasEntities;
 			// We have a different template creation flow only if they have entities.
 			if ( hasEntities ) {

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

@@ -84,7 +84,7 @@ export function useSpecificEditorSettings() {
 									currentPostIsTrashed
 										? ''
 										: 'cursor: pointer;'
-							  }}`
+								}}`
 							: undefined,
 				},
 			],

package/src/components/editor/index.jsx

@@ -7,7 +7,7 @@ import {
 } from '@wordpress/editor';
 import { __, isRTL, sprintf } from '@wordpress/i18n';
 import { store as coreDataStore } from '@wordpress/core-data';
-import { useCallback } from '@wordpress/element';
+import { useCallback, useEffect } from '@wordpress/element';
 import { store as noticesStore } from '@wordpress/notices';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
 import { decodeEntities } from '@wordpress/html-entities';
@@ -74,7 +74,13 @@ function getNavigationPath( location, postType ) {
 	return addQueryArgs( path, { canvas: undefined, revision: undefined } );
 }
 
-export default function EditSiteEditor( { isHomeRoute = false } ) {
+export default function EditSiteEditor( {
+	isHomeRoute = false,
+	// Routes that stand for the whole site pass 'template-locked', so the
+	// canvas shows the template around whatever it is rendering, and the
+	// controls for switching it are not offered.
+	renderingMode,
+} ) {
 	const location = useLocation();
 	const history = useHistory();
 	const { canvas = 'view' } = location.query;
@@ -108,7 +114,25 @@ export default function EditSiteEditor( { isHomeRoute = false } ) {
 
 	const editorSettings = useSpecificEditorSettings();
 	const { resetZoomLevel } = unlock( useDispatch( blockEditorStore ) );
-	const { setCurrentRevisionId } = unlock( useDispatch( editorStore ) );
+	const { setCurrentRevisionId, resetStylesNavigation } = unlock(
+		useDispatch( editorStore )
+	);
+
+	// Revisions and the style book render in place of the block editor, and
+	// belong to the styles route in edit mode. Anywhere else they would show
+	// the styles canvas where the block editor is expected: a site preview
+	// that cannot be clicked into, or the next route's content missing.
+	//
+	// Routes render their own element for this area, so navigating between
+	// them remounts this component. The check therefore runs on every render
+	// rather than on a transition, which a remount would never observe.
+	const isStylesEditing = isEditMode && location.name === 'styles';
+	useEffect( () => {
+		if ( ! isStylesEditing ) {
+			resetStylesNavigation();
+		}
+	}, [ isStylesEditing, resetStylesNavigation ] );
+
 	const { createSuccessNotice } = useDispatch( noticesStore );
 	const onActionPerformed = useCallback(
 		( actionId, items ) => {
@@ -182,6 +206,7 @@ export default function EditSiteEditor( { isHomeRoute = false } ) {
 					postId={ postWithTemplate ? context.postId : postId }
 					templateId={ postWithTemplate ? postId : undefined }
 					settings={ editorSettings }
+					renderingMode={ renderingMode }
 					className="edit-site-editor__editor-interface"
 					customSaveButton={
 						_isPreviewingTheme && <SaveButton size="compact" />

package/src/components/layout/index.jsx

@@ -47,7 +47,8 @@ const CONTENT_COLOR = { background: '#fcfcfc' };
 function Layout() {
 	const { query, name: routeKey, areas, widths } = useLocation();
 	// Force canvas to 'view' on notfound route to show the error message and allow navigation.
-	const canvas = routeKey === 'notfound' ? 'view' : query?.canvas ?? 'view';
+	const canvas =
+		routeKey === 'notfound' ? 'view' : ( query?.canvas ?? 'view' );
 	const showMobileSiteHub = !! areas.mobileContent;
 	const hasMobileAreas =
 		areas.mobileSidebar || areas.mobileContent || areas.preview;
@@ -80,7 +81,7 @@ function Layout() {
 		if ( previousCanvaMode === 'edit' ) {
 			const desktopToggle = sidebarRegionRef.current
 				? // We're typically expecting the `<DashboardBackButton />` component as the first tabbable element.
-				  focus.tabbable.find( sidebarRegionRef.current )[ 0 ]
+					focus.tabbable.find( sidebarRegionRef.current )[ 0 ]
 				: undefined;
 			( desktopToggle ?? mobileToggleRef.current )?.focus();
 		}

package/src/components/more-menu/welcome-guide-menu-item.jsx

@@ -12,6 +12,7 @@ export default function WelcomeGuideMenuItem() {
 	return (
 		<MoreMenuItem
 			onClick={ () => toggle( 'core/edit-site', 'welcomeGuide' ) }
+			aria-haspopup="dialog"
 		>
 			{ __( 'Welcome Guide' ) }
 		</MoreMenuItem>

package/src/components/page-patterns/delete-category-menu-item.jsx

@@ -61,7 +61,7 @@ export default function DeleteCategoryMenuItem( { category, onClose } ) {
 					? error.message
 					: __(
 							'An error occurred while deleting the pattern category.'
-					  );
+						);
 
 			createErrorNotice( errorMessage, {
 				type: 'snackbar',

package/src/components/page-templates/index.jsx

@@ -134,7 +134,7 @@ export default function PageTemplates() {
 						? () => {
 								resetToDefault();
 								history.invalidate();
-						  }
+							}
 						: false
 				}
 			/>

package/src/components/post-list/index.jsx

@@ -307,7 +307,7 @@ export default function PostList( { postType } ) {
 						? () => {
 								resetToDefault();
 								history.invalidate();
-						  }
+							}
 						: false
 				}
 			/>

package/src/components/resizable-frame/index.jsx

@@ -250,7 +250,7 @@ function ResizableFrame( {
 								duration: disableMotion ? 0 : 0.5,
 								ease: 'easeOut',
 							},
-					  }
+						}
 					: {}
 			}
 			transition={ FRAME_TRANSITION }

package/src/components/sidebar/index.jsx

@@ -71,7 +71,7 @@ function SidebarContentWrapper( { children, shouldAnimate } ) {
 			? {
 					'slide-from-left': navAnimation === 'back',
 					'slide-from-right': navAnimation === 'forward',
-			  }
+				}
 			: {}
 	);
 

package/src/components/sidebar-navigation-screen/index.jsx

@@ -100,7 +100,7 @@ export default function SidebarNavigationScreen( {
 									__( 'Previewing %1$s: %2$s' ),
 									previewingThemeName,
 									title
-							  ) }
+								) }
 					</Heading>
 					{ actions && (
 						<div className="edit-site-sidebar-navigation-screen__actions">

package/src/components/sidebar-navigation-screen-global-styles/index.jsx

@@ -37,10 +37,10 @@ export default function SidebarNavigationScreenGlobalStyles() {
 	}, [ path, history, openGeneralSidebar, setPreference ] );
 
 	const openRevisions = useCallback( async () => {
-		await openGlobalStyles();
-		// Open the global styles revisions once the canvas mode is set to edit,
-		// and the global styles sidebar is open. Set the path to revisions.
+		// Select revisions before opening the sidebar. The sidebar resets its
+		// navigation as it opens, so a path set afterwards would be discarded.
 		setStylesPath( '/revisions' );
+		await openGlobalStyles();
 	}, [ openGlobalStyles, setStylesPath ] );
 
 	// If there are no revisions, do not render a footer.

package/src/components/site-editor-routes/home.jsx

@@ -22,7 +22,7 @@ export const homeRoute = {
 			const isBlockTheme = siteData.currentTheme?.is_block_theme;
 			return isBlockTheme ||
 				isClassicThemeWithStyleBookSupport( siteData ) ? (
-				<Editor isHomeRoute />
+				<Editor isHomeRoute renderingMode="template-locked" />
 			) : undefined;
 		},
 		mobileSidebar( { siteData } ) {