Send updates to editor settings and let them sync to block editor

WordPress · Jan 25, 2023 · 0dd56db · 0dd56db
1 parent 0451839
commit 0dd56db
Showing 1 changed file with 21 additions and 15 deletions.
diff --git a/packages/editor/src/components/provider/index.native.js b/packages/editor/src/components/provider/index.native.js
@@ -92,10 +92,15 @@ class NativeEditorProvider extends Component {
 	}
 
 	componentDidMount() {
-		const { capabilities, locale, hostAppNamespace, updateSettings } =
-			this.props;
+		const {
+			capabilities,
+			locale,
+			hostAppNamespace,
+			updateEditorSettings,
+			updateBlockEditorSettings,
+		} = this.props;
 
-		updateSettings( {
+		updateEditorSettings( {
 			...capabilities,
 			...this.getThemeColors( this.props ),
 			locale,
@@ -152,7 +157,9 @@ class NativeEditorProvider extends Component {
 						window.wp.galleryBlockV2Enabled =
 							galleryWithImageBlocks;
 					}
-					updateSettings( this.getThemeColors( editorSettings ) );
+					updateEditorSettings(
+						this.getThemeColors( editorSettings )
+					);
 				}
 			);
 
@@ -177,7 +184,7 @@ class NativeEditorProvider extends Component {
 			const impressions = { ...NEW_BLOCK_TYPES, ...storedImpressions };
 
 			// Persist impressions to JavaScript store.
-			updateSettings( { impressions } );
+			updateBlockEditorSettings( { impressions } );
 
 			// Persist impressions to native store if they do not include latest
 			// `NEW_BLOCK_TYPES` configuration.
@@ -318,7 +325,7 @@ class NativeEditorProvider extends Component {
 	}
 
 	updateCapabilitiesAction( capabilities ) {
-		this.props.updateSettings( capabilities );
+		this.props.updateEditorSettings( capabilities );
 	}
 
 	render() {
@@ -352,17 +359,14 @@ export default compose( [
 			getEditorBlocks,
 			getEditedPostAttribute,
 			getEditedPostContent,
+			getEditorSettings,
 		} = select( editorStore );
 		const { getEditorMode } = select( editPostStore );
 
-		const {
-			getBlockIndex,
-			getSelectedBlockClientId,
-			getGlobalBlockCount,
-			getSettings: getBlockEditorSettings,
-		} = select( blockEditorStore );
+		const { getBlockIndex, getSelectedBlockClientId, getGlobalBlockCount } =
+			select( blockEditorStore );
 
-		const settings = getBlockEditorSettings();
+		const settings = getEditorSettings();
 		const defaultEditorColors = settings?.colors ?? [];
 		const defaultEditorGradients = settings?.gradients ?? [];
 
@@ -381,7 +385,8 @@ export default compose( [
 		};
 	} ),
 	withDispatch( ( dispatch ) => {
-		const { editPost, resetEditorBlocks } = dispatch( editorStore );
+		const { editPost, resetEditorBlocks, updateEditorSettings } =
+			dispatch( editorStore );
 		const {
 			updateSettings,
 			clearSelectedBlock,
@@ -393,7 +398,8 @@ export default compose( [
 		const { createSuccessNotice } = dispatch( noticesStore );
 
 		return {
-			updateSettings,
+			updateBlockEditorSettings: updateSettings,
+			updateEditorSettings,
 			addEntities,
 			clearSelectedBlock,
 			insertBlock,