@wordpress/editor 14.35.2-next.dc3f6d3c1.0 → 14.36.0

package/src/hooks/template-part-navigation-edit-button.js

@@ -6,14 +6,10 @@ import { createHigherOrderComponent } from '@wordpress/compose';
 import { useCallback } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import {
-	BlockControls,
+	__unstableBlockToolbarLastItem as BlockToolbarLastItem,
 	store as blockEditorStore,
 } from '@wordpress/block-editor';
-import {
-	ToolbarButton,
-	ToolbarGroup,
-	__experimentalDivider as Divider,
-} from '@wordpress/components';
+import { ToolbarButton, ToolbarGroup } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { store as interfaceStore } from '@wordpress/interface';
 
@@ -96,15 +92,8 @@ function TemplatePartNavigationEditButton( { clientId } ) {
 	}
 
 	return (
-		<BlockControls group="other">
+		<BlockToolbarLastItem>
 			<ToolbarGroup>
-				{ /*
-				 * Add a vertical divider to visually separate the "Edit navigation"
-				 * button from the template part's "Edit" button. Both buttons share
-				 * the same toolbar group ("other"), so without this divider they
-				 * would appear directly adjacent with no visual separation.
-				 */ }
-				<Divider orientation="vertical" marginEnd={ 3 } />
 				<ToolbarButton
 					label={ __( 'Edit navigation' ) }
 					onClick={ onEditNavigation }
@@ -112,7 +101,7 @@ function TemplatePartNavigationEditButton( { clientId } ) {
 					{ __( 'Edit navigation' ) }
 				</ToolbarButton>
 			</ToolbarGroup>
-		</BlockControls>
+		</BlockToolbarLastItem>
 	);
 }
 

package/src/store/actions.js

@@ -274,6 +274,8 @@ export const savePost =
 		dispatch( { type: 'REQUEST_POST_UPDATE_FINISH', options } );
 
 		if (
+			typeof window !== 'undefined' &&
+			window.__experimentalTemplateActivate &&
 			! options.isAutosave &&
 			previousRecord.type === 'wp_template' &&
 			( typeof previousRecord.id === 'number' ||

package/src/store/constants.ts

@@ -30,3 +30,9 @@ export const GLOBAL_POST_TYPES = [
 	'wp_block',
 	'wp_navigation',
 ];
+export const DESIGN_POST_TYPES = [
+	TEMPLATE_POST_TYPE,
+	TEMPLATE_PART_POST_TYPE,
+	PATTERN_POST_TYPE,
+	NAVIGATION_POST_TYPE,
+];