@wordpress/editor 12.2.1 → 12.2.2

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

@@ -3,47 +3,35 @@
  */
 import { __ } from '@wordpress/i18n';
 import { Button } from '@wordpress/components';
-import { withSelect, withDispatch } from '@wordpress/data';
-import { compose } from '@wordpress/compose';
+import { useSelect, useDispatch } from '@wordpress/data';
 
 /**
  * Internal dependencies
  */
 import { store as editorStore } from '../../store';
 
-function PostTrash( { isNew, postId, postType, ...props } ) {
+export default function PostTrash() {
+	const { isNew, postId } = useSelect( ( select ) => {
+		const store = select( editorStore );
+		return {
+			isNew: store.isEditedPostNew(),
+			postId: store.getCurrentPostId(),
+		};
+	}, [] );
+	const { trashPost } = useDispatch( editorStore );
+
 	if ( isNew || ! postId ) {
 		return null;
 	}
 
-	const onClick = () => props.trashPost( postId, postType );
-
 	return (
 		<Button
 			className="editor-post-trash"
 			isDestructive
 			variant="secondary"
-			onClick={ onClick }
+			onClick={ () => trashPost() }
 		>
 			{ __( 'Move to trash' ) }
 		</Button>
 	);
 }
-
-export default compose( [
-	withSelect( ( select ) => {
-		const {
-			isEditedPostNew,
-			getCurrentPostId,
-			getCurrentPostType,
-		} = select( editorStore );
-		return {
-			isNew: isEditedPostNew(),
-			postId: getCurrentPostId(),
-			postType: getCurrentPostType(),
-		};
-	} ),
-	withDispatch( ( dispatch ) => ( {
-		trashPost: dispatch( editorStore ).trashPost,
-	} ) ),
-] )( PostTrash );

package/src/components/provider/index.native.js

@@ -31,12 +31,8 @@ import {
 import { withDispatch, withSelect } from '@wordpress/data';
 import { compose } from '@wordpress/compose';
 import { applyFilters } from '@wordpress/hooks';
-import {
-	validateThemeColors,
-	validateThemeGradients,
-	store as blockEditorStore,
-} from '@wordpress/block-editor';
-import { getGlobalStyles } from '@wordpress/components';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+import { getGlobalStyles, getColorsAndGradients } from '@wordpress/components';
 import { NEW_BLOCK_TYPES } from '@wordpress/block-library';
 
 const postTypeEntities = [
@@ -232,15 +228,18 @@ class NativeEditorProvider extends Component {
 		}
 	}
 
-	getThemeColors( { colors, gradients, rawStyles, rawFeatures } ) {
-		return {
-			...( rawStyles && rawFeatures
-				? getGlobalStyles( rawStyles, rawFeatures )
-				: {
-						colors: validateThemeColors( colors ),
-						gradients: validateThemeGradients( gradients ),
-				  } ),
-		};
+	getThemeColors( { rawStyles, rawFeatures } ) {
+		const { defaultEditorColors, defaultEditorGradients } = this.props;
+
+		if ( rawStyles && rawFeatures ) {
+			return getGlobalStyles( rawStyles, rawFeatures );
+		}
+
+		return getColorsAndGradients(
+			defaultEditorColors,
+			defaultEditorGradients,
+			rawFeatures
+		);
 	}
 
 	componentDidUpdate( prevProps ) {
@@ -363,6 +362,10 @@ export default compose( [
 			getSettings: getBlockEditorSettings,
 		} = select( blockEditorStore );
 
+		const settings = getBlockEditorSettings();
+		const defaultEditorColors = settings?.colors ?? [];
+		const defaultEditorGradients = settings?.gradients ?? [];
+
 		const selectedBlockClientId = getSelectedBlockClientId();
 		return {
 			mode: getEditorMode(),
@@ -370,7 +373,8 @@ export default compose( [
 			blocks: getEditorBlocks(),
 			title: getEditedPostAttribute( 'title' ),
 			getEditedPostContent,
-			getBlockEditorSettings,
+			defaultEditorColors,
+			defaultEditorGradients,
 			selectedBlockIndex: getBlockIndex( selectedBlockClientId ),
 			blockCount: getGlobalBlockCount(),
 			paragraphCount: getGlobalBlockCount( 'core/paragraph' ),

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

@@ -104,6 +104,7 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 				'__experimentalFeatures',
 				'__experimentalPreferredStyleVariations',
 				'__experimentalSetIsInserterOpened',
+				'__experimentalGenerateAnchors',
 				'__unstableGalleryWithImageBlocks',
 				'alignWide',
 				'allowedBlockTypes',
@@ -148,6 +149,7 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 			__experimentalCreatePageEntity: createPageEntity,
 			__experimentalUserCanCreatePages: userCanCreatePages,
 			pageOnFront,
+			__experimentalPreferPatternsOnRoot: hasTemplate,
 		} ),
 		[
 			settings,