@wordpress/editor 14.36.0 → 14.36.1-next.738bb1424.0

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

@@ -367,7 +367,6 @@ export function HierarchicalTermSelector( { slug } ) {
 					className="editor-post-taxonomies__hierarchical-terms-choice"
 				>
 					<CheckboxControl
-						__nextHasNoMarginBottom
 						checked={ terms.indexOf( term.id ) !== -1 }
 						onChange={ () => {
 							const termId = parseInt( term.id, 10 );
@@ -419,7 +418,6 @@ export function HierarchicalTermSelector( { slug } ) {
 			{ showFilter && ! loading && (
 				<SearchControl
 					__next40pxDefaultSize
-					__nextHasNoMarginBottom
 					label={ filterLabel }
 					placeholder={ filterLabel }
 					value={ filterValue }
@@ -465,7 +463,6 @@ export function HierarchicalTermSelector( { slug } ) {
 					<Flex direction="column" gap="4">
 						<TextControl
 							__next40pxDefaultSize
-							__nextHasNoMarginBottom
 							className="editor-post-taxonomies__hierarchical-terms-input"
 							label={ newTermLabel }
 							value={ formName }
@@ -475,7 +472,6 @@ export function HierarchicalTermSelector( { slug } ) {
 						{ !! availableTerms.length && (
 							<TreeSelect
 								__next40pxDefaultSize
-								__nextHasNoMarginBottom
 								label={ parentSelectLabel }
 								noOptionLabel={ noParentOption }
 								onChange={ onChangeFormParent }

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/post-template/classic-theme.js

@@ -160,7 +160,6 @@ function PostTemplateDropdownContent( { onClose } ) {
 			) : (
 				<SelectControl
 					__next40pxDefaultSize
-					__nextHasNoMarginBottom
 					hideLabelFromVision
 					label={ __( 'Template' ) }
 					value={ selectedOption?.value ?? '' }

package/src/components/post-template/create-new-template-modal.js

@@ -125,7 +125,6 @@ export default function CreateNewTemplateModal( { onClose } ) {
 				<VStack spacing="3">
 					<TextControl
 						__next40pxDefaultSize
-						__nextHasNoMarginBottom
 						label={ __( 'Name' ) }
 						value={ title }
 						onChange={ setTitle }

package/src/components/post-template/swap-template-button.js

@@ -82,7 +82,6 @@ function TemplatesList( { postType, onSelect } ) {
 	return (
 		<>
 			<SearchControl
-				__nextHasNoMarginBottom
 				onChange={ setSearchValue }
 				value={ searchValue }
 				label={ __( 'Search' ) }

package/src/components/post-title/post-title-raw.js

@@ -79,7 +79,6 @@ function PostTitleRaw( _, forwardedRef ) {
 			autoComplete="off"
 			dir="auto"
 			rows={ 1 }
-			__nextHasNoMarginBottom
 		/>
 	);
 }

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

@@ -83,7 +83,6 @@ export default function PostVisibility( { onClose } ) {
 						type="text"
 						id={ `editor-post-visibility__password-input-${ instanceId }` }
 						__next40pxDefaultSize
-						__nextHasNoMarginBottom
 						maxLength={ 255 }
 					/>
 				) }

package/src/components/provider/index.js

@@ -325,6 +325,8 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 				// Clear any notices dependent on the post context.
 				removeNotice( 'template-activate-notice' );
 			}
+
+			return () => setEditedPost( null, null );
 		}, [ post.type, post.id, setEditedPost, removeNotice ] );
 
 		// Synchronize the editor settings as they change.

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

@@ -97,6 +97,7 @@ const {
 	sectionRootClientIdKey,
 	mediaEditKey,
 	getMediaSelectKey,
+	isIsolatedEditorKey,
 } = unlock( privateApis );
 
 /**
@@ -258,6 +259,27 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 		[ saveEntityRecord, userCanCreatePages ]
 	);
 
+	const { getSelectedBlockClientId } = useSelect( blockEditorStore );
+
+	/**
+	 * Wraps onNavigateToEntityRecord to automatically include the currently selected block.
+	 * This ensures that navigation can restore the selection when returning to the previous entity.
+	 */
+	const wrappedOnNavigateToEntityRecord = useCallback(
+		( params ) => {
+			if ( ! settings.onNavigateToEntityRecord ) {
+				return;
+			}
+			const selectedBlockClientId = getSelectedBlockClientId();
+
+			return settings.onNavigateToEntityRecord( {
+				...params,
+				selectedBlockClientId,
+			} );
+		},
+		[ settings, getSelectedBlockClientId ]
+	);
+
 	const allowedBlockTypes = useMemo( () => {
 		// Omit hidden block types if exists and non-empty.
 		if ( hiddenBlockTypes && hiddenBlockTypes.length > 0 ) {
@@ -282,9 +304,12 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 	return useMemo( () => {
 		const blockEditorSettings = {
 			...Object.fromEntries(
-				Object.entries( settings ).filter( ( [ key ] ) =>
-					BLOCK_EDITOR_SETTINGS.includes( key )
-				)
+				Object.entries( settings )
+					.filter( ( [ key ] ) =>
+						BLOCK_EDITOR_SETTINGS.includes( key )
+					)
+					// Exclude onNavigateToEntityRecord since we're wrapping it
+					.filter( ( [ key ] ) => key !== 'onNavigateToEntityRecord' )
 			),
 			[ globalStylesDataKey ]: globalStylesData,
 			[ globalStylesLinksDataKey ]: globalStylesLinksData,
@@ -294,6 +319,9 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 			hasFixedToolbar,
 			isDistractionFree,
 			keepCaretInsideBlock,
+			onNavigateToEntityRecord: settings.onNavigateToEntityRecord
+				? wrappedOnNavigateToEntityRecord
+				: undefined,
 			[ getMediaSelectKey ]: ( select, attachmentId ) => {
 				return select( coreStore ).getEntityRecord(
 					'postType',
@@ -348,6 +376,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;
@@ -377,6 +412,7 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 		globalStylesLinksData,
 		renderingMode,
 		editMediaEntity,
+		wrappedOnNavigateToEntityRecord,
 	] );
 }
 

package/src/components/sidebar/header.js

@@ -5,6 +5,7 @@ import { privateApis as componentsPrivateApis } from '@wordpress/components';
 import { __, _x } from '@wordpress/i18n';
 import { useSelect } from '@wordpress/data';
 import { forwardRef } from '@wordpress/element';
+import { decodeEntities } from '@wordpress/html-entities';
 
 /**
  * Internal dependencies
@@ -16,15 +17,15 @@ import { sidebars } from './constants';
 const { Tabs } = unlock( componentsPrivateApis );
 
 const SidebarHeader = ( _, ref ) => {
-	const { documentLabel } = useSelect( ( select ) => {
-		const { getPostTypeLabel } = select( editorStore );
+	const postTypeLabel = useSelect(
+		( select ) => select( editorStore ).getPostTypeLabel(),
+		[]
+	);
 
-		return {
-			documentLabel:
-				// translators: Default label for the Document sidebar tab, not selected.
-				getPostTypeLabel() || _x( 'Document', 'noun, panel' ),
-		};
-	}, [] );
+	const documentLabel = postTypeLabel
+		? decodeEntities( postTypeLabel )
+		: // translators: Default label for the Document sidebar tab, not selected.
+		  _x( 'Document', 'noun, panel' );
 
 	return (
 		<Tabs.TabList ref={ ref }>

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

@@ -17,7 +17,10 @@ import { store as interfaceStore } from '@wordpress/interface';
 /**
  * Internal dependencies
  */
-import { TEMPLATE_POST_TYPE } from '../../store/constants';
+import {
+	TEMPLATE_POST_TYPE,
+	TEMPLATE_PART_POST_TYPE,
+} from '../../store/constants';
 import { store as editorStore } from '../../store';
 
 export function useStartPatterns() {
@@ -124,7 +127,6 @@ function StartPageOptionsModal( { onClose } ) {
 			>
 				<FlexItem>
 					<CheckboxControl
-						__nextHasNoMarginBottom
 						checked={ showStartPatterns }
 						label={ __(
 							'Always show starter patterns for new pages'
@@ -149,11 +151,13 @@ export default function StartPageOptions() {
 			'core',
 			'enableChoosePatternModal'
 		);
+		const currentPostType = getCurrentPostType();
 		return {
 			postId: getCurrentPostId(),
 			enabled:
 				choosePatternModalEnabled &&
-				TEMPLATE_POST_TYPE !== getCurrentPostType(),
+				TEMPLATE_POST_TYPE !== currentPostType &&
+				TEMPLATE_PART_POST_TYPE !== currentPostType,
 		};
 	}, [] );
 

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

package/src/dataviews/store/private-actions.ts

@@ -34,6 +34,7 @@ import {
 	templateTitleField,
 	pageTitleField,
 	patternTitleField,
+	notesField,
 } from '@wordpress/fields';
 
 /**
@@ -50,6 +51,20 @@ declare global {
 	}
 }
 
+/**
+ * Check if a post type supports editor notes.
+ *
+ * @param supports The post type supports object.
+ * @return Whether editor notes are supported.
+ */
+function hasEditorNotesSupport( supports?: PostType[ 'supports' ] ): boolean {
+	const editor = supports?.editor;
+	if ( Array.isArray( editor ) ) {
+		return !! editor[ 0 ]?.notes;
+	}
+	return false;
+}
+
 export function registerEntityAction< Item >(
 	kind: string,
 	name: string,
@@ -210,6 +225,7 @@ export const registerPostTypeSchema =
 			postTypeConfig.supports?.editor &&
 				postTypeConfig.viewable &&
 				postPreviewField,
+			hasEditorNotesSupport( postTypeConfig.supports ) && notesField,
 		].filter( Boolean );
 		if ( postTypeConfig.supports?.title ) {
 			let _titleField;

package/src/hooks/push-changes-to-global-styles/index.js

@@ -326,7 +326,6 @@ function PushChangesToGlobalStylesControl( {
 
 	return (
 		<BaseControl
-			__nextHasNoMarginBottom
 			className="editor-push-changes-to-global-styles-control"
 			help={ sprintf(
 				// translators: %s: Title of the block e.g. 'Heading'.

package/src/private-apis.js

@@ -29,6 +29,10 @@ import GlobalStylesUIWrapper from './components/global-styles';
 import { StyleBookPreview } from './components/style-book';
 import { useGlobalStyles, useStyle } from './components/global-styles/hooks';
 import { GlobalStylesActionMenu } from './components/global-styles/menu';
+import {
+	useGenerateBlockPath,
+	useRestoreBlockFromPath,
+} from './utils/block-selection-path';
 
 const { store: interfaceStore, ...remainingInterfaceApis } = interfaceApis;
 
@@ -56,6 +60,9 @@ lock( privateApis, {
 	StyleBookPreview,
 	useGlobalStyles,
 	useStyle,
+	// Block selection
+	useGenerateBlockPath,
+	useRestoreBlockFromPath,
 	// This is a temporary private API while we're updating the site editor to use EditorProvider.
 	interfaceStore,
 	...remainingInterfaceApis,

package/src/store/utils/notice-builder.js

@@ -92,10 +92,18 @@ export function getNotificationArgumentsForSaveFail( data ) {
 
 	if ( error.code === 'offline_error' ) {
 		const messages = {
-			publish: __( 'Publishing failed because you were offline.' ),
-			private: __( 'Publishing failed because you were offline.' ),
-			future: __( 'Scheduling failed because you were offline.' ),
-			default: __( 'Updating failed because you were offline.' ),
+			publish: __(
+				'Publishing failed because you were offline. Please verify your connection and try again.'
+			),
+			private: __(
+				'Publishing failed because you were offline. Please verify your connection and try again.'
+			),
+			future: __(
+				'Scheduling failed because you were offline. Please verify your connection and try again.'
+			),
+			default: __(
+				'Updating failed because you were offline. Please verify your connection and try again.'
+			),
 		};
 
 		const noticeMessage =

package/src/utils/block-selection-path.js

@@ -0,0 +1,127 @@
+/**
+ * WordPress dependencies
+ */
+import { useRegistry } from '@wordpress/data';
+import { useCallback } from '@wordpress/element';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+
+/**
+ * Hook that returns a function to generate a block path for a given block clientId.
+ * The path is an array of steps from root to the target block,
+ * where each step contains the block name and index within its parent.
+ *
+ * @return {Function} Function that takes a clientId and returns the block path or null.
+ */
+export function useGenerateBlockPath() {
+	const registry = useRegistry();
+
+	return useCallback(
+		( clientId ) => {
+			const { getBlock, getBlockParents, getBlockOrder } =
+				registry.select( blockEditorStore );
+
+			const block = getBlock( clientId );
+			if ( ! block ) {
+				return null;
+			}
+
+			const parents = getBlockParents( clientId );
+			const path = [];
+
+			// Build the path from root to target
+			const hierarchy = [ ...parents, clientId ];
+
+			for ( let i = 0; i < hierarchy.length; i++ ) {
+				const currentClientId = hierarchy[ i ];
+				const currentBlock = getBlock( currentClientId );
+
+				if ( ! currentBlock ) {
+					return null;
+				}
+
+				// Get the parent's clientId (or null for root-level blocks)
+				const parentClientId = i > 0 ? hierarchy[ i - 1 ] : '';
+
+				// Get siblings to determine index
+				const siblings = getBlockOrder( parentClientId );
+				const index = siblings.indexOf( currentClientId );
+
+				if ( index === -1 ) {
+					return null;
+				}
+
+				path.push( {
+					blockName: currentBlock.name,
+					index,
+					// Store a simple content hash for verification (first 100 chars of serialized content)
+					contentHash: JSON.stringify(
+						currentBlock.attributes
+					).slice( 0, 100 ),
+				} );
+			}
+
+			return path;
+		},
+		[ registry ]
+	);
+}
+
+/**
+ * Hook that returns a function to restore a block selection using a previously generated block path.
+ * Walks the path from root to target, matching block name and index at each level.
+ *
+ * @return {Function} Function that takes a path and returns the clientId or null.
+ */
+export function useRestoreBlockFromPath() {
+	const registry = useRegistry();
+
+	return useCallback(
+		( path ) => {
+			if ( ! path || ! Array.isArray( path ) || path.length === 0 ) {
+				return null;
+			}
+
+			const { getBlock, getBlockOrder } =
+				registry.select( blockEditorStore );
+
+			let currentParentId = ''; // Start at root
+
+			// Walk through each step in the path
+			for ( let i = 0; i < path.length; i++ ) {
+				const step = path[ i ];
+				const siblings = getBlockOrder( currentParentId );
+
+				// Check if the index is valid
+				if ( step.index >= siblings.length ) {
+					return null;
+				}
+
+				const candidateClientId = siblings[ step.index ];
+				const candidateBlock = getBlock( candidateClientId );
+
+				if ( ! candidateBlock ) {
+					return null;
+				}
+
+				// Verify the block name matches
+				if ( candidateBlock.name !== step.blockName ) {
+					return null;
+				}
+
+				// Optional: verify content hash for additional confidence
+				// (Skipping this for now as attributes might change slightly)
+
+				// If this is the last step, we found our block
+				if ( i === path.length - 1 ) {
+					return candidateClientId;
+				}
+
+				// Otherwise, continue to the next level
+				currentParentId = candidateClientId;
+			}
+
+			return null;
+		},
+		[ registry ]
+	);
+}

package/src/utils/get-template-part-icon.js

@@ -5,22 +5,35 @@ import {
 	header as headerIcon,
 	footer as footerIcon,
 	sidebar as sidebarIcon,
+	tableColumnAfter as overlayIcon,
 	symbolFilled as symbolFilledIcon,
 } from '@wordpress/icons';
+
 /**
- * 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 ) {
-	if ( 'header' === iconName ) {
+export function getTemplatePartIcon( areaOrIconName ) {
+	// Handle area names first
+	if ( 'header' === areaOrIconName ) {
 		return headerIcon;
-	} else if ( 'footer' === iconName ) {
+	} else if ( 'footer' === areaOrIconName ) {
 		return footerIcon;
-	} else if ( 'sidebar' === iconName ) {
+	} else if ( 'sidebar' === areaOrIconName ) {
 		return sidebarIcon;
+	} else if ( 'overlay' === areaOrIconName ) {
+		// TODO: Replace with a proper overlay icon when available.
+		// Using tableColumnAfter as a placeholder.
+		return overlayIcon;
+	}
+	// Handle icon names for backwards compatibility
+	if ( 'menu' === areaOrIconName ) {
+		// TODO: Replace with a proper overlay icon when available.
+		// Using tableColumnAfter as a placeholder.
+		return overlayIcon;
 	}
 	return symbolFilledIcon;
 }

package/build/bindings/api.js

@@ -1,51 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// packages/editor/src/bindings/api.js
-var api_exports = {};
-__export(api_exports, {
-  registerCoreBlockBindingsSources: () => registerCoreBlockBindingsSources
-});
-module.exports = __toCommonJS(api_exports);
-var import_blocks = require("@wordpress/blocks");
-var import_pattern_overrides = __toESM(require("./pattern-overrides"));
-var import_post_data = __toESM(require("./post-data"));
-var import_post_meta = __toESM(require("./post-meta"));
-var import_term_data = __toESM(require("./term-data"));
-function registerCoreBlockBindingsSources() {
-  (0, import_blocks.registerBlockBindingsSource)(import_pattern_overrides.default);
-  (0, import_blocks.registerBlockBindingsSource)(import_post_data.default);
-  (0, import_blocks.registerBlockBindingsSource)(import_post_meta.default);
-  (0, import_blocks.registerBlockBindingsSource)(import_term_data.default);
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  registerCoreBlockBindingsSources
-});
-//# sourceMappingURL=api.js.map