diff --git a/packages/edit-post/src/components/layout/index.js b/packages/edit-post/src/components/layout/index.js
index 357819313ab1d..3a53f81e4faf8 100644
--- a/packages/edit-post/src/components/layout/index.js
+++ b/packages/edit-post/src/components/layout/index.js
@@ -160,7 +160,6 @@ function Layout() {
isDistractionFree,
showBlockBreadcrumbs,
showMetaBoxes,
- showMostUsedBlocks,
documentLabel,
hasHistory,
} = useSelect( ( select ) => {
@@ -193,8 +192,6 @@ function Layout() {
showIconLabels: get( 'core', 'showIconLabels' ),
isDistractionFree: get( 'core', 'distractionFree' ),
showBlockBreadcrumbs: get( 'core', 'showBlockBreadcrumbs' ),
- showMostUsedBlocks:
- select( editPostStore ).isFeatureActive( 'mostUsedBlocks' ),
// translators: Default label for the Document in the Block Breadcrumb.
documentLabel: postTypeLabel || _x( 'Document', 'noun' ),
hasBlockSelected:
@@ -263,9 +260,7 @@ function Layout() {
const secondarySidebar = () => {
if ( mode === 'visual' && isInserterOpened ) {
- return (
-
- );
+ return ;
}
if ( mode === 'visual' && isListViewOpened ) {
return ;
diff --git a/packages/edit-post/src/components/preferences-modal/index.js b/packages/edit-post/src/components/preferences-modal/index.js
index 7ce98c1720d3d..a422e4d0a207a 100644
--- a/packages/edit-post/src/components/preferences-modal/index.js
+++ b/packages/edit-post/src/components/preferences-modal/index.js
@@ -263,6 +263,7 @@ export default function EditPostPreferencesModal() {
<>
),
},
+ {
+ name: 'blocks',
+ tabLabel: __( 'Blocks' ),
+ content: (
+ <>
+
+
+
+ >
+ ),
+ },
];
if ( ! isModalActive ) {
return null;
diff --git a/packages/editor/src/components/inserter-sidebar/index.js b/packages/editor/src/components/inserter-sidebar/index.js
index 3c9737f5e59e5..7db4335309935 100644
--- a/packages/editor/src/components/inserter-sidebar/index.js
+++ b/packages/editor/src/components/inserter-sidebar/index.js
@@ -11,6 +11,7 @@ import {
} from '@wordpress/compose';
import { __ } from '@wordpress/i18n';
import { useEffect, useRef } from '@wordpress/element';
+import { store as preferencesStore } from '@wordpress/preferences';
/**
* Internal dependencies
@@ -18,11 +19,13 @@ import { useEffect, useRef } from '@wordpress/element';
import { unlock } from '../../lock-unlock';
import { store as editorStore } from '../../store';
-export default function InserterSidebar( { showMostUsedBlocks } ) {
- const { insertionPoint } = useSelect( ( select ) => {
+export default function InserterSidebar() {
+ const { insertionPoint, showMostUsedBlocks } = useSelect( ( select ) => {
const { getInsertionPoint } = unlock( select( editorStore ) );
+ const { get } = select( preferencesStore );
return {
insertionPoint: getInsertionPoint(),
+ showMostUsedBlocks: get( 'core', 'mostUsedBlocks' ),
};
}, [] );
const { setIsInserterOpened } = useDispatch( editorStore );
diff --git a/packages/preferences-persistence/src/migrations/preferences-package-data/convert-editor-settings.js b/packages/preferences-persistence/src/migrations/preferences-package-data/convert-editor-settings.js
index b1940ef1b1081..84542937563ac 100644
--- a/packages/preferences-persistence/src/migrations/preferences-package-data/convert-editor-settings.js
+++ b/packages/preferences-persistence/src/migrations/preferences-package-data/convert-editor-settings.js
@@ -11,6 +11,7 @@ export default function convertEditorSettings( data ) {
'focusMode',
'inactivePanels',
'keepCaretInsideBlock',
+ 'mostUsedBlocks',
'openPanels',
'showBlockBreadcrumbs',
'showIconLabels',