@wordpress/edit-site 5.19.0 → 5.19.2

package/src/components/sidebar-edit-mode/page-panels/hooks.js

@@ -9,6 +9,7 @@ import { store as coreStore } from '@wordpress/core-data';
  * Internal dependencies
  */
 import { store as editSiteStore } from '../../../store';
+import { TEMPLATE_POST_TYPE } from '../../../utils/constants';
 
 export function useEditedPostContext() {
 	return useSelect(
@@ -31,10 +32,14 @@ export function useIsPostsPage() {
 function useTemplates() {
 	return useSelect(
 		( select ) =>
-			select( coreStore ).getEntityRecords( 'postType', 'wp_template', {
-				per_page: -1,
-				post_type: 'page',
-			} ),
+			select( coreStore ).getEntityRecords(
+				'postType',
+				TEMPLATE_POST_TYPE,
+				{
+					per_page: -1,
+					post_type: 'page',
+				}
+			),
 		[]
 	);
 }

package/src/components/sidebar-edit-mode/page-panels/style.scss

@@ -79,3 +79,9 @@
 		width: 30%;
 	}
 }
+
+.edit-site-page-panels-edit-template__dropdown {
+	.components-popover__content {
+		min-width: 240px;
+	}
+}

package/src/components/sidebar-edit-mode/settings-header/index.js

@@ -17,12 +17,7 @@ import { store as interfaceStore } from '@wordpress/interface';
 import { STORE_NAME } from '../../../store/constants';
 import { SIDEBAR_BLOCK, SIDEBAR_TEMPLATE } from '../constants';
 import { store as editSiteStore } from '../../../store';
-
-const entityLabels = {
-	wp_navigation: __( 'Navigation' ),
-	wp_block: __( 'Pattern' ),
-	wp_template: __( 'Template' ),
-};
+import { POST_TYPE_LABELS, TEMPLATE_POST_TYPE } from '../../../utils/constants';
 
 const SettingsHeader = ( { sidebarName } ) => {
 	const { hasPageContentFocus, entityType } = useSelect( ( select ) => {
@@ -35,7 +30,9 @@ const SettingsHeader = ( { sidebarName } ) => {
 		};
 	} );
 
-	const entityLabel = entityLabels[ entityType ] || entityLabels.wp_template;
+	const entityLabel =
+		POST_TYPE_LABELS[ entityType ] ||
+		POST_TYPE_LABELS[ TEMPLATE_POST_TYPE ];
 
 	const { enableComplementaryArea } = useDispatch( interfaceStore );
 	const openTemplateSettings = () =>

package/src/components/sidebar-edit-mode/template-panel/pattern-categories.js

@@ -10,6 +10,11 @@ import { useDebounce } from '@wordpress/compose';
 import { store as noticesStore } from '@wordpress/notices';
 import { decodeEntities } from '@wordpress/html-entities';
 
+/**
+ * Internal dependencies
+ */
+import { PATTERN_TYPES } from '../../../utils/constants';
+
 export const unescapeString = ( arg ) => {
 	return decodeEntities( arg );
 };
@@ -145,7 +150,8 @@ export default function PatternCategories( { post } ) {
 		);
 	}, [ searchResults ] );
 
