@wordpress/editor 14.36.1-next.8b30e05b0.0 → 14.37.0

package/build-types/dataviews/store/private-actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"private-actions.d.ts","sourceRoot":"","sources":["../../../src/dataviews/store/private-actions.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AA0C1D,OAAO,CAAC,MAAM,CAAC;IACd,UAAU,MAAM;QACf,8BAA8B,CAAC,EAAE,OAAO,CAAC;KACzC;CACD;AAED,wBAAgB,oBAAoB,CAAE,IAAI,EACzC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,CAAE,IAAI,CAAE;;;;;EAQtB;AAED,wBAAgB,sBAAsB,CACrC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM;;;;;EAQhB;AAED,wBAAgB,mBAAmB,CAAE,IAAI,EACxC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,KAAK,CAAE,IAAI,CAAE;;;;;EAQrB;AAED,wBAAgB,qBAAqB,CACpC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM;;;;;EAQf;AAED,wBAAgB,UAAU,CAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;;;;EAMrD;AAED,eAAO,MAAM,sBAAsB,GAChC,UAAU,MAAM,MACV,cAAc;IAAE,QAAQ,EAAE,GAAG,CAAA;CAAE,kBAmItC,CAAC"}
+{"version":3,"file":"private-actions.d.ts","sourceRoot":"","sources":["../../../src/dataviews/store/private-actions.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AA2C1D,OAAO,CAAC,MAAM,CAAC;IACd,UAAU,MAAM;QACf,8BAA8B,CAAC,EAAE,OAAO,CAAC;KACzC;CACD;AAgBD,wBAAgB,oBAAoB,CAAE,IAAI,EACzC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,CAAE,IAAI,CAAE;;;;;EAQtB;AAED,wBAAgB,sBAAsB,CACrC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM;;;;;EAQhB;AAED,wBAAgB,mBAAmB,CAAE,IAAI,EACxC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,KAAK,CAAE,IAAI,CAAE;;;;;EAQrB;AAED,wBAAgB,qBAAqB,CACpC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM;;;;;EAQf;AAED,wBAAgB,UAAU,CAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;;;;EAMrD;AAED,eAAO,MAAM,sBAAsB,GAChC,UAAU,MAAM,MACV,cAAc;IAAE,QAAQ,EAAE,GAAG,CAAA;CAAE,kBAoItC,CAAC"}

package/build-types/store/utils/notice-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"notice-builder.d.ts","sourceRoot":"","sources":["../../../src/store/utils/notice-builder.js"],"names":[],"mappings":"AAKA;;;;;;;GAOG;AACH,6DALW,MAAM,SA+DhB;AAED;;;;;;;GAOG;AACH,0DALW,MAAM,SAuDhB;AAED;;;;;;GAMG;AACH,2DAJW,MAAM,SAahB"}
+{"version":3,"file":"notice-builder.d.ts","sourceRoot":"","sources":["../../../src/store/utils/notice-builder.js"],"names":[],"mappings":"AAKA;;;;;;;GAOG;AACH,6DALW,MAAM,SA+DhB;AAED;;;;;;;GAOG;AACH,0DALW,MAAM,SA+DhB;AAED;;;;;;GAMG;AACH,2DAJW,MAAM,SAahB"}

package/build-types/utils/get-template-part-icon.d.ts

@@ -1,9 +1,9 @@
 /**
- * Helper function to retrieve the corresponding icon by name.
+ * Helper function to retrieve the corresponding icon by area name or icon name.
  *
- * @param {string} iconName The name of the icon.
+ * @param {string} areaOrIconName The area name (e.g., 'header', 'overlay') or icon name (e.g., 'menu').
  *
  * @return {Object} The corresponding icon.
  */
-export function getTemplatePartIcon(iconName: string): Object;
+export function getTemplatePartIcon(areaOrIconName: string): Object;
 //# sourceMappingURL=get-template-part-icon.d.ts.map

