@wordpress/edit-site 6.12.1-next.082ed6819.0 → 6.13.1-next.cd6172eb0.0

package/build-style/style.css

@@ -1233,6 +1233,57 @@ ul.dataviews-view-list {
   align-items: center;
 }
 
+.fields-create-template-part-modal {
+  z-index: 1000001;
+}
+
+.fields-create-template-part-modal__area-radio-group {
+  width: 100%;
+  border: 1px solid #757575;
+  border-radius: 2px;
+}
+.fields-create-template-part-modal__area-radio-group .components-button.fields-create-template-part-modal__area-radio {
+  display: block;
+  width: 100%;
+  height: 100%;
+  text-align: left;
+  padding: 12px;
+}
+.fields-create-template-part-modal__area-radio-group .components-button.fields-create-template-part-modal__area-radio, .fields-create-template-part-modal__area-radio-group .components-button.fields-create-template-part-modal__area-radio.is-secondary:hover, .fields-create-template-part-modal__area-radio-group .components-button.fields-create-template-part-modal__area-radio.is-primary:hover {
+  margin: 0;
+  background-color: inherit;
+  border-bottom: 1px solid #757575;
+  border-radius: 0;
+}
+.fields-create-template-part-modal__area-radio-group .components-button.fields-create-template-part-modal__area-radio:not(:focus), .fields-create-template-part-modal__area-radio-group .components-button.fields-create-template-part-modal__area-radio.is-secondary:hover:not(:focus), .fields-create-template-part-modal__area-radio-group .components-button.fields-create-template-part-modal__area-radio.is-primary:hover:not(:focus) {
+  box-shadow: none;
+}
+.fields-create-template-part-modal__area-radio-group .components-button.fields-create-template-part-modal__area-radio:focus, .fields-create-template-part-modal__area-radio-group .components-button.fields-create-template-part-modal__area-radio.is-secondary:hover:focus, .fields-create-template-part-modal__area-radio-group .components-button.fields-create-template-part-modal__area-radio.is-primary:hover:focus {
+  border-bottom: 1px solid #fff;
+}
+.fields-create-template-part-modal__area-radio-group .components-button.fields-create-template-part-modal__area-radio:last-of-type, .fields-create-template-part-modal__area-radio-group .components-button.fields-create-template-part-modal__area-radio.is-secondary:hover:last-of-type, .fields-create-template-part-modal__area-radio-group .components-button.fields-create-template-part-modal__area-radio.is-primary:hover:last-of-type {
+  border-bottom: none;
+}
+.fields-create-template-part-modal__area-radio-group .components-button.fields-create-template-part-modal__area-radio:not(:hover), .fields-create-template-part-modal__area-radio-group .components-button.fields-create-template-part-modal__area-radio[aria-checked=true] {
+  color: #1e1e1e;
+  cursor: auto;
+}
+.fields-create-template-part-modal__area-radio-group .components-button.fields-create-template-part-modal__area-radio:not(:hover) .fields-create-template-part-modal__option-label div, .fields-create-template-part-modal__area-radio-group .components-button.fields-create-template-part-modal__area-radio[aria-checked=true] .fields-create-template-part-modal__option-label div {
+  color: #949494;
+}
+.fields-create-template-part-modal__area-radio-group .components-button.fields-create-template-part-modal__area-radio .fields-create-template-part-modal__option-label {
+  padding-top: 4px;
+  white-space: normal;
+}
+.fields-create-template-part-modal__area-radio-group .components-button.fields-create-template-part-modal__area-radio .fields-create-template-part-modal__option-label div {
+  padding-top: 4px;
+  font-size: 12px;
+}
+.fields-create-template-part-modal__area-radio-group .components-button.fields-create-template-part-modal__area-radio .fields-create-template-part-modal__checkbox {
+  margin-left: auto;
+  min-width: 24px;
+}
+
 .fields-controls__slug .fields-controls__slug-external-icon {
   margin-left: 5ch;
 }
@@ -1327,6 +1378,29 @@ fieldset.fields-controls__featured-image .fields-controls__featured-image-remove
   display: block;
 }
 
