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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "6.40.2-next.v.202602271551.0+464abe399",
+	"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.202602271551.0+464abe399",
-		"@wordpress/admin-ui": "^1.8.1-next.v.202602271551.0+464abe399",
-		"@wordpress/api-fetch": "^7.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/base-styles": "^6.16.1-next.v.202602271551.0+464abe399",
-		"@wordpress/blob": "^4.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/block-editor": "^15.13.2-next.v.202602271551.0+464abe399",
-		"@wordpress/block-library": "^9.40.2-next.v.202602271551.0+464abe399",
-		"@wordpress/blocks": "^15.13.1-next.v.202602271551.0+464abe399",
-		"@wordpress/commands": "^1.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/components": "^32.3.1-next.v.202602271551.0+464abe399",
-		"@wordpress/compose": "^7.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/core-data": "^7.40.2-next.v.202602271551.0+464abe399",
-		"@wordpress/data": "^10.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/dataviews": "^12.1.1-next.v.202602271551.0+464abe399",
-		"@wordpress/date": "^5.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/deprecated": "^4.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/dom": "^4.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/editor": "^14.40.2-next.v.202602271551.0+464abe399",
-		"@wordpress/element": "^6.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/escape-html": "^3.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/fields": "^0.32.2-next.v.202602271551.0+464abe399",
-		"@wordpress/global-styles-engine": "^1.7.1-next.v.202602271551.0+464abe399",
-		"@wordpress/global-styles-ui": "^1.7.2-next.v.202602271551.0+464abe399",
-		"@wordpress/hooks": "^4.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/html-entities": "^4.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/i18n": "^6.13.1-next.v.202602271551.0+464abe399",
-		"@wordpress/icons": "^11.7.1-next.v.202602271551.0+464abe399",
-		"@wordpress/keyboard-shortcuts": "^5.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/keycodes": "^4.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/media-utils": "^5.40.2-next.v.202602271551.0+464abe399",
-		"@wordpress/notices": "^5.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/patterns": "^2.40.2-next.v.202602271551.0+464abe399",
-		"@wordpress/plugins": "^7.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/preferences": "^4.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/primitives": "^4.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/private-apis": "^1.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/reusable-blocks": "^5.40.2-next.v.202602271551.0+464abe399",
-		"@wordpress/router": "^1.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/style-engine": "^2.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/url": "^4.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/viewport": "^6.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/views": "^1.7.1-next.v.202602271551.0+464abe399",
-		"@wordpress/widgets": "^4.40.2-next.v.202602271551.0+464abe399",
-		"@wordpress/wordcount": "^4.40.1-next.v.202602271551.0+464abe399",
+		"@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": "95aa7055a5757219e2d96a91efc69f7dd1b2d4c3"
+	"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,
 			},
 		],
 	};

package/src/components/post-list/index.js

@@ -274,6 +274,7 @@ export default function PostList( { postType } ) {
 	return (
 		<Page
 			title={ labels?.name }
+			headingLevel={ 2 }
 			actions={
 				<>
 					{ labels?.add_new_item && canCreateRecord && (

package/src/components/post-list/view-utils.js

@@ -19,7 +19,15 @@ import {
 import { OPERATOR_IS_ANY } from '../../utils/constants';
 
 export const defaultLayouts = {
-	table: {},
+	table: {
+		layout: {
+			styles: {
+				author: {
+					align: 'start',
+				},
+			},
+		},
+	},
 	grid: {},
 	list: {},
 };
@@ -158,11 +166,15 @@ const SLUG_TO_STATUS = {
 };
 
 export function getActiveViewOverridesForTab( activeView ) {
+	const base = {
+		...defaultLayouts.table,
+	};
 	const status = SLUG_TO_STATUS[ activeView ];
 	if ( ! status ) {
-		return {};
+		return base;
 	}
 	return {
+		...base,
 		filters: [
 			{
 				field: 'status',

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

@@ -97,6 +97,7 @@ export default function SidebarGlobalStyles() {
 			}
 			className="edit-site-styles"
 			title={ __( 'Styles' ) }
+			headingLevel={ 2 }
 		>
 			<GlobalStylesUIWrapper
 				path={ section }

package/src/components/site-editor-routes/stylebook.js

@@ -33,12 +33,18 @@ export const stylebookRoute = {
 		},
 		preview( { siteData } ) {
 			return isClassicThemeWithStyleBookSupport( siteData ) ? (
-				<StyleBookPreview isStatic />
+				<StyleBookPreview
+					isStatic
+					settings={ siteData.editorSettings }
+				/>
 			) : undefined;
 		},
 		mobile( { siteData } ) {
 			return isClassicThemeWithStyleBookSupport( siteData ) ? (
-				<StyleBookPreview isStatic />
+				<StyleBookPreview
+					isStatic
+					settings={ siteData.editorSettings }
+				/>
 			) : undefined;
 		},
 	},

package/src/index.js

@@ -73,6 +73,8 @@ export function initializeEditor( id, settings ) {
 		showBlockBreadcrumbs: true,
 		showListViewByDefault: false,
 		enableChoosePatternModal: true,
+		showCollaborationCursor: false,
+		showCollaborationNotifications: true,
 	} );
 
 	if ( window.__clientSideMediaProcessing ) {