@wordpress/edit-site 6.33.3-next.36001005c.0 → 6.33.4

package/build-style/style.css

@@ -403,7 +403,7 @@
 }
 .dataviews-title-field {
   font-size: 13px;
-  font-weight: 499;
+  font-weight: 500;
   color: #2f2f2f;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -500,7 +500,7 @@
 
 .dataviews-bulk-actions-footer__item-count {
   color: #1e1e1e;
-  font-weight: 499;
+  font-weight: 500;
   font-size: 11px;
   text-transform: uppercase;
 }
@@ -616,7 +616,7 @@
 }
 
 .dataviews-filters__summary-chip-container .dataviews-filters__summary-chip .dataviews-filters-__summary-filter-text-name {
-  font-weight: 499;
+  font-weight: 500;
 }
 
 .dataviews-filters__summary-chip-container .dataviews-filters__summary-chip-remove {
@@ -1135,14 +1135,14 @@
 }
 .dataviews-pagination__page-select {
   font-size: 11px;
-  font-weight: 499;
+  font-weight: 500;
   text-transform: uppercase;
 }
 
 @media (min-width: 600px) {
   .dataviews-pagination__page-select .components-select-control__input {
     font-size: 11px !important;
-    font-weight: 499;
+    font-weight: 500;
   }
 }
 .dataviews-action-modal {
@@ -1474,7 +1474,7 @@
 
 .dataviews-view-grid__group-header {
   font-size: 15px;
-  font-weight: 499;
+  font-weight: 500;
   color: #1e1e1e;
   margin: 0 0 8px 0;
   padding: 0 48px;
@@ -1703,7 +1703,7 @@ div.dataviews-view-list {
 
 .dataviews-view-list__group-header {
   font-size: 15px;
-  font-weight: 499;
+  font-weight: 500;
   color: #1e1e1e;
   margin: 0 0 8px 0;
   padding: 0 24px;
@@ -1865,7 +1865,7 @@ div.dataviews-view-list {
   padding-left: 12px;
   font-size: 11px;
   text-transform: uppercase;
-  font-weight: 499;
+  font-weight: 500;
 }
 
 .dataviews-view-table thead th:has(.dataviews-view-table-header-button):not(:first-child) {
@@ -1898,7 +1898,7 @@ div.dataviews-view-list {
   padding: 4px 8px;
   font-size: 11px;
   text-transform: uppercase;
-  font-weight: 499;
+  font-weight: 500;
 }
 
 .dataviews-view-table .dataviews-view-table-header-button:not(:hover) {
@@ -1998,7 +1998,7 @@ div.dataviews-view-list {
 }
 
 .dataviews-view-table__group-header-row .dataviews-view-table__group-header-cell {
-  font-weight: 499;
+  font-weight: 500;
   padding: 12px 48px;
   color: #1e1e1e;
 }
@@ -2156,7 +2156,7 @@ div.dataviews-view-list {
 
 .dataviews-view-picker-grid-group__header {
   font-size: 15px;
-  font-weight: 499;
+  font-weight: 500;
   color: #1e1e1e;
   margin: 0 0 8px 0;
   padding: 0 48px;
@@ -2278,7 +2278,7 @@ div.dataviews-view-list {
 
 .dataforms-layouts-card__field-header-label {
   font-family: -apple-system, "system-ui", "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-  font-weight: 499;
+  font-weight: 500;
   font-size: 15px;
   line-height: 20px;
 }
@@ -2956,7 +2956,7 @@ fieldset.fields-controls__featured-image .fields-controls__featured-image-remove
 .edit-site-global-styles-subtitle {
   margin-bottom: 0 !important;
   text-transform: uppercase;
-  font-weight: 499 !important;
+  font-weight: 500 !important;
   font-size: 11px !important;
 }
 
@@ -3302,11 +3302,11 @@ fieldset.fields-controls__featured-image .fields-controls__featured-image-remove
 
 .edit-site-global-styles-sidebar .components-navigation__menu-title-heading {
   font-size: 15.6px;
-  font-weight: 499;
+  font-weight: 500;
 }
 
 .edit-site-global-styles-sidebar .components-navigation__item > button span {
-  font-weight: 499;
+  font-weight: 500;
 }
 
 .edit-site-global-styles-sidebar .block-editor-panel-color-gradient-settings {
@@ -4038,7 +4038,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
 .edit-site-sidebar-navigation-item.components-item[aria-current=true] {
   background: #2f2f2f;
   color: #fff;
-  font-weight: 499;
+  font-weight: 500;
 }
 .edit-site-sidebar-navigation-item.components-item:focus-visible {
   transform: translateZ(0);
@@ -4113,7 +4113,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
   color: #ddd;
   font-size: 11px;
   text-transform: uppercase;
-  font-weight: 499;
+  font-weight: 500;
 }
 
 .edit-site-sidebar-navigation-screen__content .edit-site-global-styles-variations_item .edit-site-global-styles-variations_item-preview {
@@ -4201,7 +4201,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
 }
 .edit-site-sidebar-navigation-screen-patterns__group-header h2 {
   font-size: 11px;
-  font-weight: 499;
+  font-weight: 500;
   text-transform: uppercase;
 }
 
@@ -4274,7 +4274,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
 }
 .edit-site-sidebar-dataviews-dataview-item.is-selected {
   background: #2f2f2f;
-  font-weight: 499;
+  font-weight: 500;
   color: #fff;
 }
 
@@ -4305,7 +4305,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
   display: block;
   flex-grow: 1;
   font-size: 15px;
-  font-weight: 499;
+  font-weight: 500;
   overflow: hidden;
   padding-right: 16px;
   margin-left: -4px;
@@ -4608,7 +4608,7 @@ body:has(.edit-site-resizable-frame__inner.is-resizing) {
 }
 .font-library-modal .font-library-modal__subtitle {
   text-transform: uppercase;
-  font-weight: 499;
+  font-weight: 500;
   font-size: 11px;
 }
 .font-library-modal .components-navigator-screen {
@@ -4643,13 +4643,13 @@ body:has(.edit-site-resizable-frame__inner.is-resizing) {
 
 .font-library-modal__page-selection {
   font-size: 11px;
-  font-weight: 499;
+  font-weight: 500;
   text-transform: uppercase;
 }
 @media (min-width: 600px) {
   .font-library-modal__page-selection .components-select-control__input {
     font-size: 11px !important;
-    font-weight: 499;
+    font-weight: 500;
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "6.33.3-next.36001005c.0",
+	"version": "6.33.4",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -37,49 +37,48 @@
 	"wpScript": true,
 	"dependencies": {
 		"@react-spring/web": "^9.4.5",
-		"@wordpress/a11y": "^4.33.1-next.36001005c.0",
-		"@wordpress/admin-ui": "^1.1.1-next.36001005c.0",
-		"@wordpress/api-fetch": "^7.33.1-next.36001005c.0",
-		"@wordpress/base-styles": "^6.10.1-next.36001005c.0",
-		"@wordpress/blob": "^4.33.1-next.36001005c.0",
-		"@wordpress/block-editor": "^15.6.1-next.36001005c.0",
-		"@wordpress/block-library": "^9.33.2-next.36001005c.0",
-		"@wordpress/blocks": "^15.6.1-next.36001005c.0",
-		"@wordpress/commands": "^1.33.1-next.36001005c.0",
-		"@wordpress/components": "^30.7.1-next.36001005c.0",
-		"@wordpress/compose": "^7.33.1-next.36001005c.0",
-		"@wordpress/core-data": "^7.33.1-next.36001005c.0",
-		"@wordpress/data": "^10.33.1-next.36001005c.0",
-		"@wordpress/dataviews": "^10.1.1-next.36001005c.0",
-		"@wordpress/date": "^5.33.1-next.36001005c.0",
-		"@wordpress/deprecated": "^4.33.1-next.36001005c.0",
-		"@wordpress/dom": "^4.33.1-next.36001005c.0",
-		"@wordpress/editor": "^14.33.3-next.36001005c.0",
-		"@wordpress/element": "^6.33.1-next.36001005c.0",
-		"@wordpress/escape-html": "^3.33.1-next.36001005c.0",
-		"@wordpress/fields": "^0.25.3-next.36001005c.0",
-		"@wordpress/global-styles-engine": "^1.0.1-next.36001005c.0",
-		"@wordpress/hooks": "^4.33.1-next.36001005c.0",
-		"@wordpress/html-entities": "^4.33.1-next.36001005c.0",
-		"@wordpress/i18n": "^6.6.1-next.36001005c.0",
-		"@wordpress/icons": "^11.0.1-next.36001005c.0",
-		"@wordpress/keyboard-shortcuts": "^5.33.1-next.36001005c.0",
-		"@wordpress/keycodes": "^4.33.1-next.36001005c.0",
-		"@wordpress/media-utils": "^5.33.1-next.36001005c.0",
-		"@wordpress/notices": "^5.33.1-next.36001005c.0",
-		"@wordpress/patterns": "^2.33.1-next.36001005c.0",
-		"@wordpress/plugins": "^7.33.1-next.36001005c.0",
-		"@wordpress/preferences": "^4.33.1-next.36001005c.0",
-		"@wordpress/primitives": "^4.33.1-next.36001005c.0",
-		"@wordpress/private-apis": "^1.33.1-next.36001005c.0",
-		"@wordpress/reusable-blocks": "^5.33.1-next.36001005c.0",
-		"@wordpress/router": "^1.33.1-next.36001005c.0",
-		"@wordpress/style-engine": "^2.33.1-next.36001005c.0",
-		"@wordpress/url": "^4.33.1-next.36001005c.0",
-		"@wordpress/viewport": "^6.33.1-next.36001005c.0",
-		"@wordpress/views": "^1.0.2-next.36001005c.0",
-		"@wordpress/widgets": "^4.33.1-next.36001005c.0",
-		"@wordpress/wordcount": "^4.33.1-next.36001005c.0",
+		"@wordpress/a11y": "^4.33.1",
+		"@wordpress/admin-ui": "^1.1.1",
+		"@wordpress/api-fetch": "^7.33.1",
+		"@wordpress/base-styles": "^6.9.1",
+		"@wordpress/blob": "^4.33.1",
+		"@wordpress/block-editor": "^15.6.2",
+		"@wordpress/block-library": "^9.33.3",
+		"@wordpress/blocks": "^15.6.1",
+		"@wordpress/commands": "^1.33.1",
+		"@wordpress/components": "^30.6.1",
+		"@wordpress/compose": "^7.33.1",
+		"@wordpress/core-data": "^7.33.2",
+		"@wordpress/data": "^10.33.1",
+		"@wordpress/dataviews": "^10.1.2",
+		"@wordpress/date": "^5.33.1",
+		"@wordpress/deprecated": "^4.33.1",
+		"@wordpress/dom": "^4.33.1",
+		"@wordpress/editor": "^14.33.4",
+		"@wordpress/element": "^6.33.1",
+		"@wordpress/escape-html": "^3.33.1",
+		"@wordpress/fields": "^0.25.4",
+		"@wordpress/hooks": "^4.33.1",
+		"@wordpress/html-entities": "^4.33.1",
+		"@wordpress/i18n": "^6.6.1",
+		"@wordpress/icons": "^11.0.1",
+		"@wordpress/keyboard-shortcuts": "^5.33.1",
+		"@wordpress/keycodes": "^4.33.1",
+		"@wordpress/media-utils": "^5.33.1",
+		"@wordpress/notices": "^5.33.1",
+		"@wordpress/patterns": "^2.33.2",
+		"@wordpress/plugins": "^7.33.1",
+		"@wordpress/preferences": "^4.33.1",
+		"@wordpress/primitives": "^4.33.1",
+		"@wordpress/private-apis": "^1.33.1",
+		"@wordpress/reusable-blocks": "^5.33.2",
+		"@wordpress/router": "^1.33.1",
+		"@wordpress/style-engine": "^2.33.1",
+		"@wordpress/url": "^4.33.1",
+		"@wordpress/viewport": "^6.33.1",
+		"@wordpress/views": "^1.0.3",
+		"@wordpress/widgets": "^4.33.2",
+		"@wordpress/wordcount": "^4.33.1",
 		"change-case": "^4.1.2",
 		"clsx": "^2.1.1",
 		"colord": "^2.9.2",
@@ -94,5 +93,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "b73a8a22e779c59efb8f911e32b681652f237d60"
+	"gitHead": "45005cc254bab59182927e35a68cd22f6320634d"
 }

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

@@ -34,11 +34,17 @@ export const useSetActiveTemplateAction = () => {
 			isPrimary: true,
 			icon: pencil,
 			isEligible( item ) {
-				return (
-					! item._isCustom &&
-					! ( item.slug === 'index' && item.source === 'theme' ) &&
-					item.theme === activeTheme.stylesheet
-				);
+				if ( item.theme !== activeTheme.stylesheet ) {
+					return false;
+				}
+
+				// If it's not a created template but a registered template,
+				// only allow activating (so when it's inactive).
+				if ( typeof item.id !== 'number' ) {
+					return item._isActive === false;
+				}
+
+				return true;
 			},
 			async callback( items ) {
 				const deactivate = items.some( ( item ) => item._isActive );
@@ -49,11 +55,7 @@ export const useSetActiveTemplateAction = () => {
 				};
 				for ( const item of items ) {
 					if ( deactivate ) {
-						if ( item.source === 'theme' ) {
-							activeTemplates[ item.slug ] = false;
-						} else {
-							delete activeTemplates[ item.slug ];
-						}
+						delete activeTemplates[ item.slug ];
 					} else {
 						activeTemplates[ item.slug ] = item.id;
 					}

package/src/components/global-styles/font-library-modal/style.scss

@@ -27,7 +27,7 @@ $footer-height: 70px;
 
 	.font-library-modal__subtitle {
 		text-transform: uppercase;
-		font-weight: $font-weight-medium;
+		font-weight: 500;
 		font-size: 11px;
 	}
 
@@ -68,13 +68,13 @@ $footer-height: 70px;
 
 .font-library-modal__page-selection {
 	font-size: 11px;
-	font-weight: $font-weight-medium;
+	font-weight: 500;
 	text-transform: uppercase;
 
 	@include break-small() {
 		.components-select-control__input {
 			font-size: 11px !important;
-			font-weight: $font-weight-medium;
+			font-weight: 500;
 		}
 	}
 }

package/src/components/global-styles/style.scss

@@ -85,7 +85,7 @@
 	// Need to override the too specific styles for complementary areas.
 	margin-bottom: 0 !important;
 	text-transform: uppercase;
-	font-weight: $font-weight-medium !important;
+	font-weight: 500 !important;
 	font-size: 11px !important;
 }
 

package/src/components/global-styles-renderer/index.js

@@ -3,12 +3,15 @@
  */
 import { useEffect } from '@wordpress/element';
 import { useSelect, useDispatch } from '@wordpress/data';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
  */
 import { store as editSiteStore } from '../../store';
-import { useGlobalStylesOutput } from '../../hooks/use-global-styles-output';
+import { unlock } from '../../lock-unlock';
+
+const { useGlobalStylesOutput } = unlock( blockEditorPrivateApis );
 
 function useGlobalStylesRenderer( disableRootPadding ) {
 	const [ styles, settings ] = useGlobalStylesOutput( disableRootPadding );

package/src/components/global-styles-sidebar/style.scss

@@ -21,11 +21,11 @@
 
 .edit-site-global-styles-sidebar .components-navigation__menu-title-heading {
 	font-size: $default-font-size * 1.2;
-	font-weight: $font-weight-medium;
+	font-weight: 500;
 }
 
 .edit-site-global-styles-sidebar .components-navigation__item > button span {
-	font-weight: $font-weight-medium;
+	font-weight: 500;
 }
 
 .edit-site-global-styles-sidebar .block-editor-panel-color-gradient-settings {

package/src/components/page-templates/fields.js

@@ -41,9 +41,8 @@ const { useEntityRecordsWithPermissions } = unlock( corePrivateApis );
 function useAllDefaultTemplateTypes() {
 	const defaultTemplateTypes = useDefaultTemplateTypes();
 	const { records: staticRecords } = useEntityRecordsWithPermissions(
-		'postType',
-		'wp_registered_template',
-		{ per_page: -1 }
+		'root',
+		'registeredTemplate'
 	);
 	return [
 		...defaultTemplateTypes,
@@ -153,25 +152,17 @@ export const authorField = {
 export const activeField = {
 	label: __( 'Status' ),
 	id: 'active',
+	type: 'boolean',
 	getValue: ( { item } ) => item._isActive,
 	render: function Render( { item } ) {
-		if ( item._isCustom ) {
-			return (
-				<Badge
-					intent="info"
-					title={ __(
-						'Custom templates cannot be active nor inactive.'
-					) }
-				>
-					{ __( 'N/A' ) }
-				</Badge>
-			);
-		}
-
+		const activeLabel = item._isCustom
+			? __( 'Active when used' )
+			: __( 'Active' );
+		const activeIntent = item._isCustom ? 'info' : 'success';
 		const isActive = item._isActive;
 		return (
-			<Badge intent={ isActive ? 'success' : 'default' }>
-				{ isActive ? __( 'Active' ) : __( 'Inactive' ) }
+			<Badge intent={ isActive ? activeIntent : 'default' }>
+				{ isActive ? activeLabel : __( 'Inactive' ) }
 			</Badge>
 		);
 	},
@@ -181,17 +172,20 @@ export const useThemeField = () => {
 	const activeTheme = useSelect( ( select ) =>
 		select( coreStore ).getCurrentTheme()
 	);
-	return {
-		label: __( 'Compatible Theme' ),
-		id: 'theme',
-		getValue: ( { item } ) => item.theme,
-		render: function Render( { item } ) {
-			if ( item.theme === activeTheme.stylesheet ) {
-				return <Badge intent="success">{ item.theme }</Badge>;
-			}
-			return <Badge intent="error">{ item.theme }</Badge>;
-		},
-	};
+	return useMemo(
+		() => ( {
+			label: __( 'Compatible Theme' ),
+			id: 'theme',
+			getValue: ( { item } ) => item.theme,
+			render: function Render( { item } ) {
+				if ( item.theme === activeTheme.stylesheet ) {
+					return <Badge intent="success">{ item.theme }</Badge>;
+				}
+				return <Badge intent="error">{ item.theme }</Badge>;
+			},
+		} ),
+		[ activeTheme ]
+	);
 };
 
 export const slugField = {

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

@@ -39,7 +39,8 @@ import {
 } from './fields';
 import { defaultLayouts, getDefaultView } from './view-utils';
 
-const { usePostActions, templateTitleField } = unlock( editorPrivateApis );
+const { usePostActions, usePostFields, templateTitleField } =
+	unlock( editorPrivateApis );
 const { useHistory, useLocation } = unlock( routerPrivateApis );
 const { useEntityRecordsWithPermissions } = unlock( corePrivateApis );
 
@@ -93,41 +94,32 @@ export default function PageTemplates() {
 			combinedTemplates: false,
 		} );
 	const { records: staticRecords, isResolving: isLoadingStaticData } =
-		useEntityRecordsWithPermissions( 'postType', 'wp_registered_template', {
+		useEntityRecordsWithPermissions( 'root', 'registeredTemplate', {
+			// This should not be needed, the endpoint returns all registered
+			// templates, but it's not possible right now to turn off pagination
+			// for entity configs.
 			per_page: -1,
 		} );
 
 	const activeTemplates = useMemo( () => {
-		const _active = [ ...staticRecords ].filter(
-			( record ) => ! record.is_custom
-		);
+		const _active = [ ...staticRecords ];
 		if ( activeTemplatesOption ) {
 			for ( const activeSlug in activeTemplatesOption ) {
 				const activeId = activeTemplatesOption[ activeSlug ];
-				if ( activeId === false ) {
-					// Remove the template from the array.
+				// Replace the template in the array.
+				const template = userRecords.find(
+					( userRecord ) =>
+						userRecord.id === activeId &&
+						userRecord.theme === activeTheme.stylesheet
+				);
+				if ( template ) {
 					const index = _active.findIndex(
-						( template ) => template.slug === activeSlug
+						( { slug } ) => slug === template.slug
 					);
 					if ( index !== -1 ) {
-						_active.splice( index, 1 );
-					}
-				} else {
-					// Replace the template in the array.
-					const template = userRecords.find(
-						( userRecord ) =>
-							userRecord.id === activeId &&
-							userRecord.theme === activeTheme.stylesheet
-					);
-					if ( template ) {
-						const index = _active.findIndex(
-							( { slug } ) => slug === template.slug
-						);
-						if ( index !== -1 ) {
-							_active[ index ] = template;
-						} else {
-							_active.push( template );
-						}
+						_active[ index ] = template;
+					} else {
+						_active.push( template );
 					}
 				}
 			}
@@ -135,33 +127,55 @@ export default function PageTemplates() {
 		return _active;
 	}, [ userRecords, staticRecords, activeTemplatesOption, activeTheme ] );
 
-	let _records;
 	let isLoadingData;
 	if ( activeView === 'active' ) {
-		_records = activeTemplates;
 		isLoadingData = isLoadingUserRecords || isLoadingStaticData;
 	} else if ( activeView === 'user' ) {
-		_records = userRecords;
 		isLoadingData = isLoadingUserRecords;
 	} else {
-		_records = staticRecords;
 		isLoadingData = isLoadingStaticData;
 	}
 
 	const records = useMemo( () => {
+		function isCustom( record ) {
+			// For registered templates, the is_custom field is defined.
+			return (
+				record.is_custom ??
+				// For user templates it's custom if the is_wp_suggestion meta
+				// field is not set and the slug is not found in the default
+				// template types.
+				( ! record.meta?.is_wp_suggestion &&
+					! defaultTemplateTypes.some(
+						( type ) => type.slug === record.slug
+					) )
+			);
+		}
+
+		let _records;
+		if ( activeView === 'active' ) {
+			// Don't show active custom templates in the active view.
+			_records = activeTemplates.filter(
+				( record ) => ! isCustom( record )
+			);
+		} else if ( activeView === 'user' ) {
+			_records = userRecords;
+		} else {
+			_records = staticRecords;
+		}
 		return _records.map( ( record ) => ( {
 			...record,
-			_isActive: activeTemplates.find(
+			_isActive: activeTemplates.some(
 				( template ) => template.id === record.id
 			),
-			_isCustom:
-				record.is_custom ||
-				( ! record.meta?.is_wp_suggestion &&
-					! defaultTemplateTypes.find(
-						( type ) => type.slug === record.slug
-					) ),
+			_isCustom: isCustom( record ),
 		} ) );
-	}, [ _records, activeTemplates, defaultTemplateTypes ] );
+	}, [
+		activeTemplates,
+		defaultTemplateTypes,
+		userRecords,
+		staticRecords,
+		activeView,
+	] );
 
 	const users = useSelect(
 		( select ) => {
@@ -197,6 +211,10 @@ export default function PageTemplates() {
 		[ history, path, view?.type ]
 	);
 
+	const postTypeFields = usePostFields( {
+		postType: TEMPLATE_POST_TYPE,
+	} );
+	const dateField = postTypeFields.find( ( field ) => field.id === 'date' );
 	const themeField = useThemeField();
 	const fields = useMemo( () => {
 		const _fields = [
@@ -208,6 +226,9 @@ export default function PageTemplates() {
 		];
 		if ( activeView === 'user' ) {
 			_fields.push( themeField );
+			if ( dateField ) {
+				_fields.push( dateField );
+			}
 		}
 		const elements = [];
 		for ( const author in users ) {
@@ -221,7 +242,7 @@ export default function PageTemplates() {
 			elements,
 		} );
 		return _fields;
-	}, [ users, activeView, themeField ] );
+	}, [ users, activeView, themeField, dateField ] );
 
 	const { data, paginationInfo } = useMemo( () => {
 		return filterSortAndPaginate( records, view, fields );
@@ -238,6 +259,7 @@ export default function PageTemplates() {
 							typeof newItem.title === 'string'
 								? newItem.title
 								: newItem.title?.rendered;
+						history.navigate( `/template?activeView=user` );
 						createSuccessNotice(
 							sprintf(
 								// translators: %s: Title of the created post or template, e.g: "Hello world".
@@ -325,7 +347,7 @@ export default function PageTemplates() {
 				onChangeSelection={ onChangeSelection }
 				isItemClickable={ () => true }
 				onClickItem={ ( item ) => {
-					if ( item.type === 'wp_registered_template' ) {
+					if ( typeof item.id === 'string' ) {
 						setSelectedRegisteredTemplate( item );
 					} else {
 						history.navigate(
@@ -345,11 +367,6 @@ export default function PageTemplates() {
 					<duplicateAction.RenderModal
 						items={ [ selectedRegisteredTemplate ] }
 						closeModal={ () => setSelectedRegisteredTemplate() }
-						onActionPerformed={ ( [ item ] ) => {
-							history.navigate(
-								`/${ item.type }/${ item.id }?canvas=edit`
-							);
-						} }
 					/>
 				</Modal>
 			) }