+.fields-controls__template-modal {
+  z-index: 1000001;
+}
+
+.fields-controls__template-content .block-editor-block-patterns-list {
+  column-count: 2;
+  column-gap: 24px;
+  padding-top: 2px;
+}
+@media (min-width: 782px) {
+  .fields-controls__template-content .block-editor-block-patterns-list {
+    column-count: 3;
+  }
+}
+@media (min-width: 1280px) {
+  .fields-controls__template-content .block-editor-block-patterns-list {
+    column-count: 4;
+  }
+}
+.fields-controls__template-content .block-editor-block-patterns-list .block-editor-block-patterns-list__list-item {
+  break-inside: avoid-column;
+}
+
 .edit-site-custom-template-modal__contents-wrapper {
   height: 100%;
   justify-content: flex-start !important;
@@ -1728,8 +1802,12 @@ fieldset.fields-controls__featured-image .fields-controls__featured-image-remove
 }
 
 .edit-site-global-styles-screen-root__active-style-tile.edit-site-global-styles-screen-root__active-style-tile, .edit-site-global-styles-screen-root__active-style-tile.edit-site-global-styles-screen-root__active-style-tile .edit-site-global-styles-screen-root__active-style-tile-preview {
+  box-shadow: none;
   border-radius: 2px;
 }
+.edit-site-global-styles-screen-root__active-style-tile.edit-site-global-styles-screen-root__active-style-tile .block-editor-iframe__container, .edit-site-global-styles-screen-root__active-style-tile.edit-site-global-styles-screen-root__active-style-tile .edit-site-global-styles-screen-root__active-style-tile-preview .block-editor-iframe__container {
+  border: 1px solid #e0e0e0;
+}
 
 .edit-site-global-styles-screen-revisions__revisions-list {
   list-style: none;
@@ -2687,7 +2765,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
   contain: content;
 }
 
