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

package/build-style/style-rtl.css

@@ -403,7 +403,7 @@
 }
 .dataviews-title-field {
   font-size: 13px;
-  font-weight: 500;
+  font-weight: 499;
   color: #2f2f2f;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -500,7 +500,7 @@
 
 .dataviews-bulk-actions-footer__item-count {
   color: #1e1e1e;
-  font-weight: 500;
+  font-weight: 499;
   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: 500;
+  font-weight: 499;
 }
 
 .dataviews-filters__summary-chip-container .dataviews-filters__summary-chip-remove {
@@ -1135,14 +1135,14 @@
 }
 .dataviews-pagination__page-select {
   font-size: 11px;
-  font-weight: 500;
+  font-weight: 499;
   text-transform: uppercase;
 }
 
 @media (min-width: 600px) {
   .dataviews-pagination__page-select .components-select-control__input {
     font-size: 11px !important;
-    font-weight: 500;
+    font-weight: 499;
   }
 }
 .dataviews-action-modal {
@@ -1474,7 +1474,7 @@
 
 .dataviews-view-grid__group-header {
   font-size: 15px;
-  font-weight: 500;
+  font-weight: 499;
   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: 500;
+  font-weight: 499;
   color: #1e1e1e;
   margin: 0 0 8px 0;
   padding: 0 24px;
@@ -1865,7 +1865,7 @@ div.dataviews-view-list {
   padding-right: 12px;
   font-size: 11px;
   text-transform: uppercase;
-  font-weight: 500;
+  font-weight: 499;
 }
 
 .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: 500;
+  font-weight: 499;
 }
 
 .dataviews-view-table .dataviews-view-table-header-button:not(:hover) {
@@ -1918,9 +1918,8 @@ div.dataviews-view-list {
 }
 
 .dataviews-view-table .dataviews-view-table__actions-column {
-  width: 1%;
-  max-width: inherit;
-  min-width: inherit;
+  width: auto;
+  white-space: nowrap;
 }
 
 .dataviews-view-table:has(tr.is-selected) .components-checkbox-control__input {
@@ -1999,7 +1998,7 @@ div.dataviews-view-list {
 }
 
 .dataviews-view-table__group-header-row .dataviews-view-table__group-header-cell {
-  font-weight: 500;
+  font-weight: 499;
   padding: 12px 48px;
   color: #1e1e1e;
 }
@@ -2157,7 +2156,7 @@ div.dataviews-view-list {
 
 .dataviews-view-picker-grid-group__header {
   font-size: 15px;
-  font-weight: 500;
+  font-weight: 499;
   color: #1e1e1e;
   margin: 0 0 8px 0;
   padding: 0 48px;
@@ -2279,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: 500;
+  font-weight: 499;
   font-size: 15px;
   line-height: 20px;
 }
@@ -2957,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: 500 !important;
+  font-weight: 499 !important;
   font-size: 11px !important;
 }
 
@@ -3302,11 +3301,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: 500;
+  font-weight: 499;
 }
 
 .edit-site-global-styles-sidebar .components-navigation__item > button span {
-  font-weight: 500;
+  font-weight: 499;
 }
 
 .edit-site-global-styles-sidebar .block-editor-panel-color-gradient-settings {
@@ -4038,7 +4037,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: 500;
+  font-weight: 499;
 }
 .edit-site-sidebar-navigation-item.components-item:focus-visible {
   transform: translateZ(0);
@@ -4113,7 +4112,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
   color: #ddd;
   font-size: 11px;
   text-transform: uppercase;
-  font-weight: 500;
+  font-weight: 499;
 }
 
 .edit-site-sidebar-navigation-screen__content .edit-site-global-styles-variations_item .edit-site-global-styles-variations_item-preview {
@@ -4201,7 +4200,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
 }
 .edit-site-sidebar-navigation-screen-patterns__group-header h2 {
   font-size: 11px;
-  font-weight: 500;
+  font-weight: 499;
   text-transform: uppercase;
 }
 
@@ -4274,7 +4273,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
 }
 .edit-site-sidebar-dataviews-dataview-item.is-selected {
   background: #2f2f2f;
-  font-weight: 500;
+  font-weight: 499;
   color: #fff;
 }
 
@@ -4305,7 +4304,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
   display: block;
   flex-grow: 1;
   font-size: 15px;
-  font-weight: 500;
+  font-weight: 499;
   overflow: hidden;
   padding-left: 16px;
   margin-right: -4px;
@@ -4608,7 +4607,7 @@ body:has(.edit-site-resizable-frame__inner.is-resizing) {
 }
 .font-library-modal .font-library-modal__subtitle {
   text-transform: uppercase;
-  font-weight: 500;
+  font-weight: 499;
   font-size: 11px;
 }
 .font-library-modal .components-navigator-screen {
@@ -4643,13 +4642,13 @@ body:has(.edit-site-resizable-frame__inner.is-resizing) {
 
 .font-library-modal__page-selection {
   font-size: 11px;
-  font-weight: 500;
+  font-weight: 499;
   text-transform: uppercase;
 }
 @media (min-width: 600px) {
   .font-library-modal__page-selection .components-select-control__input {
     font-size: 11px !important;
-    font-weight: 500;
+    font-weight: 499;
   }
 }
 

package/build-style/style.css

@@ -403,7 +403,7 @@
 }
 .dataviews-title-field {
   font-size: 13px;
-  font-weight: 500;
+  font-weight: 499;
   color: #2f2f2f;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -500,7 +500,7 @@
 
 .dataviews-bulk-actions-footer__item-count {
   color: #1e1e1e;
-  font-weight: 500;
+  font-weight: 499;
   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: 500;
+  font-weight: 499;
 }
 
 .dataviews-filters__summary-chip-container .dataviews-filters__summary-chip-remove {
@@ -1135,14 +1135,14 @@
 }
 .dataviews-pagination__page-select {
   font-size: 11px;
-  font-weight: 500;
+  font-weight: 499;
   text-transform: uppercase;
 }
 
 @media (min-width: 600px) {
   .dataviews-pagination__page-select .components-select-control__input {
     font-size: 11px !important;
-    font-weight: 500;
+    font-weight: 499;
   }
 }
 .dataviews-action-modal {
@@ -1474,7 +1474,7 @@
 
 .dataviews-view-grid__group-header {
   font-size: 15px;
-  font-weight: 500;
+  font-weight: 499;
   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: 500;
+  font-weight: 499;
   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: 500;
+  font-weight: 499;
 }
 
 .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: 500;
+  font-weight: 499;
 }
 
 .dataviews-view-table .dataviews-view-table-header-button:not(:hover) {
@@ -1918,9 +1918,8 @@ div.dataviews-view-list {
 }
 
 .dataviews-view-table .dataviews-view-table__actions-column {
-  width: 1%;
-  max-width: inherit;
-  min-width: inherit;
+  width: auto;
+  white-space: nowrap;
 }
 
 .dataviews-view-table:has(tr.is-selected) .components-checkbox-control__input {
@@ -1999,7 +1998,7 @@ div.dataviews-view-list {
 }
 
 .dataviews-view-table__group-header-row .dataviews-view-table__group-header-cell {
-  font-weight: 500;
+  font-weight: 499;
   padding: 12px 48px;
   color: #1e1e1e;
 }
@@ -2157,7 +2156,7 @@ div.dataviews-view-list {
 
 .dataviews-view-picker-grid-group__header {
   font-size: 15px;
-  font-weight: 500;
+  font-weight: 499;
   color: #1e1e1e;
   margin: 0 0 8px 0;
   padding: 0 48px;
@@ -2279,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: 500;
+  font-weight: 499;
   font-size: 15px;
   line-height: 20px;
 }
@@ -2957,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: 500 !important;
+  font-weight: 499 !important;
   font-size: 11px !important;
 }
 
@@ -3303,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: 500;
+  font-weight: 499;
 }
 
 .edit-site-global-styles-sidebar .components-navigation__item > button span {
-  font-weight: 500;
+  font-weight: 499;
 }
 
 .edit-site-global-styles-sidebar .block-editor-panel-color-gradient-settings {
@@ -4039,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: 500;
+  font-weight: 499;
 }
 .edit-site-sidebar-navigation-item.components-item:focus-visible {
   transform: translateZ(0);
@@ -4114,7 +4113,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
   color: #ddd;
   font-size: 11px;
   text-transform: uppercase;
-  font-weight: 500;
+  font-weight: 499;
 }
 
 .edit-site-sidebar-navigation-screen__content .edit-site-global-styles-variations_item .edit-site-global-styles-variations_item-preview {
@@ -4202,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: 500;
+  font-weight: 499;
   text-transform: uppercase;
 }
 
@@ -4275,7 +4274,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
 }
 .edit-site-sidebar-dataviews-dataview-item.is-selected {
   background: #2f2f2f;
-  font-weight: 500;
+  font-weight: 499;
   color: #fff;
 }
 
@@ -4306,7 +4305,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
   display: block;
   flex-grow: 1;
   font-size: 15px;
-  font-weight: 500;
+  font-weight: 499;
   overflow: hidden;
   padding-right: 16px;
   margin-left: -4px;
@@ -4609,7 +4608,7 @@ body:has(.edit-site-resizable-frame__inner.is-resizing) {
 }
 .font-library-modal .font-library-modal__subtitle {
   text-transform: uppercase;
-  font-weight: 500;
+  font-weight: 499;
   font-size: 11px;
 }
 .font-library-modal .components-navigator-screen {
@@ -4644,13 +4643,13 @@ body:has(.edit-site-resizable-frame__inner.is-resizing) {
 
 .font-library-modal__page-selection {
   font-size: 11px;
-  font-weight: 500;
+  font-weight: 499;
   text-transform: uppercase;
 }
 @media (min-width: 600px) {
   .font-library-modal__page-selection .components-select-control__input {
     font-size: 11px !important;
-    font-weight: 500;
+    font-weight: 499;
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "6.33.1",
+	"version": "6.33.3-next.36001005c.0",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -37,48 +37,49 @@
 	"wpScript": true,
 	"dependencies": {
 		"@react-spring/web": "^9.4.5",
-		"@wordpress/a11y": "^4.33.0",
-		"@wordpress/admin-ui": "^1.1.0",
-		"@wordpress/api-fetch": "^7.33.0",
-		"@wordpress/base-styles": "^6.9.0",
-		"@wordpress/blob": "^4.33.0",
-		"@wordpress/block-editor": "^15.6.0",
-		"@wordpress/block-library": "^9.33.1",
-		"@wordpress/blocks": "^15.6.0",
-		"@wordpress/commands": "^1.33.0",
-		"@wordpress/components": "^30.6.0",
-		"@wordpress/compose": "^7.33.0",
-		"@wordpress/core-data": "^7.33.0",
-		"@wordpress/data": "^10.33.0",
-		"@wordpress/dataviews": "^10.0.0",
-		"@wordpress/date": "^5.33.0",
-		"@wordpress/deprecated": "^4.33.0",
-		"@wordpress/dom": "^4.33.0",
-		"@wordpress/editor": "^14.33.1",
-		"@wordpress/element": "^6.33.0",
-		"@wordpress/escape-html": "^3.33.0",
-		"@wordpress/fields": "^0.25.1",
-		"@wordpress/hooks": "^4.33.0",
-		"@wordpress/html-entities": "^4.33.0",
-		"@wordpress/i18n": "^6.6.0",
-		"@wordpress/icons": "^11.0.0",
-		"@wordpress/keyboard-shortcuts": "^5.33.0",
-		"@wordpress/keycodes": "^4.33.0",
-		"@wordpress/media-utils": "^5.33.0",
-		"@wordpress/notices": "^5.33.0",
-		"@wordpress/patterns": "^2.33.0",
-		"@wordpress/plugins": "^7.33.0",
-		"@wordpress/preferences": "^4.33.0",
-		"@wordpress/primitives": "^4.33.0",
-		"@wordpress/private-apis": "^1.33.0",
-		"@wordpress/reusable-blocks": "^5.33.0",
-		"@wordpress/router": "^1.33.0",
-		"@wordpress/style-engine": "^2.33.0",
-		"@wordpress/url": "^4.33.0",
-		"@wordpress/viewport": "^6.33.0",
-		"@wordpress/views": "^1.0.0",
-		"@wordpress/widgets": "^4.33.0",
-		"@wordpress/wordcount": "^4.33.0",
+		"@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",
 		"change-case": "^4.1.2",
 		"clsx": "^2.1.1",
 		"colord": "^2.9.2",
@@ -93,5 +94,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "0eca9b157f332afd4d1a53c62bd862ae9a159c57"
+	"gitHead": "b73a8a22e779c59efb8f911e32b681652f237d60"
 }

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

@@ -35,6 +35,7 @@ export const useSetActiveTemplateAction = () => {
 			icon: pencil,
 			isEligible( item ) {
 				return (
+					! item._isCustom &&
 					! ( item.slug === 'index' && item.source === 'theme' ) &&
 					item.theme === activeTheme.stylesheet
 				);

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

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: 500 !important;
+	font-weight: $font-weight-medium !important;
 	font-size: 11px !important;
 }
 

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

@@ -3,15 +3,12 @@
  */
 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 { unlock } from '../../lock-unlock';
-
-const { useGlobalStylesOutput } = unlock( blockEditorPrivateApis );
+import { useGlobalStylesOutput } from '../../hooks/use-global-styles-output';
 
 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: 500;
+	font-weight: $font-weight-medium;
 }
 
 .edit-site-global-styles-sidebar .components-navigation__item > button span {
-	font-weight: 500;
+	font-weight: $font-weight-medium;
 }
 
 .edit-site-global-styles-sidebar .block-editor-panel-color-gradient-settings {

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

@@ -11,7 +11,7 @@ import {
 	__experimentalHStack as HStack,
 	privateApis as componentsPrivateApis,
 } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
+import { __, _x } from '@wordpress/i18n';
 import { useState, useMemo } from '@wordpress/element';
 import { decodeEntities } from '@wordpress/html-entities';
 import { parse } from '@wordpress/blocks';
@@ -155,6 +155,19 @@ export const activeField = {
 	id: 'active',
 	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 isActive = item._isActive;
 		return (
 			<Badge intent={ isActive ? 'success' : 'default' }>
@@ -190,10 +203,6 @@ export const slugField = {
 		const defaultTemplateType = defaultTemplateTypes.find(
 			( type ) => type.slug === item.slug
 		);
-		return (
-			defaultTemplateType?.title ||
-			// translators: %s is the slug of a custom template.
-			__( 'Custom' )
-		);
+		return defaultTemplateType?.title || _x( 'Custom', 'template type' );
 	},
 };

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

@@ -72,14 +72,18 @@ export default function PageTemplates() {
 		},
 	} );
 
-	const { activeTemplatesOption, activeTheme } = useSelect( ( select ) => {
-		const { getEntityRecord, getCurrentTheme } = select( coreStore );
-		return {
-			activeTemplatesOption: getEntityRecord( 'root', 'site' )
-				?.active_templates,
-			activeTheme: getCurrentTheme(),
-		};
-	} );
+	const { activeTemplatesOption, activeTheme, defaultTemplateTypes } =
+		useSelect( ( select ) => {
+			const { getEntityRecord, getCurrentTheme } = select( coreStore );
+			return {
+				activeTemplatesOption: getEntityRecord( 'root', 'site' )
+					?.active_templates,
+				activeTheme: getCurrentTheme(),
+				defaultTemplateTypes:
+					select( coreStore ).getCurrentTheme()
+						?.default_template_types,
+			};
+		} );
 	// Todo: this will have to be better so that we're not fetching all the
 	// records all the time. Active templates query will need to move server
 	// side.
@@ -150,8 +154,14 @@ export default function PageTemplates() {
 			_isActive: activeTemplates.find(
 				( template ) => template.id === record.id
 			),
+			_isCustom:
+				record.is_custom ||
+				( ! record.meta?.is_wp_suggestion &&
+					! defaultTemplateTypes.find(
+						( type ) => type.slug === record.slug
+					) ),
 		} ) );
-	}, [ _records, activeTemplates ] );
+	}, [ _records, activeTemplates, defaultTemplateTypes ] );
 
 	const users = useSelect(
 		( select ) => {