package/build-types/utils/get-template-part-icon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-template-part-icon.d.ts","sourceRoot":"","sources":["../../src/utils/get-template-part-icon.js"],"names":[],"mappings":"AASA;;;;;;GAMG;AACH,8CAJW,MAAM,GAEL,MAAM,CAWjB"}
+{"version":3,"file":"get-template-part-icon.d.ts","sourceRoot":"","sources":["../../src/utils/get-template-part-icon.js"],"names":[],"mappings":"AAWA;;;;;;GAMG;AACH,oDAJW,MAAM,GAEL,MAAM,CAsBjB"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/editor",
-	"version": "14.36.1-next.8b30e05b0.0",
+	"version": "14.37.0",
 	"description": "Enhanced block editor for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -53,44 +53,44 @@
 	],
 	"dependencies": {
 		"@floating-ui/react-dom": "2.0.8",
-		"@wordpress/a11y": "^4.36.1-next.8b30e05b0.0",
-		"@wordpress/api-fetch": "^7.36.1-next.8b30e05b0.0",
-		"@wordpress/base-styles": "^6.12.1-next.8b30e05b0.0",
-		"@wordpress/blob": "^4.36.1-next.8b30e05b0.0",
-		"@wordpress/block-editor": "^15.9.1-next.8b30e05b0.0",
-		"@wordpress/blocks": "^15.9.1-next.8b30e05b0.0",
-		"@wordpress/commands": "^1.36.1-next.8b30e05b0.0",
-		"@wordpress/components": "^30.9.1-next.8b30e05b0.0",
-		"@wordpress/compose": "^7.36.1-next.8b30e05b0.0",
-		"@wordpress/core-data": "^7.36.1-next.8b30e05b0.0",
-		"@wordpress/data": "^10.36.1-next.8b30e05b0.0",
-		"@wordpress/dataviews": "^11.0.1-next.8b30e05b0.0",
-		"@wordpress/date": "^5.36.1-next.8b30e05b0.0",
-		"@wordpress/deprecated": "^4.36.1-next.8b30e05b0.0",
-		"@wordpress/dom": "^4.36.1-next.8b30e05b0.0",
-		"@wordpress/element": "^6.36.1-next.8b30e05b0.0",
-		"@wordpress/fields": "^0.28.1-next.8b30e05b0.0",
-		"@wordpress/global-styles-engine": "^1.3.1-next.8b30e05b0.0",
-		"@wordpress/global-styles-ui": "^1.3.1-next.8b30e05b0.0",
-		"@wordpress/hooks": "^4.36.1-next.8b30e05b0.0",
-		"@wordpress/html-entities": "^4.36.1-next.8b30e05b0.0",
-		"@wordpress/i18n": "^6.9.1-next.8b30e05b0.0",
-		"@wordpress/icons": "^11.3.1-next.8b30e05b0.0",
-		"@wordpress/interface": "^9.21.1-next.8b30e05b0.0",
-		"@wordpress/keyboard-shortcuts": "^5.36.1-next.8b30e05b0.0",
-		"@wordpress/keycodes": "^4.36.1-next.8b30e05b0.0",
-		"@wordpress/media-utils": "^5.36.1-next.8b30e05b0.0",
-		"@wordpress/notices": "^5.36.1-next.8b30e05b0.0",
-		"@wordpress/patterns": "^2.36.1-next.8b30e05b0.0",
-		"@wordpress/plugins": "^7.36.1-next.8b30e05b0.0",
-		"@wordpress/preferences": "^4.36.1-next.8b30e05b0.0",
-		"@wordpress/private-apis": "^1.36.1-next.8b30e05b0.0",
-		"@wordpress/reusable-blocks": "^5.36.1-next.8b30e05b0.0",
-		"@wordpress/rich-text": "^7.36.1-next.8b30e05b0.0",
-		"@wordpress/server-side-render": "^6.12.1-next.8b30e05b0.0",
-		"@wordpress/url": "^4.36.1-next.8b30e05b0.0",
-		"@wordpress/warning": "^3.36.1-next.8b30e05b0.0",
-		"@wordpress/wordcount": "^4.36.1-next.8b30e05b0.0",
+		"@wordpress/a11y": "^4.37.0",
+		"@wordpress/api-fetch": "^7.37.0",
+		"@wordpress/base-styles": "^6.13.0",
+		"@wordpress/blob": "^4.37.0",
+		"@wordpress/block-editor": "^15.10.0",
+		"@wordpress/blocks": "^15.10.0",
+		"@wordpress/commands": "^1.37.0",
+		"@wordpress/components": "^31.0.0",
+		"@wordpress/compose": "^7.37.0",
+		"@wordpress/core-data": "^7.37.0",
+		"@wordpress/data": "^10.37.0",
+		"@wordpress/dataviews": "^11.1.0",
+		"@wordpress/date": "^5.37.0",
+		"@wordpress/deprecated": "^4.37.0",
+		"@wordpress/dom": "^4.37.0",
+		"@wordpress/element": "^6.37.0",
+		"@wordpress/fields": "^0.29.0",
+		"@wordpress/global-styles-engine": "^1.4.0",
+		"@wordpress/global-styles-ui": "^1.4.0",
+		"@wordpress/hooks": "^4.37.0",
+		"@wordpress/html-entities": "^4.37.0",
+		"@wordpress/i18n": "^6.10.0",
+		"@wordpress/icons": "^11.4.0",
+		"@wordpress/interface": "^9.22.0",
+		"@wordpress/keyboard-shortcuts": "^5.37.0",
+		"@wordpress/keycodes": "^4.37.0",
+		"@wordpress/media-utils": "^5.37.0",
+		"@wordpress/notices": "^5.37.0",
+		"@wordpress/patterns": "^2.37.0",
+		"@wordpress/plugins": "^7.37.0",
+		"@wordpress/preferences": "^4.37.0",
+		"@wordpress/private-apis": "^1.37.0",
+		"@wordpress/reusable-blocks": "^5.37.0",
+		"@wordpress/rich-text": "^7.37.0",
+		"@wordpress/server-side-render": "^6.13.0",
+		"@wordpress/url": "^4.37.0",
+		"@wordpress/warning": "^3.37.0",
+		"@wordpress/wordcount": "^4.37.0",
 		"change-case": "^4.1.2",
 		"client-zip": "^2.4.5",
 		"clsx": "^2.1.1",
@@ -108,5 +108,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "2466f6bc223f8be98c55e1ac7270e8c3e413eaaf"
+	"gitHead": "2cf13ec6cf86153c9b3cf369bf5c59046f5cd950"
 }