-@keyframes _4uxd5_slide-from-right {
+@keyframes _1eqch_slide-from-right {
   from {
     transform: translateX(50px);
     opacity: 0;
@@ -2697,7 +2775,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
     opacity: 1;
   }
 }
-@keyframes _4uxd5_slide-from-left {
+@keyframes _1eqch_slide-from-left {
   from {
     transform: translateX(-50px);
     opacity: 0;
@@ -2753,10 +2831,10 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
   }
 }
 .edit-site-sidebar__screen-wrapper.slide-from-left {
-  animation-name: _4uxd5_slide-from-left;
+  animation-name: _1eqch_slide-from-left;
 }
 .edit-site-sidebar__screen-wrapper.slide-from-right {
-  animation-name: _4uxd5_slide-from-right;
+  animation-name: _1eqch_slide-from-right;
 }
 
 .edit-site-sidebar-button {
@@ -2783,13 +2861,12 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
 }
 .edit-site-sidebar-navigation-item.components-item:hover, .edit-site-sidebar-navigation-item.components-item:focus, .edit-site-sidebar-navigation-item.components-item[aria-current=true] {
   color: #e0e0e0;
-  background: #2f2f2f;
 }
 .edit-site-sidebar-navigation-item.components-item:hover .edit-site-sidebar-navigation-item__drilldown-indicator, .edit-site-sidebar-navigation-item.components-item:focus .edit-site-sidebar-navigation-item__drilldown-indicator, .edit-site-sidebar-navigation-item.components-item[aria-current=true] .edit-site-sidebar-navigation-item__drilldown-indicator {
   fill: #e0e0e0;
 }
 .edit-site-sidebar-navigation-item.components-item[aria-current=true] {
-  background: var(--wp-admin-theme-color);
+  background: #2f2f2f;
   color: #fff;
 }
 .edit-site-sidebar-navigation-item.components-item .edit-site-sidebar-navigation-item__drilldown-indicator {
@@ -2822,7 +2899,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
 .edit-site-sidebar-navigation-screen__content {
   padding: 0 16px;
 }
-.edit-site-sidebar-navigation-screen__content .edit-site-sidebar-navigation-screen-details-footer {
+.edit-site-sidebar-navigation-screen__content .components-item-group {
   margin-left: -16px;
   margin-right: -16px;
 }
@@ -2911,7 +2988,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
   margin: 16px 0 0;
   border-top: 1px solid #2f2f2f;
 }
-.edit-site-sidebar-navigation-screen__footer .components-item-group {
+.edit-site-sidebar-navigation-screen__footer .edit-site-sidebar-navigation-screen-details-footer {
   margin-left: -16px;
   margin-right: -16px;
 }
@@ -2999,10 +3076,10 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
 }
 .edit-site-sidebar-dataviews-dataview-item:hover, .edit-site-sidebar-dataviews-dataview-item:focus, .edit-site-sidebar-dataviews-dataview-item[aria-current] {
   color: #e0e0e0;
-  background: #2f2f2f;
 }
 .edit-site-sidebar-dataviews-dataview-item.is-selected {
-  background: var(--wp-admin-theme-color);
+  background: #2f2f2f;
+  font-weight: 500;
   color: #fff;
 }
 
@@ -3442,9 +3519,14 @@ body:has(.edit-site-resizable-frame__inner.is-resizing) {
 
 .font-library-modal__page-selection {
   font-size: 11px;
-  text-transform: uppercase;
   font-weight: 500;
-  color: #1e1e1e;
+  text-transform: uppercase;
+}
+@media (min-width: 600px) {
+  .font-library-modal__page-selection .components-select-control__input {
+    font-size: 11px !important;
+    font-weight: 500;
+  }
 }
 
 .font-library-modal__tabpanel-layout .components-base-control__field {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "6.12.1-next.082ed6819.0",
+	"version": "6.13.1-next.cd6172eb0.0",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -30,45 +30,45 @@
 	"dependencies": {
 		"@babel/runtime": "7.25.7",
 		"@react-spring/web": "^9.4.5",
-		"@wordpress/a11y": "^4.12.1-next.082ed6819.0",
-		"@wordpress/api-fetch": "^7.12.1-next.082ed6819.0",
-		"@wordpress/blob": "^4.12.1-next.082ed6819.0",
-		"@wordpress/block-editor": "^14.7.1-next.082ed6819.0",
-		"@wordpress/block-library": "^9.12.1-next.082ed6819.0",
-		"@wordpress/blocks": "^14.1.1-next.082ed6819.0",
-		"@wordpress/commands": "^1.12.1-next.082ed6819.0",
+		"@wordpress/a11y": "^4.13.1-next.cd6172eb0.0",
+		"@wordpress/api-fetch": "^7.13.1-next.cd6172eb0.0",
+		"@wordpress/blob": "^4.13.1-next.cd6172eb0.0",
+		"@wordpress/block-editor": "^14.8.1-next.cd6172eb0.0",
+		"@wordpress/block-library": "^9.13.1-next.cd6172eb0.0",
+		"@wordpress/blocks": "^14.2.1-next.cd6172eb0.0",
+		"@wordpress/commands": "^1.13.1-next.cd6172eb0.0",
 		"@wordpress/components": "*",
-		"@wordpress/compose": "^7.12.1-next.082ed6819.0",
-		"@wordpress/core-commands": "^1.12.1-next.082ed6819.0",
-		"@wordpress/core-data": "^7.12.1-next.082ed6819.0",
-		"@wordpress/data": "*",
-		"@wordpress/dataviews": "*",
-		"@wordpress/date": "^5.12.1-next.082ed6819.0",
-		"@wordpress/deprecated": "^4.12.1-next.082ed6819.0",
-		"@wordpress/dom": "^4.12.1-next.082ed6819.0",
-		"@wordpress/editor": "^14.12.1-next.082ed6819.0",
-		"@wordpress/element": "^6.12.1-next.082ed6819.0",
-		"@wordpress/escape-html": "^3.12.1-next.082ed6819.0",
-		"@wordpress/fields": "^0.4.1-next.082ed6819.0",
-		"@wordpress/hooks": "^4.12.1-next.082ed6819.0",
-		"@wordpress/html-entities": "^4.12.1-next.082ed6819.0",
-		"@wordpress/i18n": "^5.12.1-next.082ed6819.0",
-		"@wordpress/icons": "^10.12.1-next.082ed6819.0",
-		"@wordpress/keyboard-shortcuts": "^5.12.1-next.082ed6819.0",
-		"@wordpress/keycodes": "^4.12.1-next.082ed6819.0",
-		"@wordpress/notices": "^5.12.1-next.082ed6819.0",
-		"@wordpress/patterns": "^2.12.1-next.082ed6819.0",
-		"@wordpress/plugins": "^7.12.1-next.082ed6819.0",
-		"@wordpress/preferences": "^4.12.1-next.082ed6819.0",
-		"@wordpress/primitives": "^4.12.1-next.082ed6819.0",
-		"@wordpress/private-apis": "^1.12.1-next.082ed6819.0",
-		"@wordpress/reusable-blocks": "^5.12.1-next.082ed6819.0",
-		"@wordpress/router": "^1.12.1-next.082ed6819.0",
-		"@wordpress/style-engine": "^2.12.1-next.082ed6819.0",
-		"@wordpress/url": "^4.12.1-next.082ed6819.0",
-		"@wordpress/viewport": "^6.12.1-next.082ed6819.0",
-		"@wordpress/widgets": "^4.12.1-next.082ed6819.0",
-		"@wordpress/wordcount": "^4.12.1-next.082ed6819.0",
+		"@wordpress/compose": "^7.13.1-next.cd6172eb0.0",
+		"@wordpress/core-commands": "^1.13.1-next.cd6172eb0.0",
+		"@wordpress/core-data": "^7.13.1-next.cd6172eb0.0",
+		"@wordpress/data": "^10.13.1-next.cd6172eb0.0",
+		"@wordpress/dataviews": "^4.9.1-next.cd6172eb0.0",
+		"@wordpress/date": "^5.13.1-next.cd6172eb0.0",
+		"@wordpress/deprecated": "^4.13.1-next.cd6172eb0.0",
+		"@wordpress/dom": "^4.13.1-next.cd6172eb0.0",
+		"@wordpress/editor": "^14.13.1-next.cd6172eb0.0",
+		"@wordpress/element": "^6.13.1-next.cd6172eb0.0",
+		"@wordpress/escape-html": "^3.13.1-next.cd6172eb0.0",
+		"@wordpress/fields": "^0.5.1-next.cd6172eb0.0",
+		"@wordpress/hooks": "^4.13.1-next.cd6172eb0.0",
+		"@wordpress/html-entities": "^4.13.1-next.cd6172eb0.0",
+		"@wordpress/i18n": "^5.13.1-next.cd6172eb0.0",
+		"@wordpress/icons": "^10.13.1-next.cd6172eb0.0",
+		"@wordpress/keyboard-shortcuts": "^5.13.1-next.cd6172eb0.0",
+		"@wordpress/keycodes": "^4.13.1-next.cd6172eb0.0",
+		"@wordpress/notices": "^5.13.1-next.cd6172eb0.0",
+		"@wordpress/patterns": "^2.13.1-next.cd6172eb0.0",
+		"@wordpress/plugins": "^7.13.1-next.cd6172eb0.0",
+		"@wordpress/preferences": "^4.13.1-next.cd6172eb0.0",
+		"@wordpress/primitives": "^4.13.1-next.cd6172eb0.0",
+		"@wordpress/private-apis": "^1.13.1-next.cd6172eb0.0",
+		"@wordpress/reusable-blocks": "^5.13.1-next.cd6172eb0.0",
+		"@wordpress/router": "^1.13.1-next.cd6172eb0.0",
+		"@wordpress/style-engine": "^2.13.1-next.cd6172eb0.0",
+		"@wordpress/url": "^4.13.1-next.cd6172eb0.0",
+		"@wordpress/viewport": "^6.13.1-next.cd6172eb0.0",
+		"@wordpress/widgets": "^4.13.1-next.cd6172eb0.0",
+		"@wordpress/wordcount": "^4.13.1-next.cd6172eb0.0",
 		"change-case": "^4.1.2",
 		"clsx": "^2.1.1",
 		"colord": "^2.9.2",
@@ -83,5 +83,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "2bb7bad15ddb8e88210fab7d4a1ef1565466e424"
+	"gitHead": "4cc93dc1781d8a7bc2bbde265913917920e2bd45"
 }

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

@@ -69,23 +69,16 @@ export default function AddNewPattern() {
 
 	function handleCreatePattern( { pattern } ) {
 		setShowPatternModal( false );
-
-		history.push( {
-			postId: pattern.id,
-			postType: PATTERN_TYPES.user,
-			canvas: 'edit',
-		} );
+		history.navigate(
+			`/${ PATTERN_TYPES.user }/${ pattern.id }?canvas=edit`
+		);
 	}
 
 	function handleCreateTemplatePart( templatePart ) {
 		setShowTemplatePartModal( false );
-
-		// Navigate to the created template part editor.
-		history.push( {
-			postId: templatePart.id,
-			postType: TEMPLATE_PART_POST_TYPE,
-			canvas: 'edit',
-		} );
+		history.navigate(
+			`/${ TEMPLATE_PART_POST_TYPE }/${ templatePart.id }?canvas=edit`
+		);
 	}
 
 	function handleError() {
@@ -203,10 +196,9 @@ export default function AddNewPattern() {
 							! currentCategoryId &&
 							categoryId !== 'my-patterns'
 						) {
-							history.push( {
-								postType: PATTERN_TYPES.user,
-								categoryId: PATTERN_DEFAULT_CATEGORY,
-							} );
+							history.navigate(
+								`/pattern?categoryId=${ PATTERN_DEFAULT_CATEGORY }`
+							);
 						}
 
 						createSuccessNotice(

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

@@ -203,11 +203,9 @@ function NewTemplateModal( { onClose } ) {
 			);
 
 			// Navigate to the created template editor.
-			history.push( {
-				postId: newTemplate.id,
-				postType: TEMPLATE_POST_TYPE,
-				canvas: 'edit',
-			} );
+			history.navigate(
+				`/${ TEMPLATE_POST_TYPE }/${ newTemplate.id }?canvas=edit`
+			);
 
 			createSuccessNotice(
 				sprintf(

package/src/components/app/index.js

@@ -1,63 +1,62 @@
 /**
  * WordPress dependencies
  */
-import { SlotFillProvider } from '@wordpress/components';
-import {
-	UnsavedChangesWarning,
-	privateApis as editorPrivateApis,
-} from '@wordpress/editor';
-import { store as noticesStore } from '@wordpress/notices';
-import { useDispatch } from '@wordpress/data';
-import { __, sprintf } from '@wordpress/i18n';
-import { PluginArea } from '@wordpress/plugins';
+import { useSelect } from '@wordpress/data';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
+import { useCallback } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 import Layout from '../layout';
 import { unlock } from '../../lock-unlock';
+import { store as editSiteStore } from '../../store';
 import { useCommonCommands } from '../../hooks/commands/use-common-commands';
-import useActiveRoute from '../layout/router';
 import useSetCommandContext from '../../hooks/commands/use-set-command-context';
 import { useRegisterSiteEditorRoutes } from '../site-editor-routes';
+import {
+	currentlyPreviewingTheme,
+	isPreviewingTheme,
+} from '../../utils/is-previewing-theme';
 
 const { RouterProvider } = unlock( routerPrivateApis );
-const { GlobalStylesProvider } = unlock( editorPrivateApis );
 
 function AppLayout() {
 	useCommonCommands();
 	useSetCommandContext();
-	useRegisterSiteEditorRoutes();
-	const route = useActiveRoute();
 
-	return <Layout route={ route } />;
+	return <Layout />;
 }
 
 export default function App() {
-	const { createErrorNotice } = useDispatch( noticesStore );
+	useRegisterSiteEditorRoutes();
+	const routes = useSelect( ( select ) => {
+		return unlock( select( editSiteStore ) ).getRoutes();
+	}, [] );
+	const beforeNavigate = useCallback( ( { path, query } ) => {
+		if ( ! isPreviewingTheme() ) {
+			return { path, query };
+		}
 
-	function onPluginAreaError( name ) {
-		createErrorNotice(
-			sprintf(
-				/* translators: %s: plugin name */
-				__(
-					'The "%s" plugin has encountered an error and cannot be rendered.'
-				),
-				name
-			)
-		);
-	}
+		return {
+			path,
+			query: {
+				...query,
+				wp_theme_preview:
+					'wp_theme_preview' in query
+						? query.wp_theme_preview
+						: currentlyPreviewingTheme(),
+			},
+		};
+	}, [] );
 
 	return (
-		<SlotFillProvider>
-			<GlobalStylesProvider>
-				<UnsavedChangesWarning />
-				<RouterProvider>
-					<AppLayout />
-					<PluginArea onError={ onPluginAreaError } />
-				</RouterProvider>
-			</GlobalStylesProvider>
-		</SlotFillProvider>
+		<RouterProvider
+			routes={ routes }
+			pathArg="p"
+			beforeNavigate={ beforeNavigate }
+		>
+			<AppLayout />
+		</RouterProvider>
 	);
 }

package/src/components/block-editor/use-editor-iframe-props.js

@@ -12,6 +12,7 @@ import { useState, useEffect } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { store as editorStore } from '@wordpress/editor';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
+import { addQueryArgs } from '@wordpress/url';
 
 /**
  * Internal dependencies
@@ -21,9 +22,9 @@ import { unlock } from '../../lock-unlock';
 const { useLocation, useHistory } = unlock( routerPrivateApis );
 
 export default function useEditorIframeProps() {
-	const { params } = useLocation();
+	const { query, path } = useLocation();
 	const history = useHistory();
-	const { canvas = 'view' } = params;
+	const { canvas = 'view' } = query;
 	const currentPostIsTrashed = useSelect( ( select ) => {
 		return (
 			select( editorStore ).getCurrentPostAttribute( 'status' ) ===
@@ -55,13 +56,13 @@ export default function useEditorIframeProps() {
 				! currentPostIsTrashed
 			) {
 				event.preventDefault();
-				history.push( { ...params, canvas: 'edit' }, undefined, {
+				history.navigate( addQueryArgs( path, { canvas: 'edit' } ), {
 					transition: 'canvas-mode-edit-transition',
 				} );
 			}
 		},
 		onClick: () =>
-			history.push( { ...params, canvas: 'edit' }, undefined, {
+			history.navigate( addQueryArgs( path, { canvas: 'edit' } ), {
 				transition: 'canvas-mode-edit-transition',
 			} ),
 		onClickCapture: ( event ) => {

package/src/components/block-editor/use-navigate-to-entity-record.js

@@ -16,7 +16,9 @@ export default function useNavigateToEntityRecord() {
 
 	const onNavigateToEntityRecord = useCallback(
 		( params ) => {
-			history.push( { ...params, focusMode: true, canvas: 'edit' } );
+			history.navigate(
+				`/${ params.postType }/${ params.postId }?canvas=edit&focusMode=true`
+			);
 		},
 		[ history ]
 	);

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

@@ -22,11 +22,11 @@ function useNavigateToPreviousEntityRecord() {
 	const history = useHistory();
 	const goBack = useMemo( () => {
 		const isFocusMode =
-			location.params.focusMode ||
-			( location.params.postId &&
-				FOCUSABLE_ENTITIES.includes( location.params.postType ) );
+			location.query.focusMode ||
+			( location?.params?.postId &&
+				FOCUSABLE_ENTITIES.includes( location?.params?.postType ) );
 		const didComeFromEditorCanvas =
-			previousLocation?.params.canvas === 'edit';
+			previousLocation?.query.canvas === 'edit';
 		const showBackButton = isFocusMode && didComeFromEditorCanvas;
 		return showBackButton ? () => history.back() : undefined;
 		// `previousLocation` changes when the component updates for any reason, not
@@ -37,8 +37,8 @@ function useNavigateToPreviousEntityRecord() {
 }
 
 export function useSpecificEditorSettings() {
-	const { params } = useLocation();
-	const { canvas = 'view' } = params;
+	const { query } = useLocation();
+	const { canvas = 'view' } = query;
 	const onNavigateToEntityRecord = useNavigateToEntityRecord();
 	const { settings } = useSelect( ( select ) => {
 		const { getSettings } = select( editSiteStore );

package/src/components/dataviews-actions/index.js

@@ -31,11 +31,7 @@ export const useEditPostAction = () => {
 			},
 			callback( items ) {
 				const post = items[ 0 ];
-				history.push( {
-					postId: post.id,
-					postType: post.type,
-					canvas: 'edit',
-				} );
+				history.navigate( `/${ post.type }/${ post.id }?canvas=edit` );
 			},
 		} ),
 		[ history ]