-	const { saveEntityRecord, editEntityRecord } = useDispatch( coreStore );
+	const { saveEntityRecord, editEntityRecord, invalidateResolution } =
+		useDispatch( coreStore );
 	const { createErrorNotice } = useDispatch( noticesStore );
 
 	if ( ! hasAssignAction ) {
@@ -157,6 +163,7 @@ export default function PatternCategories( { post } ) {
 			const newTerm = await saveEntityRecord( 'taxonomy', slug, term, {
 				throwOnError: true,
 			} );
+			invalidateResolution( 'getUserPatternCategories' );
 			return unescapeTerm( newTerm );
 		} catch ( error ) {
 			if ( error.code !== 'term_exists' ) {
@@ -171,7 +178,7 @@ export default function PatternCategories( { post } ) {
 	}
 
 	function onUpdateTerms( newTermIds ) {
-		editEntityRecord( 'postType', 'wp_block', post.id, {
+		editEntityRecord( 'postType', PATTERN_TYPES.user, post.id, {
 			wp_pattern_category: newTermIds,
 		} );
 	}

package/src/components/sidebar-navigation-screen-navigation-menu/edit-button.js

@@ -8,11 +8,12 @@ import { pencil } from '@wordpress/icons';
  */
 import SidebarButton from '../sidebar-button';
 import { useLink } from '../routes/link';
+import { NAVIGATION_POST_TYPE } from '../../utils/constants';
 
 export default function EditButton( { postId } ) {
 	const linkInfo = useLink( {
 		postId,
-		postType: 'wp_navigation',
+		postType: NAVIGATION_POST_TYPE,
 		canvas: 'edit',
 	} );
 	return (

package/src/components/sidebar-navigation-screen-navigation-menu/use-navigation-menu-handlers.js

@@ -6,10 +6,12 @@ import { __experimentalUseNavigator as useNavigator } from '@wordpress/component
 import { __, sprintf } from '@wordpress/i18n';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { store as noticesStore } from '@wordpress/notices';
+
 /**
  * Internal dependencies
  */
 import { postType } from '.';
+import { NAVIGATION_POST_TYPE } from '../../utils/constants';
 
 function useDeleteNavigationMenu() {
 	const { goTo } = useNavigator();
@@ -82,7 +84,7 @@ function useSaveNavigationMenu() {
 		// Prepare for revert in case of error.
 		const originalRecord = getEditedEntityRecord(
 			'postType',
-			'wp_navigation',
+			NAVIGATION_POST_TYPE,
 			postId
 		);
 

package/src/components/sidebar-navigation-screen-navigation-menus/index.js

@@ -22,6 +22,7 @@ import { useLink } from '../routes/link';
 import SingleNavigationMenu from '../sidebar-navigation-screen-navigation-menu/single-navigation-menu';
 import useNavigationMenuHandlers from '../sidebar-navigation-screen-navigation-menu/use-navigation-menu-handlers';
 import { unlock } from '../../lock-unlock';
+import { NAVIGATION_POST_TYPE } from '../../utils/constants';
 
 // Copied from packages/block-library/src/navigation/edit/navigation-menu-selector.js.
 function buildMenuLabel( title, id, status ) {
@@ -52,7 +53,7 @@ export default function SidebarNavigationScreenNavigationMenus() {
 		hasResolved: hasResolvedNavigationMenus,
 	} = useEntityRecords(
 		'postType',
-		`wp_navigation`,
+		NAVIGATION_POST_TYPE,
 		PRELOADED_NAVIGATION_MENUS_QUERY
 	);
 
@@ -151,7 +152,7 @@ export function SidebarNavigationScreenWrapper( {
 const NavMenuItem = ( { postId, ...props } ) => {
 	const linkInfo = useLink( {
 		postId,
-		postType: 'wp_navigation',
+		postType: NAVIGATION_POST_TYPE,
 	} );
 	return <SidebarNavigationItem { ...linkInfo } { ...props } />;
 };

package/src/components/sidebar-navigation-screen-page/page-details.js

@@ -21,6 +21,7 @@ import {
 	SidebarNavigationScreenDetailsPanelLabel,
 	SidebarNavigationScreenDetailsPanelValue,
 } from '../sidebar-navigation-screen-details-panel';
+import { TEMPLATE_POST_TYPE } from '../../utils/constants';
 
 // Taken from packages/editor/src/components/time-to-read/index.js.
 const AVERAGE_READING_RATE = 189;
@@ -106,7 +107,7 @@ export default function PageDetails( { id } ) {
 			const postContext = getEditedPostContext();
 			const templates = select( coreStore ).getEntityRecords(
 				'postType',
-				'wp_template',
+				TEMPLATE_POST_TYPE,
 				{ per_page: -1 }
 			);
 			// Template title.

package/src/components/sidebar-navigation-screen-pages/index.js

@@ -24,6 +24,7 @@ import SidebarNavigationItem from '../sidebar-navigation-item';
 import SidebarButton from '../sidebar-button';
 import AddNewPageModal from '../add-new-page';
 import { unlock } from '../../lock-unlock';
+import { TEMPLATE_POST_TYPE } from '../../utils/constants';
 
 const { useHistory } = unlock( routerPrivateApis );
 
@@ -50,7 +51,7 @@ export default function SidebarNavigationScreenPages() {
 		}
 	);
 	const { records: templates, isResolving: isLoadingTemplates } =
-		useEntityRecords( 'postType', 'wp_template', {
+		useEntityRecords( 'postType', TEMPLATE_POST_TYPE, {
 			per_page: -1,
 		} );
 
@@ -130,7 +131,7 @@ export default function SidebarNavigationScreenPages() {
 
 		return {
 			icon: itemIcon,
-			postType: postsPageTemplateId ? 'wp_template' : 'page',
+			postType: postsPageTemplateId ? TEMPLATE_POST_TYPE : 'page',
 			postId: postsPageTemplateId || id,
 		};
 	};
@@ -167,7 +168,7 @@ export default function SidebarNavigationScreenPages() {
 								) }
 								{ isHomePageBlog && homeTemplate && (
 									<PageItem
-										postType="wp_template"
+										postType={ TEMPLATE_POST_TYPE }
 										postId={ homeTemplate.id }
 										key={ homeTemplate.id }
 										icon={ home }
@@ -203,7 +204,7 @@ export default function SidebarNavigationScreenPages() {
 					<VStack spacing={ 0 }>
 						{ dynamicPageTemplates?.map( ( item ) => (
 							<PageItem
-								postType="wp_template"
+								postType={ TEMPLATE_POST_TYPE }
 								postId={ item.id }
 								key={ item.id }
 								icon={ layout }

package/src/components/sidebar-navigation-screen-pattern/index.js

@@ -17,6 +17,7 @@ import usePatternDetails from './use-pattern-details';
 import { store as editSiteStore } from '../../store';
 import { unlock } from '../../lock-unlock';
 import TemplateActions from '../template-actions';
+import { TEMPLATE_PART_POST_TYPE } from '../../utils/constants';
 
 export default function SidebarNavigationScreenPattern() {
 	const navigator = useNavigator();
@@ -34,7 +35,7 @@ export default function SidebarNavigationScreenPattern() {
 	// indicates the user has arrived at the template part via the "manage all"
 	// page and the back button should return them to that list page.
 	const backPath =
-		! categoryType && postType === 'wp_template_part'
+		! categoryType && postType === TEMPLATE_PART_POST_TYPE
 			? '/wp_template_part/all'
 			: '/patterns';
 

package/src/components/sidebar-navigation-screen-pattern/template-part-navigation-menu-list-item.js

@@ -9,13 +9,19 @@ import { __ } from '@wordpress/i18n';
  */
 import SidebarNavigationItem from '../sidebar-navigation-item';
 import { useLink } from '../routes/link';
+import { NAVIGATION_POST_TYPE } from '../../utils/constants';
 
 export default function TemplatePartNavigationMenuListItem( { id } ) {
-	const [ title ] = useEntityProp( 'postType', 'wp_navigation', 'title', id );
+	const [ title ] = useEntityProp(
+		'postType',
+		NAVIGATION_POST_TYPE,
+		'title',
+		id
+	);
 
 	const linkInfo = useLink( {
 		postId: id,
-		postType: 'wp_navigation',
+		postType: NAVIGATION_POST_TYPE,
 	} );
 
 	if ( ! id ) return null;

package/src/components/sidebar-navigation-screen-pattern/template-part-navigation-menu.js

@@ -9,9 +9,15 @@ import { useEntityProp } from '@wordpress/core-data';
  * Internal dependencies
  */
 import NavigationMenuEditor from '../sidebar-navigation-screen-navigation-menu/navigation-menu-editor';
+import { NAVIGATION_POST_TYPE } from '../../utils/constants';
 
 export default function TemplatePartNavigationMenu( { id } ) {
-	const [ title ] = useEntityProp( 'postType', 'wp_navigation', 'title', id );
+	const [ title ] = useEntityProp(
+		'postType',
+		NAVIGATION_POST_TYPE,
+		'title',
+		id
+	);
 
 	if ( ! id ) return null;
 

package/src/components/sidebar-navigation-screen-pattern/use-navigation-menu-content.js

@@ -8,6 +8,7 @@ import { parse } from '@wordpress/blocks';
  */
 import TemplatePartNavigationMenus from './template-part-navigation-menus';
 import useEditedEntityRecord from '../use-edited-entity-record';
+import { TEMPLATE_PART_POST_TYPE } from '../../utils/constants';
 
 /**
  * Retrieves a list of specific blocks from a given tree of blocks.
@@ -55,7 +56,7 @@ export default function useNavigationMenuContent( postType, postId ) {
 	// Only managing navigation menus in template parts is supported
 	// to match previous behaviour. This could potentially be expanded
 	// to patterns as well.
-	if ( postType !== 'wp_template_part' ) {
+	if ( postType !== TEMPLATE_PART_POST_TYPE ) {
 		return;
 	}
 

package/src/components/sidebar-navigation-screen-pattern/use-pattern-details.js

@@ -24,6 +24,12 @@ import {
 	SidebarNavigationScreenDetailsPanelLabel,
 	SidebarNavigationScreenDetailsPanelValue,
 } from '../sidebar-navigation-screen-details-panel';
+import {
+	PATTERN_TYPES,
+	TEMPLATE_PART_POST_TYPE,
+	PATTERN_SYNC_TYPES,
+	TEMPLATE_ORIGINS,
+} from '../../utils/constants';
 
 export default function usePatternDetails( postType, postId ) {
 	const { getDescription, getTitle, record } = useEditedEntityRecord(
@@ -53,7 +59,7 @@ export default function usePatternDetails( postType, postId ) {
 
 	if ( ! description && addedBy.text ) {
 		description =
-			postType === 'wp_block'
+			postType === PATTERN_TYPES.user
 				? sprintf(
 						// translators: %s: pattern title e.g: "Header".
 						__( 'This is the %s pattern.' ),
@@ -66,7 +72,7 @@ export default function usePatternDetails( postType, postId ) {
 				  );
 	}
 
-	if ( ! description && postType === 'wp_block' && record?.title ) {
+	if ( ! description && postType === PATTERN_TYPES.user && record?.title ) {
 		description = sprintf(
 			// translators: %s: user created pattern title e.g. "Footer".
 			__( 'This is the %s pattern.' ),
@@ -80,11 +86,14 @@ export default function usePatternDetails( postType, postId ) {
 
 	const details = [];
 
-	if ( postType === 'wp_block' || 'wp_template_part' ) {
+	if (
+		postType === PATTERN_TYPES.user ||
+		postType === TEMPLATE_PART_POST_TYPE
+	) {
 		details.push( {
 			label: __( 'Syncing' ),
 			value:
-				record.wp_pattern_sync_status === 'unsynced'
+				record.wp_pattern_sync_status === PATTERN_SYNC_TYPES.unsynced
 					? __( 'Not synced' )
 					: __( 'Fully synced' ),
 		} );
@@ -112,7 +121,7 @@ export default function usePatternDetails( postType, postId ) {
 		}
 	}
 
-	if ( postType === 'wp_template_part' ) {
+	if ( postType === TEMPLATE_PART_POST_TYPE ) {
 		const templatePartArea = templatePartAreas.find(
 			( area ) => area.area === record.area
 		);
@@ -133,7 +142,7 @@ export default function usePatternDetails( postType, postId ) {
 	}
 
 	if (
-		postType === 'wp_template_part' &&
+		postType === TEMPLATE_PART_POST_TYPE &&
 		addedBy.text &&
 		! isAddedByActiveTheme
 	) {
@@ -148,9 +157,10 @@ export default function usePatternDetails( postType, postId ) {
 	}
 
 	if (
-		postType === 'wp_template_part' &&
+		postType === TEMPLATE_PART_POST_TYPE &&
 		addedBy.text &&
-		( record.origin === 'plugin' || record.has_theme_file === true )
+		( record.origin === TEMPLATE_ORIGINS.plugin ||
+			record.has_theme_file === true )
 	) {
 		details.push( {
 			label: __( 'Customized' ),

package/src/components/sidebar-navigation-screen-patterns/index.js

@@ -19,7 +19,11 @@ import AddNewPattern from '../add-new-pattern';
 import SidebarNavigationItem from '../sidebar-navigation-item';
 import SidebarNavigationScreen from '../sidebar-navigation-screen';
 import CategoryItem from './category-item';
-import { PATTERN_DEFAULT_CATEGORY, PATTERN_TYPES } from '../../utils/constants';
+import {
+	PATTERN_DEFAULT_CATEGORY,
+	PATTERN_TYPES,
+	TEMPLATE_PART_POST_TYPE,
+} from '../../utils/constants';
 import { useLink } from '../routes/link';
 import usePatternCategories from './use-pattern-categories';
 import useTemplatePartAreas from './use-template-part-areas';
@@ -39,10 +43,10 @@ function TemplatePartGroup( { areas, currentArea, currentType } ) {
 							icon={ getTemplatePartIcon( area ) }
 							label={ label }
 							id={ area }
-							type="wp_template_part"
+							type={ TEMPLATE_PART_POST_TYPE }
 							isActive={
 								currentArea === area &&
-								currentType === 'wp_template_part'
+								currentType === TEMPLATE_PART_POST_TYPE
 							}
 						/>
 					)
@@ -84,7 +88,7 @@ export default function SidebarNavigationScreenPatterns() {
 	const isMobileViewport = useViewportMatch( 'medium', '<' );
 	const { categoryType, categoryId } = getQueryArgs( window.location.href );
 	const currentCategory = categoryId || PATTERN_DEFAULT_CATEGORY;
-	const currentType = categoryType || PATTERN_TYPES.user;
+	const currentType = categoryType || PATTERN_TYPES.theme;
 
 	const { templatePartAreas, hasTemplateParts, isLoading } =
 		useTemplatePartAreas();

package/src/components/sidebar-navigation-screen-patterns/use-pattern-categories.js

@@ -10,12 +10,17 @@ import { __ } from '@wordpress/i18n';
 import useDefaultPatternCategories from './use-default-pattern-categories';
 import useThemePatterns from './use-theme-patterns';
 import usePatterns from '../page-patterns/use-patterns';
-import { PATTERN_TYPES, PATTERN_DEFAULT_CATEGORY } from '../../utils/constants';
+import {
+	PATTERN_TYPES,
+	PATTERN_DEFAULT_CATEGORY,
+	PATTERN_USER_CATEGORY,
+	TEMPLATE_PART_AREA_DEFAULT_CATEGORY,
+} from '../../utils/constants';
 
 export default function usePatternCategories() {
 	const defaultCategories = useDefaultPatternCategories();
 	defaultCategories.push( {
-		name: 'uncategorized',
+		name: TEMPLATE_PART_AREA_DEFAULT_CATEGORY,
 		label: __( 'Uncategorized' ),
 	} );
 	const themePatterns = useThemePatterns();
@@ -80,12 +85,20 @@ export default function usePatternCategories() {
 		const sortedCategories = categoriesWithCounts.sort( ( a, b ) =>
 			a.label.localeCompare( b.label )
 		);
+
+		sortedCategories.unshift( {
+			name: PATTERN_USER_CATEGORY,
+			label: __( 'My patterns' ),
+			count: userPatterns.length,
+		} );
+
 		sortedCategories.unshift( {
 			name: PATTERN_DEFAULT_CATEGORY,
-			label: __( 'All Patterns' ),
+			label: __( 'All patterns' ),
 			description: __( 'A list of all patterns from all sources' ),
 			count: themePatterns.length + userPatterns.length,
 		} );
+
 		return sortedCategories;
 	}, [
 		defaultCategories,

package/src/components/sidebar-navigation-screen-patterns/use-template-part-areas.js

@@ -5,6 +5,14 @@ import { useEntityRecords } from '@wordpress/core-data';
 import { useSelect } from '@wordpress/data';
 import { store as editorStore } from '@wordpress/editor';
 
+/**
+ * Internal dependencies
+ */
+import {
+	TEMPLATE_PART_AREA_DEFAULT_CATEGORY,
+	TEMPLATE_PART_POST_TYPE,
+} from '../../utils/constants';
+
 const useTemplatePartsGroupedByArea = ( items ) => {
 	const allItems = items || [];
 
@@ -32,7 +40,9 @@ const useTemplatePartsGroupedByArea = ( items ) => {
 	);
 
 	const groupedByArea = allItems.reduce( ( accumulator, item ) => {
-		const key = accumulator[ item.area ] ? item.area : 'uncategorized';
+		const key = accumulator[ item.area ]
+			? item.area
+			: TEMPLATE_PART_AREA_DEFAULT_CATEGORY;
 		accumulator[ key ].templateParts.push( item );
 		return accumulator;
 	}, knownAreas );
@@ -43,7 +53,7 @@ const useTemplatePartsGroupedByArea = ( items ) => {
 export default function useTemplatePartAreas() {
 	const { records: templateParts, isResolving: isLoading } = useEntityRecords(
 		'postType',
-		'wp_template_part',
+		TEMPLATE_PART_POST_TYPE,
 		{ per_page: -1 }
 	);
 

package/src/components/sidebar-navigation-screen-template/home-template-details.js

@@ -28,6 +28,7 @@ import { unlock } from '../../lock-unlock';
 import { store as editSiteStore } from '../../store';
 import { useLink } from '../routes/link';
 import SidebarNavigationItem from '../sidebar-navigation-item';
+import { TEMPLATE_PART_POST_TYPE } from '../../utils/constants';
 
 const EMPTY_OBJECT = {};
 
@@ -37,7 +38,7 @@ function TemplateAreaButton( { postId, icon, title } ) {
 		footer,
 	};
 	const linkInfo = useLink( {
-		postType: 'wp_template_part',
+		postType: TEMPLATE_PART_POST_TYPE,
 		postId,
 	} );
 

package/src/components/sidebar-navigation-screen-templates/index.js

@@ -18,6 +18,7 @@ import { useLink } from '../routes/link';
 import SidebarNavigationItem from '../sidebar-navigation-item';
 import AddNewTemplate from '../add-new-template';
 import SidebarButton from '../sidebar-button';
+import { TEMPLATE_POST_TYPE } from '../../utils/constants';
 
 const TemplateItem = ( { postType, postId, ...props } ) => {
 	const linkInfo = useLink( {
@@ -32,7 +33,7 @@ export default function SidebarNavigationScreenTemplates() {
 
 	const { records: templates, isResolving: isLoading } = useEntityRecords(
 		'postType',
-		'wp_template',
+		TEMPLATE_POST_TYPE,
 		{
 			per_page: -1,
 		}
@@ -54,7 +55,7 @@ export default function SidebarNavigationScreenTemplates() {
 			actions={
 				canCreate && (
 					<AddNewTemplate
-						templateType={ 'wp_template' }
+						templateType={ TEMPLATE_POST_TYPE }
 						toggleProps={ {
 							as: SidebarButton,
 						} }
@@ -71,7 +72,7 @@ export default function SidebarNavigationScreenTemplates() {
 							) }
 							{ sortedTemplates.map( ( template ) => (
 								<TemplateItem
-									postType={ 'wp_template' }
+									postType={ TEMPLATE_POST_TYPE }
 									postId={ template.id }
 									key={ template.id }
 									withChevron

package/src/components/sidebar-navigation-screen-templates-browse/index.js

@@ -10,15 +10,19 @@ import { __experimentalUseNavigator as useNavigator } from '@wordpress/component
  */
 import SidebarNavigationScreen from '../sidebar-navigation-screen';
 import { store as editSiteStore } from '../../store';
+import {
+	TEMPLATE_POST_TYPE,
+	TEMPLATE_PART_POST_TYPE,
+} from '../../utils/constants';
 
 const config = {
-	wp_template: {
+	[ TEMPLATE_POST_TYPE ]: {
 		title: __( 'All templates' ),
 		description: __(
 			'Create new templates, or reset any customizations made to the templates supplied by your theme.'
 		),
 	},
-	wp_template_part: {
+	[ TEMPLATE_PART_POST_TYPE ]: {
 		title: __( 'All template parts' ),
 		description: __(
 			'Create new template parts, or reset any customizations made to the template parts supplied by your theme.'

package/src/components/start-template-options/index.js

@@ -20,6 +20,7 @@ import { store as editSiteStore } from '../../store';
 import { store as coreStore, useEntityBlockEditor } from '@wordpress/core-data';
 import apiFetch from '@wordpress/api-fetch';
 import { addQueryArgs } from '@wordpress/url';
+import { TEMPLATE_POST_TYPE } from '../../utils/constants';
 
 function useFallbackTemplateContent( slug, isCustom = false ) {
 	const [ templateContent, setTemplateContent ] = useState( '' );
@@ -50,6 +51,37 @@ function useStartPatterns( fallbackContent ) {
 		};
 	}, [] );
 
+	const currentThemeStylesheet = useSelect(
+		( select ) => select( coreStore ).getCurrentTheme().stylesheet
+	);
+
+	// Duplicated from packages/block-library/src/pattern/edit.js.
+	function injectThemeAttributeInBlockTemplateContent( block ) {
+		if (
+			block.innerBlocks.find(
+				( innerBlock ) => innerBlock.name === 'core/template-part'
+			)
+		) {
+			block.innerBlocks = block.innerBlocks.map( ( innerBlock ) => {
+				if (
+					innerBlock.name === 'core/template-part' &&
+					innerBlock.attributes.theme === undefined
+				) {
+					innerBlock.attributes.theme = currentThemeStylesheet;
+				}
+				return innerBlock;
+			} );
+		}
+
+		if (
+			block.name === 'core/template-part' &&
+			block.attributes.theme === undefined
+		) {
+			block.attributes.theme = currentThemeStylesheet;
+		}
+		return block;
+	}
+
 	return useMemo( () => {
 		// filter patterns that are supposed to be used in the current template being edited.
 		return [
@@ -68,7 +100,12 @@ function useStartPatterns( fallbackContent ) {
 					);
 				} )
 				.map( ( pattern ) => {
-					return { ...pattern, blocks: parse( pattern.content ) };
+					return {
+						...pattern,
+						blocks: parse( pattern.content ).map( ( block ) =>
+							injectThemeAttributeInBlockTemplateContent( block )
+						),
+					};
 				} ),
 		];
 	}, [ fallbackContent, slug, patterns ] );
@@ -162,7 +199,7 @@ export default function StartTemplateOptions() {
 				shouldOpenModal:
 					! hasEdits &&
 					'' === templateRecord.content &&
-					'wp_template' === _postType &&
+					TEMPLATE_POST_TYPE === _postType &&
 					! select( preferencesStore ).get(
 						'core/edit-site',
 						'welcomeGuide'

package/src/components/sync-state-with-url/use-init-edited-entity-from-url.js

@@ -11,6 +11,12 @@ import { privateApis as routerPrivateApis } from '@wordpress/router';
  */
 import { store as editSiteStore } from '../../store';
 import { unlock } from '../../lock-unlock';
+import {
+	TEMPLATE_POST_TYPE,
+	TEMPLATE_PART_POST_TYPE,
+	NAVIGATION_POST_TYPE,
+	PATTERN_TYPES,
+} from '../../utils/constants';
 
 const { useLocation } = unlock( routerPrivateApis );
 
@@ -42,16 +48,16 @@ export default function useInitEditedEntityFromURL() {
 	useEffect( () => {
 		if ( postType && postId ) {
 			switch ( postType ) {
-				case 'wp_template':
+				case TEMPLATE_POST_TYPE:
 					setTemplate( postId );
 					break;
-				case 'wp_template_part':
+				case TEMPLATE_PART_POST_TYPE:
 					setTemplatePart( postId );
 					break;
-				case 'wp_navigation':
+				case NAVIGATION_POST_TYPE:
 					setNavigationMenu( postId );
 					break;
-				case 'wp_block':
+				case PATTERN_TYPES.user:
 					setEditedEntity( postType, postId );
 					break;
 				default: