@wordpress/edit-site 6.40.2-next.v.202602241322.0 → 6.40.2

package/build-style/style.css

@@ -107,100 +107,11 @@
   }
 }
 
-/**
- * Colors
- */
-/**
- * SCSS Variables.
- *
- * Please use variables from this sheet to ensure consistency across the UI.
- * Don't add to this sheet unless you're pretty sure the value will be reused in many places.
- * For example, don't add rules to this sheet that affect block visuals. It's purely for UI.
- */
-/**
- * Fonts & basic variables.
- */
-/**
- * Typography
- */
-/**
- * Grid System.
- * https://make.wordpress.org/design/2019/10/31/proposal-a-consistent-spacing-system-for-wordpress/
- */
-/**
- * Radius scale.
- */
-/**
- * Elevation scale.
- */
-/**
- * Dimensions.
- */
-/**
- * Mobile specific styles
- */
-/**
- * Editor styles.
- */
-/**
- * Block & Editor UI.
- */
-/**
- * Block paddings.
- */
-/**
- * React Native specific.
- * These variables do not appear to be used anywhere else.
- */
-/**
- * Typography
- */
-/**
- * Breakpoints & Media Queries
- */
-/**
-*  Converts a hex value into the rgb equivalent.
-*
-* @param {string} hex - the hexadecimal value to convert
-* @return {string} comma separated rgb values
-*/
-/**
- * Long content fade mixin
- *
- * Creates a fading overlay to signify that the content is longer
- * than the space allows.
- */
-/**
- * Breakpoint mixins
- */
-/**
- * Focus styles.
- */
-/**
- * Applies editor left position to the selector passed as argument
- */
-/**
- * Styles that are reused verbatim in a few places
- */
-/**
- * Allows users to opt-out of animations via OS-level preferences.
- */
-/**
- * Reset default styles for JavaScript UI based pages.
- * This is a WP-admin agnostic reset
- */
-/**
- * Reset the WP Admin page styles for Gutenberg-like pages.
- */
-/**
- * Creates a checkerboard pattern background to indicate transparency.
- * @param {String} $size - The size of the squares in the checkerboard pattern. Default is 12px.
- */
 .admin-ui-page {
   display: flex;
   height: 100%;
-  background-color: #fff;
-  color: #2f2f2f;
+  background-color: var(--wpds-color-bg-surface-neutral-strong, #ffffff);
+  color: var(--wpds-color-fg-content-neutral, #1e1e1e);
   position: relative;
   z-index: 1;
   flex-flow: column;
@@ -208,25 +119,34 @@
 }
 
 .admin-ui-page__header {
-  padding: 16px 24px;
-  border-bottom: 1px solid #f0f0f0;
-  background: #fff;
+  padding: var(--wpds-dimension-padding-lg, 16px) var(--wpds-dimension-padding-2xl, 24px);
+  border-bottom: var(--wpds-border-width-xs, 1px) solid var(--wpds-color-stroke-surface-neutral-weak, #e0e0e0);
+  background: var(--wpds-color-bg-surface-neutral-strong, #ffffff);
   position: sticky;
   top: 0;
   z-index: 1;
 }
 
+.admin-ui-page__header-title {
+  font-family: var(--wpds-font-family-heading, -apple-system, system-ui, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif);
+  font-size: var(--wpds-font-size-xl, 20px);
+  font-weight: var(--wpds-font-weight-medium, 499);
+  line-height: var(--wpds-font-line-height-xl, 32px);
+  margin: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .admin-ui-page__sidebar-toggle-slot:empty {
   display: none;
 }
 
 .admin-ui-page__header-subtitle {
-  padding-block-end: 8px;
-  color: #757575;
-  font-family: -apple-system, "system-ui", "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-  font-weight: 400;
-  font-size: 13px;
-  line-height: 20px;
+  padding-block-end: var(--wpds-dimension-padding-xs, 4px);
+  color: var(--wpds-color-fg-content-neutral-weak, #6d6d6d);
+  font-size: var(--wpds-font-size-md, 13px);
+  line-height: var(--wpds-font-line-height-md, 24px);
   margin: 0;
 }
 
@@ -238,12 +158,12 @@
 }
 
 .admin-ui-page__content.has-padding {
-  padding: 16px 24px;
+  padding: var(--wpds-dimension-padding-lg, 16px) var(--wpds-dimension-padding-2xl, 24px);
 }
 
 .show-icon-labels .admin-ui-page__header-actions .components-button.has-icon {
   width: auto;
-  padding: 0 8px;
+  padding: 0 var(--wpds-dimension-padding-xs, 4px);
 }
 
 .show-icon-labels .admin-ui-page__header-actions .components-button.has-icon svg {
@@ -252,9 +172,54 @@
 
 .show-icon-labels .admin-ui-page__header-actions .components-button.has-icon::after {
   content: attr(aria-label);
-  font-size: 12px;
+  font-size: var(--wpds-font-size-sm, 12px);
 }
 
+/**
+ * SCSS Variables.
+ *
+ * Please use variables from this sheet to ensure consistency across the UI.
+ * Don't add to this sheet unless you're pretty sure the value will be reused in many places.
+ * For example, don't add rules to this sheet that affect block visuals. It's purely for UI.
+ */
+/**
+ * Colors
+ */
+/**
+ * Fonts & basic variables.
+ */
+/**
+ * Typography
+ */
+/**
+ * Grid System.
+ * https://make.wordpress.org/design/2019/10/31/proposal-a-consistent-spacing-system-for-wordpress/
+ */
+/**
+ * Radius scale.
+ */
+/**
+ * Elevation scale.
+ */
+/**
+ * Dimensions.
+ */
+/**
+ * Mobile specific styles
+ */
+/**
+ * Editor styles.
+ */
+/**
+ * Block & Editor UI.
+ */
+/**
+ * Block paddings.
+ */
+/**
+ * React Native specific.
+ * These variables do not appear to be used anywhere else.
+ */
 .admin-ui-breadcrumbs__list {
   list-style: none;
   padding: 0;
@@ -410,6 +375,25 @@
     transition: padding ease-out 0.1s;
   }
 }
+.dataviews-no-results.is-refreshing {
+  opacity: 0.5;
+  pointer-events: none;
+}
+
+@media not (prefers-reduced-motion) {
+  .dataviews-no-results.is-refreshing {
+    opacity: 1;
+    animation: dataviews-pulse 1s ease-in-out infinite;
+  }
+}
+@keyframes dataviews-pulse {
+  0%, 100% {
+    opacity: 1;
+  }
+  50% {
+    opacity: 0.5;
+  }
+}
 .dataviews-loading-more {
   text-align: center;
 }
@@ -1088,17 +1072,28 @@
   z-index: 2;
 }
 
+.dataviews-footer .is-refreshing {
+  opacity: 0.5;
+  pointer-events: none;
+}
+
+@media not (prefers-reduced-motion) {
+  .dataviews-footer .is-refreshing {
+    opacity: 1;
+    animation: dataviews-pulse 1s ease-in-out infinite;
+  }
+}
 @container (max-width: 560px) {
-  .dataviews-footer {
+  .dataviews-footer__content {
     flex-direction: column !important;
   }
-  .dataviews-footer .dataviews-bulk-actions-footer__container {
+  .dataviews-footer__content .dataviews-bulk-actions-footer__container {
     width: 100%;
   }
-  .dataviews-footer .dataviews-bulk-actions-footer__item-count {
+  .dataviews-footer__content .dataviews-bulk-actions-footer__item-count {
     flex-grow: 1;
   }
-  .dataviews-footer .dataviews-pagination {
+  .dataviews-footer__content .dataviews-pagination {
     width: 100%;
     justify-content: space-between;
   }
@@ -1119,6 +1114,10 @@
   z-index: 1000001;
 }
 
+.dataviews-item-actions .components-button:not(.dataviews-all-actions-button) {
+  padding: 0 4px;
+}
+
 .dataviews-selection-checkbox {
   --checkbox-input-size: 24px;
 }
@@ -1393,6 +1392,17 @@
   padding-bottom: 12px;
 }
 
+.dataviews-view-grid.is-refreshing {
+  opacity: 0.5;
+  pointer-events: none;
+}
+
+@media not (prefers-reduced-motion) {
+  .dataviews-view-grid.is-refreshing {
+    opacity: 1;
+    animation: dataviews-pulse 1s ease-in-out infinite;
+  }
+}
 .dataviews-view-grid__field-value:empty,
 .dataviews-view-grid__field:empty {
   display: none;
@@ -1747,6 +1757,17 @@ div.dataviews-view-list {
   line-height: 24px;
 }
 
+.dataviews-view-list.is-refreshing {
+  opacity: 0.5;
+  pointer-events: none;
+}
+
+@media not (prefers-reduced-motion) {
+  .dataviews-view-list.is-refreshing {
+    opacity: 1;
+    animation: dataviews-pulse 1s ease-in-out infinite;
+  }
+}
 .dataviews-view-list__group-header {
   font-size: 15px;
   font-weight: 499;
@@ -1916,6 +1937,7 @@ div.dataviews-view-list {
 
 .dataviews-view-table tbody .dataviews-view-table__cell-content-wrapper.dataviews-view-table__cell-align-end {
   justify-content: flex-end;
+  font-variant-numeric: tabular-nums;
 }
 
 .dataviews-view-table tbody .dataviews-view-table__cell-content-wrapper.dataviews-view-table__cell-align-center {
@@ -2028,10 +2050,21 @@ div.dataviews-view-list {
 }
 
 /* Column width intents via colgroup: make non-primary columns shrink-to-fit */
-.dataviews-view-table col[class^=dataviews-view-table__col-]:not(.dataviews-view-table__col-first-data):not(.dataviews-view-table__col-expand) {
+.dataviews-view-table col[class^=dataviews-view-table__col-]:not(.dataviews-view-table__col-first-data) {
   width: 1%;
 }
 
+.dataviews-view-table.is-refreshing {
+  opacity: 0.5;
+  pointer-events: none;
+}
+
+@media not (prefers-reduced-motion) {
+  .dataviews-view-table.is-refreshing {
+    opacity: 1;
+    animation: dataviews-pulse 1s ease-in-out infinite;
+  }
+}
 .dataviews-view-picker-grid .dataviews-view-picker-grid__card {
   height: 100%;
   justify-content: flex-start;
@@ -2424,6 +2457,17 @@ div.dataviews-view-list {
   background-color: #ddd;
 }
 
+.dataviews-view-activity.is-refreshing {
+  opacity: 0.5;
+  pointer-events: none;
+}
+
+@media not (prefers-reduced-motion) {
+  .dataviews-view-activity.is-refreshing {
+    opacity: 1;
+    animation: dataviews-pulse 1s ease-in-out infinite;
+  }
+}
 .dataviews-view-activity + .dataviews-pagination {
   justify-content: space-between;
 }
@@ -2483,7 +2527,7 @@ div.dataviews-view-list {
 
 .dataforms-layouts-panel__field-trigger--label-side {
   flex-direction: row;
-  gap: var(--wpds-dimension-gap-md);
+  gap: var(--wpds-dimension-gap-md, 12px);
 }
 
 .dataforms-layouts-panel__field-trigger--label-top {
@@ -2513,7 +2557,7 @@ div.dataviews-view-list {
 
 .dataforms-layouts-panel__field-trigger.is-disabled .dataforms-layouts-panel__field-control {
   color: #757575;
-  font-weight: var(--wpds-font-weight-regular);
+  font-weight: var(--wpds-font-weight-regular, 400);
 }
 
 .dataforms-layouts-panel__field-trigger--edit-always .dataforms-layouts-panel__field-trigger-icon {
@@ -2530,12 +2574,12 @@ div.dataviews-view-list {
   color: var(--wp-admin-theme-color);
   flex: 0 0 auto;
   opacity: 0;
-  border-radius: var(--wpds-border-radius-xs);
+  border-radius: var(--wpds-border-radius-xs, 1px);
 }
 
 .dataforms-layouts-panel__field-trigger-icon:focus-visible {
   opacity: 1;
-  outline: var(--wpds-border-width-focus) solid var(--wp-admin-theme-color);
+  outline: var(--wpds-border-width-focus, var(--wp-admin-border-width-focus, 2px)) solid var(--wp-admin-theme-color);
 }
 
 .dataforms-layouts-panel__field-dropdown-anchor {
@@ -2555,6 +2599,7 @@ div.dataviews-view-list {
   line-height: 20px;
   hyphens: auto;
   color: #757575;
+  text-transform: capitalize;
 }
 
 .dataforms-layouts-panel__field-label .components-base-control__label {
@@ -2586,11 +2631,11 @@ div.dataviews-view-list {
   flex-grow: 1;
   min-width: 0;
   min-height: 24px;
-  line-height: var(--wpds-font-line-height-md);
+  line-height: var(--wpds-font-line-height-md, 24px);
   display: flex;
   align-items: center;
   overflow: hidden;
-  font-weight: var(--wpds-font-weight-medium);
+  font-weight: var(--wpds-font-weight-medium, 499);
 }
 
 .dataforms-layouts-panel__field-control > * {
@@ -2635,8 +2680,9 @@ div.dataviews-view-list {
 }
 
 .dataforms-layouts-regular__field .components-base-control__label,
-.dataforms-layouts-regular__field .components-input-control__label {
-  color: #757575;
+.dataforms-layouts-regular__field .components-input-control__label,
+.dataforms-layouts-regular__field .components-form-token-field__label {
+  color: #1e1e1e;
 }
 
 .dataforms-layouts-regular__field-label {
@@ -3065,7 +3111,7 @@ fieldset.fields__media-edit .fields__media-edit-expanded.is-empty .components-dr
 fieldset.fields__media-edit .fields__media-edit-expanded .fields__media-edit-expanded-preview {
   position: relative;
   width: 100%;
-  aspect-ratio: var(--fields-media-edit-expanded-multiple-aspect-ratio, 3/2);
+  aspect-ratio: 3/2;
   border-radius: 2px;
   padding: 4px;
   overflow: hidden;
@@ -3148,13 +3194,22 @@ fieldset.fields__media-edit .fields__media-edit-expanded.is-empty .fields__media
 }
 
 fieldset.fields__media-edit .fields__media-edit-expanded.is-multiple:not(.is-empty) {
-  grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
+  grid-template-columns: repeat(3, 1fr);
   /* stylelint-disable-next-line property-no-unknown -- '@container' not globally permitted */
 }
 
-@container (max-width: 500px) {
+@container (max-width: 768px) {
   fieldset.fields__media-edit .fields__media-edit-expanded.is-multiple:not(.is-empty) {
-    grid-template-columns: repeat(auto-fill, minmax(105px, 1fr));
+    grid-template-columns: repeat(2, 1fr);
+  }
+}
+fieldset.fields__media-edit .fields__media-edit-expanded.is-multiple:not(.is-empty) {
+  /* stylelint-disable-next-line property-no-unknown -- '@container' not globally permitted */
+}
+
+@container (max-width: 280px) {
+  fieldset.fields__media-edit .fields__media-edit-expanded.is-multiple:not(.is-empty) {
+    grid-template-columns: 1fr;
   }
 }
 fieldset.fields__media-edit .fields__media-edit-expanded:not(.is-empty) .fields__media-edit-picker-button {
@@ -3165,7 +3220,7 @@ fieldset.fields__media-edit .fields__media-edit-expanded:not(.is-empty) .fields_
   display: flex;
   align-items: center;
   justify-content: center;
-  aspect-ratio: var(--fields-media-edit-expanded-multiple-aspect-ratio, 3/2);
+  aspect-ratio: 3/2;
 }
 
 .fields-controls__slug {
@@ -3712,6 +3767,7 @@ button.font-library__upload-area {
   background: #fff;
   padding: 12px;
   border-top: 1px solid #ddd;
+  box-sizing: border-box;
 }
 
 .global-styles-ui-variations_item {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "6.40.2-next.v.202602241322.0+bce7cff88",
+	"version": "6.40.2",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -48,50 +48,50 @@
 	],
 	"dependencies": {
 		"@react-spring/web": "^9.4.5",
-		"@wordpress/a11y": "^4.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/admin-ui": "^1.8.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/api-fetch": "^7.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/base-styles": "^6.16.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/blob": "^4.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/block-editor": "^15.13.2-next.v.202602241322.0+bce7cff88",
-		"@wordpress/block-library": "^9.40.2-next.v.202602241322.0+bce7cff88",
-		"@wordpress/blocks": "^15.13.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/commands": "^1.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/components": "^32.3.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/compose": "^7.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/core-data": "^7.40.2-next.v.202602241322.0+bce7cff88",
-		"@wordpress/data": "^10.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/dataviews": "^12.1.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/date": "^5.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/deprecated": "^4.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/dom": "^4.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/editor": "^14.40.2-next.v.202602241322.0+bce7cff88",
-		"@wordpress/element": "^6.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/escape-html": "^3.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/fields": "^0.32.2-next.v.202602241322.0+bce7cff88",
-		"@wordpress/global-styles-engine": "^1.7.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/global-styles-ui": "^1.7.2-next.v.202602241322.0+bce7cff88",
-		"@wordpress/hooks": "^4.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/html-entities": "^4.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/i18n": "^6.13.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/icons": "^11.7.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/keyboard-shortcuts": "^5.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/keycodes": "^4.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/media-utils": "^5.40.2-next.v.202602241322.0+bce7cff88",
-		"@wordpress/notices": "^5.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/patterns": "^2.40.2-next.v.202602241322.0+bce7cff88",
-		"@wordpress/plugins": "^7.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/preferences": "^4.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/primitives": "^4.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/private-apis": "^1.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/reusable-blocks": "^5.40.2-next.v.202602241322.0+bce7cff88",
-		"@wordpress/router": "^1.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/style-engine": "^2.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/url": "^4.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/viewport": "^6.40.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/views": "^1.7.1-next.v.202602241322.0+bce7cff88",
-		"@wordpress/widgets": "^4.40.2-next.v.202602241322.0+bce7cff88",
-		"@wordpress/wordcount": "^4.40.1-next.v.202602241322.0+bce7cff88",
+		"@wordpress/a11y": "^4.40.1",
+		"@wordpress/admin-ui": "^1.8.1",
+		"@wordpress/api-fetch": "^7.40.1",
+		"@wordpress/base-styles": "^6.16.1",
+		"@wordpress/blob": "^4.40.1",
+		"@wordpress/block-editor": "^15.13.2",
+		"@wordpress/block-library": "^9.40.2",
+		"@wordpress/blocks": "^15.13.1",
+		"@wordpress/commands": "^1.40.1",
+		"@wordpress/components": "^32.2.1",
+		"@wordpress/compose": "^7.40.1",
+		"@wordpress/core-data": "^7.40.2",
+		"@wordpress/data": "^10.40.1",
+		"@wordpress/dataviews": "^12.0.1",
+		"@wordpress/date": "^5.40.1",
+		"@wordpress/deprecated": "^4.40.1",
+		"@wordpress/dom": "^4.40.1",
+		"@wordpress/editor": "^14.40.2",
+		"@wordpress/element": "^6.40.1",
+		"@wordpress/escape-html": "^3.40.1",
+		"@wordpress/fields": "^0.32.2",
+		"@wordpress/global-styles-engine": "^1.7.1",
+		"@wordpress/global-styles-ui": "^1.7.2",
+		"@wordpress/hooks": "^4.40.1",
+		"@wordpress/html-entities": "^4.40.1",
+		"@wordpress/i18n": "^6.13.1",
+		"@wordpress/icons": "^11.7.1",
+		"@wordpress/keyboard-shortcuts": "^5.40.1",
+		"@wordpress/keycodes": "^4.40.1",
+		"@wordpress/media-utils": "^5.40.2",
+		"@wordpress/notices": "^5.40.1",
+		"@wordpress/patterns": "^2.40.2",
+		"@wordpress/plugins": "^7.40.1",
+		"@wordpress/preferences": "^4.40.1",
+		"@wordpress/primitives": "^4.40.1",
+		"@wordpress/private-apis": "^1.40.1",
+		"@wordpress/reusable-blocks": "^5.40.2",
+		"@wordpress/router": "^1.40.1",
+		"@wordpress/style-engine": "^2.40.1",
+		"@wordpress/url": "^4.40.1",
+		"@wordpress/viewport": "^6.40.1",
+		"@wordpress/views": "^1.7.1",
+		"@wordpress/widgets": "^4.40.2",
+		"@wordpress/wordcount": "^4.40.1",
 		"change-case": "^4.1.2",
 		"clsx": "^2.1.1",
 		"colord": "^2.9.2",
@@ -106,5 +106,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "943dde7f0b600ce238726c36284bc9f70ce0ffa4"
+	"gitHead": "adb6623c9f32490cfc73c7ac7f122578c1f10c65"
 }

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

@@ -202,11 +202,12 @@ export default function DataviewsPatterns() {
 			<Page
 				className="edit-site-page-patterns-dataviews"
 				title={ title }
+				headingLevel={ 2 }
 				subTitle={ description }
 				actions={
 					<PatternsActions
 						categoryId={ categoryId }
-						postType={ postType }
+						type={ postType }
 					/>
 				}
 			>

package/src/components/page-patterns/use-pattern-settings.js

@@ -4,6 +4,7 @@
 import { store as coreStore } from '@wordpress/core-data';
 import { useSelect } from '@wordpress/data';
 import { useMemo } from '@wordpress/element';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 import { privateApis as editorPrivateApis } from '@wordpress/editor';
 import { generateGlobalStyles } from '@wordpress/global-styles-engine';
 
@@ -15,6 +16,7 @@ import { store as editSiteStore } from '../../store';
 import { filterOutDuplicatesByName } from './utils';
 
 const { useGlobalStyles } = unlock( editorPrivateApis );
+const { globalStylesDataKey } = unlock( blockEditorPrivateApis );
 
 export default function usePatternSettings() {
 	/*
@@ -62,14 +64,26 @@ export default function usePatternSettings() {
 			...restStoredSettings
 		} = storedSettings;
 
+		// Preserve non-global styles from settings.styles (e.g., editor styles from add_editor_style)
+		const nonGlobalStyles = ( styles ?? [] ).filter(
+			( style ) => ! style.isGlobalStyles
+		);
+
 		return {
 			...restStoredSettings,
-			styles: globalStyles,
+			styles: [ ...nonGlobalStyles, ...globalStyles ],
 			__experimentalFeatures: globalSettings,
+			[ globalStylesDataKey ]: mergedConfig.styles ?? {},
 			__experimentalBlockPatterns: blockPatterns,
 			isPreviewMode: true,
 		};
-	}, [ storedSettings, blockPatterns, globalStyles, globalSettings ] );
+	}, [
+		storedSettings,
+		blockPatterns,
+		globalStyles,
+		globalSettings,
+		mergedConfig,
+	] );
 
 	return settings;
 }

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

@@ -133,6 +133,7 @@ export default function PageTemplates() {
 		<Page
 			className="edit-site-page-templates"
 			title={ __( 'Templates' ) }
+			headingLevel={ 2 }
 			actions={ <AddNewTemplate /> }
 		>
 			<DataViews

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

@@ -325,6 +325,7 @@ export default function PageTemplates() {
 		<Page
 			className="edit-site-page-templates"
 			title={ __( 'Templates' ) }
+			headingLevel={ 2 }
 			actions={ <AddNewTemplate /> }
 		>
 			<DataViews

package/src/components/page-templates/view-utils.js

@@ -41,8 +41,9 @@ export function getActiveViewOverridesForTab( activeView ) {
 		filters: [
 			{
 				field: 'author',
-				operator: 'isAny',
-				value: [ activeView ],
+				operator: 'is',
+				value: activeView,
+				isLocked: true,
 			},
 		],
 	};