Fix insertUsage persistance in block-editor store (#28694)

WordPress · Feb 4, 2021 · 8035392 · 8035392
1 parent b17dbfc
commit 8035392
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/packages/data/src/plugins/persistence/index.js b/packages/data/src/plugins/persistence/index.js
@@ -233,15 +233,16 @@ persistencePlugin.__unstableMigrate = ( pluginOptions ) => {
 	const state = persistence.get();
 
 	// Migrate 'insertUsage' from 'core/editor' to 'core/block-editor'
-	const insertUsage = get( state, [
-		'core/editor',
-		'preferences',
-		'insertUsage',
-	] );
-	if ( insertUsage ) {
+	const editorInsertUsage = state[ 'core/editor' ]?.preferences?.insertUsage;
+	if ( editorInsertUsage ) {
+		const blockEditorInsertUsage =
+			state[ 'core/block-editor' ]?.preferences?.insertUsage;
 		persistence.set( 'core/block-editor', {
 			preferences: {
-				insertUsage,
+				insertUsage: {
+					...editorInsertUsage,
+					...blockEditorInsertUsage,
+				},
 			},
 		} );
 	}