package/src/components/autocompleters/user.js

@@ -5,6 +5,12 @@ import { useMemo } from '@wordpress/element';
 import { useSelect } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
 
+/**
+ * Renders a user label for the autocompleter.
+ *
+ * @param {Object} user User object.
+ * @return {JSX.Element} User label component.
+ */
 export function getUserLabel( user ) {
 	const avatar =
 		user.avatar_urls && user.avatar_urls[ 24 ] ? (

package/src/components/collab-sidebar/comments.js

@@ -70,28 +70,22 @@ export function Comments( {
 		useDispatch( blockEditorStore )
 	);
 
-	const {
-		blockCommentId,
-		selectedBlockClientId,
-		orderedBlockIds,
-		blockMode,
-	} = useSelect( ( select ) => {
-		const {
-			getBlockAttributes,
-			getSelectedBlockClientId,
-			getClientIdsWithDescendants,
-			getBlockMode,
-		} = select( blockEditorStore );
-		const clientId = getSelectedBlockClientId();
-		return {
-			blockCommentId: clientId
-				? getBlockAttributes( clientId )?.metadata?.noteId
-				: null,
-			selectedBlockClientId: clientId,
-			orderedBlockIds: getClientIdsWithDescendants(),
-			blockMode: clientId ? getBlockMode( clientId ) : null,
-		};
-	}, [] );
+	const { blockCommentId, selectedBlockClientId, orderedBlockIds } =
+		useSelect( ( select ) => {
+			const {
+				getBlockAttributes,
+				getSelectedBlockClientId,
+				getClientIdsWithDescendants,
+			} = select( blockEditorStore );
+			const clientId = getSelectedBlockClientId();
+			return {
+				blockCommentId: clientId
+					? getBlockAttributes( clientId )?.metadata?.noteId
+					: null,
+				selectedBlockClientId: clientId,
+				orderedBlockIds: getClientIdsWithDescendants(),
+			};
+		}, [] );
 
 	const relatedBlockElement = useBlockElement( selectedBlockClientId );
 
@@ -318,7 +312,6 @@ export function Comments( {
 		threads,
 		selectedThread,
 		setCanvasMinHeight,
-		blockMode,
 	] );
 
 	const handleThreadNavigation = ( event, thread, isSelected ) => {

package/src/components/collab-sidebar/hooks.js

@@ -14,7 +14,6 @@ import { __ } from '@wordpress/i18n';
 import {
 	useEffect,
 	useMemo,
-	useRef,
 	useCallback,
 	useReducer,
 } from '@wordpress/element';
@@ -36,9 +35,7 @@ import { collabSidebarName } from './constants';
 import { unlock } from '../../lock-unlock';
 import { noop } from './utils';
 
-const { useBlockElementRef, cleanEmptyObject } = unlock(
-	blockEditorPrivateApis
-);
+const { useBlockElement, cleanEmptyObject } = unlock( blockEditorPrivateApis );
 
 export function useBlockComments( postId ) {
 	const [ commentLastUpdated, reflowComments ] = useReducer(
@@ -369,20 +366,7 @@ export function useFloatingThread( {
 	setBlockRef,
 	commentLastUpdated,
 } ) {
-	const blockRef = useRef();
-	useBlockElementRef( thread.blockClientId, blockRef );
-
-	const blockMode = useSelect(
-		( select ) => {
-			return thread.blockClientId
-				? select( blockEditorStore ).getBlockMode(
-						thread.blockClientId
-				  )
-				: null;
-		},
-		[ thread.blockClientId ]
-	);
-
+	const blockElement = useBlockElement( thread.blockClientId );
 	const updateHeight = useCallback(
 		( id, newHeight ) => {
 			setHeights( ( prev ) => {
@@ -408,17 +392,17 @@ export function useFloatingThread( {
 
 	// Store the block reference for each thread.
 	useEffect( () => {
-		if ( blockRef.current ) {
-			refs.setReference( blockRef.current );
+		if ( blockElement ) {
+			refs.setReference( blockElement );
 		}
-	}, [ blockRef, refs, commentLastUpdated, blockMode ] );
+	}, [ blockElement, refs, commentLastUpdated ] );
 
 	// Track thread heights.
 	useEffect( () => {
 		if ( refs.floating?.current ) {
-			setBlockRef( thread.id, blockRef.current );
+			setBlockRef( thread.id, blockElement );
 		}
-	}, [ thread.id, refs.floating, setBlockRef ] );
+	}, [ blockElement, thread.id, refs.floating, setBlockRef ] );
 
 	// When the selected thread changes, update heights, triggering offset recalculation.
 	useEffect( () => {
@@ -435,7 +419,6 @@ export function useFloatingThread( {
 	] );
 
 	return {
-		blockRef,
 		y,
 		refs,
 	};

package/src/components/document-bar/index.js

@@ -14,7 +14,7 @@ import {
 	__unstableMotion as motion,
 	__unstableAnimatePresence as AnimatePresence,
 } from '@wordpress/components';
-import { BlockIcon } from '@wordpress/block-editor';
+import { BlockIcon, store as blockEditorStore } from '@wordpress/block-editor';
 import { chevronLeftSmall, chevronRightSmall, layout } from '@wordpress/icons';
 import { displayShortcut } from '@wordpress/keycodes';
 import { store as coreStore } from '@wordpress/core-data';
@@ -33,6 +33,7 @@ import usePageTypeBadge from '../../utils/pageTypeBadge';
 import { getTemplateInfo } from '../../utils/get-template-info';
 import { getStylesCanvasTitle } from '../styles-canvas';
 import { unlock } from '../../lock-unlock';
+import useEditedSectionDetails from './useEditedSectionDetails';
 
 /** @typedef {import("@wordpress/components").IconType} IconType */
 
@@ -56,6 +57,14 @@ const MotionButton = motion.create( Button );
  * @return {React.ReactNode} The rendered DocumentBar component.
  */
 export default function DocumentBar( props ) {
+	// Get action to lock the pattern design
+	const { stopEditingContentOnlySection } = unlock(
+		useDispatch( blockEditorStore )
+	);
+
+	// Get details about the currently edited content-only section
+	const unlockedPatternInfo = useEditedSectionDetails();
+
 	const {
 		postId,
 		postType,
@@ -133,11 +142,28 @@ export default function DocumentBar( props ) {
 	const isReducedMotion = useReducedMotion();
 
 	const isTemplate = TEMPLATE_POST_TYPES.includes( postType );
-	const hasBackButton = !! onNavigateToPreviousEntityRecord;
+	const hasBackButton =
+		!! onNavigateToPreviousEntityRecord || !! unlockedPatternInfo;
 	const entityTitle = isTemplate ? templateTitle : documentTitle;
-	const title = props.title || stylesCanvasTitle || entityTitle;
+
+	// Use pattern info if a pattern block is unlocked, otherwise use document/entity info
+	const title =
+		unlockedPatternInfo?.patternTitle ||
+		props.title ||
+		stylesCanvasTitle ||
+		entityTitle;
 	const icon = props.icon;
 
+	// Determine the back button action
+	const handleBackClick = ( event ) => {
+		event.stopPropagation();
+		if ( unlockedPatternInfo ) {
+			stopEditingContentOnlySection();
+		} else if ( onNavigateToPreviousEntityRecord ) {
+			onNavigateToPreviousEntityRecord();
+		}
+	};
+
 	const pageTypeBadge = usePageTypeBadge( postId );
 
 	const mountedRef = useRef( false );
@@ -156,10 +182,7 @@ export default function DocumentBar( props ) {
 					<MotionButton
 						className="editor-document-bar__back"
 						icon={ isRTL() ? chevronRightSmall : chevronLeftSmall }
-						onClick={ ( event ) => {
-							event.stopPropagation();
-							onNavigateToPreviousEntityRecord();
-						} }
+						onClick={ handleBackClick }
 						size="compact"
 						initial={
 							mountedRef.current
@@ -219,12 +242,21 @@ export default function DocumentBar( props ) {
 									? stripHTML( title )
 									: __( 'No title' ) }
 							</span>
-							{ pageTypeBadge && (
+							{ unlockedPatternInfo && (
+								<span className="editor-document-bar__post-type-label">
+									{ unlockedPatternInfo.type ===
+									'template-part'
+										? `· ${ __( 'Template Part' ) }`
+										: `· ${ __( 'Pattern' ) }` }
+								</span>
+							) }
+							{ ! unlockedPatternInfo && pageTypeBadge && (
 								<span className="editor-document-bar__post-type-label">
 									{ `· ${ pageTypeBadge }` }
 								</span>
 							) }
-							{ postTypeLabel &&
+							{ ! unlockedPatternInfo &&
+								postTypeLabel &&
 								! props.title &&
 								! pageTypeBadge && (
 									<span className="editor-document-bar__post-type-label">

package/src/components/document-bar/useEditedSectionDetails.js

@@ -0,0 +1,103 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { decodeEntities } from '@wordpress/html-entities';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+import { store as coreStore } from '@wordpress/core-data';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+/**
+ * Hook to get details about the currently edited content-only section.
+ * Only returns information when the content only pattern insertion experiment is enabled.
+ *
+ * @return {Object|null} Object with patternName, patternTitle, and type, or null if no section is being edited or experiment is disabled.
+ */
+export default function useEditedSectionDetails() {
+	return useSelect( ( select ) => {
+		// Only run when the content only pattern insertion experiment is enabled
+		if ( ! window?.__experimentalContentOnlyPatternInsertion ) {
+			return null;
+		}
+
+		const {
+			getBlockAttributes,
+			getBlockName,
+			__experimentalGetParsedPattern,
+		} = select( blockEditorStore );
+		const { getEditedEntityRecord, getCurrentTheme } = select( coreStore );
+		const { getEditedContentOnlySection } = unlock(
+			select( blockEditorStore )
+		);
+
+		// Get the clientId of the unlocked pattern/section
+		const editedSectionId = getEditedContentOnlySection();
+		if ( ! editedSectionId ) {
+			return null;
+		}
+
+		const attributes = getBlockAttributes( editedSectionId );
+
+		// Handle unsynced patterns (contentOnly patterns with patternName)
+		const patternName = attributes?.metadata?.patternName;
+		if ( patternName ) {
+			// Get pattern details if available
+			const pattern =
+				typeof __experimentalGetParsedPattern === 'function'
+					? __experimentalGetParsedPattern( patternName )
+					: null;
+
+			return {
+				patternName,
+				patternTitle: pattern?.title || attributes?.metadata?.name,
+				type: 'pattern',
+			};
+		}
+
+		const blockName = getBlockName( editedSectionId );
+
+		// Handle synced patterns (core/block)
+		if ( blockName === 'core/block' && !! attributes?.ref ) {
+			const entity = getEditedEntityRecord(
+				'postType',
+				'wp_block',
+				attributes.ref
+			);
+			if ( entity?.title ) {
+				return {
+					patternName: attributes.ref,
+					patternTitle: decodeEntities( entity.title ),
+					type: 'synced-pattern',
+				};
+			}
+		}
+
+		// Handle template parts (core/template-part)
+		if ( blockName === 'core/template-part' && !! attributes?.slug ) {
+			const theme = attributes.theme || getCurrentTheme()?.stylesheet;
+			const templatePartId = theme
+				? `${ theme }//${ attributes.slug }`
+				: null;
+			if ( templatePartId ) {
+				const entity = getEditedEntityRecord(
+					'postType',
+					'wp_template_part',
+					templatePartId
+				);
+				if ( entity?.title ) {
+					return {
+						patternName: attributes.slug,
+						patternTitle: decodeEntities( entity.title ),
+						type: 'template-part',
+					};
+				}
+			}
+		}
+
+		return null;
+	}, [] );
+}

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

@@ -9,10 +9,6 @@
 	&__panel {
 		flex: 1;
 	}
-
-	.components-navigator-screen {
-		padding: 0;
-	}
 }
 
 .editor-global-styles-sidebar .editor-global-styles-sidebar__header-title {

package/src/components/page-attributes/parent.js

@@ -91,9 +91,10 @@ export function PageAttributesParent() {
 				_fields: 'id,title,parent',
 			};
 
-			// Perform a search when the field is changed.
+			// Perform a search by relevance when the field is changed.
 			if ( !! fieldValue ) {
 				query.search = fieldValue;
+				query.orderby = 'relevance';
 			}
 
 			const parentPost = pageId

package/src/components/post-card-panel/index.js

@@ -102,7 +102,7 @@ export default function PostCardPanel( {
 			<HStack
 				spacing={ 2 }
 				className="editor-post-card-panel__header"
-				align="flex-start"
+				alignment="flex-start"
 			>
 				<Icon className="editor-post-card-panel__icon" icon={ icon } />
 				<Text

package/src/components/post-publish-panel/maybe-tags-panel.js

@@ -40,7 +40,7 @@ const TagsPanel = () => {
 					tagLabel
 				) }
 			</p>
-			<FlatTermSelector slug="post_tag" __nextHasNoMarginBottom />
+			<FlatTermSelector slug="post_tag" />
 		</PanelBody>
 	);
 };

package/src/components/post-taxonomies/flat-term-selector.js

@@ -2,14 +2,13 @@
  * WordPress dependencies
  */
 import { __, _x, sprintf } from '@wordpress/i18n';
-import { Fragment, useEffect, useMemo, useState } from '@wordpress/element';
+import { useEffect, useMemo, useState } from '@wordpress/element';
 import {
 	FormTokenField,
 	withFilters,
 	__experimentalVStack as VStack,
 } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
-import deprecated from '@wordpress/deprecated';
 import { store as coreStore } from '@wordpress/core-data';
 import { useDebounce } from '@wordpress/compose';
 import { speak } from '@wordpress/a11y';
@@ -57,38 +56,19 @@ const termNamesToIds = ( names, terms ) => {
 		.filter( ( id ) => id !== undefined );
 };
 
-const Wrapper = ( { children, __nextHasNoMarginBottom } ) =>
-	__nextHasNoMarginBottom ? (
-		<VStack spacing={ 4 }>{ children }</VStack>
-	) : (
-		<Fragment>{ children }</Fragment>
-	);
-
 /**
  * Renders a flat term selector component.
  *
- * @param {Object}  props                         The component props.
- * @param {string}  props.slug                    The slug of the taxonomy.
- * @param {boolean} props.__nextHasNoMarginBottom Start opting into the new margin-free styles that will become the default in a future version, currently scheduled to be WordPress 7.0. (The prop can be safely removed once this happens.)
+ * @param {Object} props      The component props.
+ * @param {string} props.slug The slug of the taxonomy.
  *
  * @return {React.ReactNode} The rendered flat term selector component.
  */
-export function FlatTermSelector( { slug, __nextHasNoMarginBottom } ) {
+export function FlatTermSelector( { slug } ) {
 	const [ values, setValues ] = useState( [] );
 	const [ search, setSearch ] = useState( '' );
 	const debouncedSearch = useDebounce( setSearch, 500 );
 
-	if ( ! __nextHasNoMarginBottom ) {
-		deprecated(
-			'Bottom margin styles for wp.editor.PostTaxonomiesFlatTermSelector',
-			{
-				since: '6.7',
-				version: '7.0',
-				hint: 'Set the `__nextHasNoMarginBottom` prop to true to start opting into the new styles, which will become the default in a future version.',
-			}
-		);
-	}
-
 	const {
 		terms,
 		termIds,
@@ -300,7 +280,7 @@ export function FlatTermSelector( { slug, __nextHasNoMarginBottom } ) {
 	);
 
 	return (
-		<Wrapper __nextHasNoMarginBottom={ __nextHasNoMarginBottom }>
+		<VStack spacing={ 4 }>
 			<FormTokenField
 				__next40pxDefaultSize
 				value={ values }
@@ -314,10 +294,9 @@ export function FlatTermSelector( { slug, __nextHasNoMarginBottom } ) {
 					removed: termRemovedLabel,
 					remove: removeTermLabel,
 				} }
-				__nextHasNoMarginBottom={ __nextHasNoMarginBottom }
 			/>
 			<MostUsedTerms taxonomy={ taxonomy } onSelect={ appendTerm } />
-		</Wrapper>
+		</VStack>
 	);
 }
 

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

@@ -36,17 +36,11 @@ export function PostTaxonomies( { taxonomyWrapper = identity } ) {
 		const TaxonomyComponent = taxonomy.hierarchical
 			? HierarchicalTermSelector
 			: FlatTermSelector;
-		const taxonomyComponentProps = {
-			slug: taxonomy.slug,
-			...( taxonomy.hierarchical
-				? {}
-				: { __nextHasNoMarginBottom: true } ),
-		};
 
 		return (
 			<Fragment key={ `taxonomy-${ taxonomy.slug }` }>
 				{ taxonomyWrapper(
-					<TaxonomyComponent { ...taxonomyComponentProps } />,
+					<TaxonomyComponent slug={ taxonomy.slug } />,
 					taxonomy
 				) }
 			</Fragment>

package/src/components/provider/use-block-editor-settings.js

@@ -97,6 +97,7 @@ const {
 	sectionRootClientIdKey,
 	mediaEditKey,
 	getMediaSelectKey,
+	isIsolatedEditorKey,
 } = unlock( privateApis );
 
 /**
@@ -348,6 +349,13 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 				renderingMode === 'post-only' && postType !== 'wp_template'
 					? 'edit'
 					: undefined,
+			// When editing template parts, patterns, or navigation directly,
+			// we're in an isolated editing context (focused on that entity alone).
+			[ isIsolatedEditorKey ]: [
+				'wp_template_part',
+				'wp_block',
+				'wp_navigation',
+			].includes( postType ),
 		};
 
 		return blockEditorSettings;

package/src/components/style-book/index.js

@@ -597,12 +597,10 @@ export const StyleBookBody = ( {
 
 	const handleLoad = () => setHasIframeLoaded( true );
 	useLayoutEffect( () => {
-		if ( hasIframeLoaded && iframeRef?.current ) {
-			if ( goTo?.top ) {
-				scrollToSection( 'top', iframeRef?.current );
-			}
+		if ( hasIframeLoaded && iframeRef.current && goTo?.top ) {
+			scrollToSection( 'top', iframeRef.current );
 		}
-	}, [ iframeRef?.current, goTo, scrollToSection, hasIframeLoaded ] );
+	}, [ goTo?.top, hasIframeLoaded ] );
 
 	return (
 		<Iframe