Editor: Unify list view open preference (#57504)

WordPress · Jan 3, 2024 · 84715c0 · 84715c0 · github-actions · Jan 3, 2024
1 parent a278bb8
commit 84715c0
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 9 deletions.
diff --git a/packages/edit-post/src/components/preferences-modal/index.js b/packages/edit-post/src/components/preferences-modal/index.js
@@ -101,6 +101,7 @@ export default function EditPostPreferencesModal() {
 						) }
 						<PreferencesModalSection title={ __( 'Interface' ) }>
 							<EnableFeature
+								scope="core"
 								featureName="showListViewByDefault"
 								help={ __(
 									'Opens the block list view sidebar by default.'

diff --git a/packages/edit-post/src/index.js b/packages/edit-post/src/index.js
@@ -62,7 +62,6 @@ export function initializeEditor(
 		isPublishSidebarEnabled: true,
 		openPanels: [ 'post-status' ],
 		preferredStyleVariations: {},
-		showListViewByDefault: false,
 		themeStyles: true,
 		welcomeGuide: true,
 		welcomeGuideTemplate: true,
@@ -72,14 +71,15 @@ export function initializeEditor(
 		allowRightClickOverrides: true,
 		showBlockBreadcrumbs: true,
 		showIconLabels: false,
+		showListViewByDefault: false,
 	} );
 
 	dispatch( blocksStore ).reapplyBlockTypeFilters();
 
 	// Check if the block list view should be open by default.
 	// If `distractionFree` mode is enabled, the block list view should not be open.
 	if (
-		select( editPostStore ).isFeatureActive( 'showListViewByDefault' ) &&
+		select( preferencesStore ).get( 'core', 'showListViewByDefault' ) &&
 		! select( editPostStore ).isFeatureActive( 'distractionFree' )
 	) {
 		dispatch( editorStore ).setIsListViewOpened( true );

diff --git a/packages/edit-site/src/components/editor-canvas-container/index.js b/packages/edit-site/src/components/editor-canvas-container/index.js
@@ -63,7 +63,7 @@ function EditorCanvasContainer( {
 			).getEditorCanvasContainerView();
 
 			const _showListViewByDefault = select( preferencesStore ).get(
-				'core/edit-site',
+				'core',
 				'showListViewByDefault'
 			);
 

diff --git a/packages/edit-site/src/components/preferences-modal/index.js b/packages/edit-site/src/components/preferences-modal/index.js
@@ -54,6 +54,7 @@ export default function EditSitePreferencesModal() {
 			content: (
 				<PreferencesModalSection title={ __( 'Interface' ) }>
 					<EnableFeature
+						scope="core"
 						featureName="showListViewByDefault"
 						help={ __(
 							'Opens the block list view sidebar by default.'

diff --git a/packages/edit-site/src/components/sidebar-edit-mode/global-styles-sidebar.js b/packages/edit-site/src/components/sidebar-edit-mode/global-styles-sidebar.js
@@ -44,7 +44,7 @@ export default function GlobalStylesSidebar() {
 			'visual' === select( editSiteStore ).getEditorMode();
 		const _isEditCanvasMode = 'edit' === getCanvasMode();
 		const _showListViewByDefault = select( preferencesStore ).get(
-			'core/edit-site',
+			'core',
 			'showListViewByDefault'
 		);
 		const { getEntityRecord, __experimentalGetCurrentGlobalStylesId } =

diff --git a/packages/edit-site/src/index.js b/packages/edit-site/src/index.js
@@ -60,13 +60,13 @@ export function initializeEditor( id, settings ) {
 		welcomeGuideStyles: true,
 		welcomeGuidePage: true,
 		welcomeGuideTemplate: true,
-		showListViewByDefault: false,
 	} );
 
 	dispatch( preferencesStore ).setDefaults( 'core', {
 		allowRightClickOverrides: true,
 		keepCaretInsideBlock: false,
 		showBlockBreadcrumbs: true,
+		showListViewByDefault: false,
 	} );
 
 	dispatch( interfaceStore ).setDefaultComplementaryArea(

diff --git a/packages/edit-site/src/store/private-actions.js b/packages/edit-site/src/store/private-actions.js
@@ -24,7 +24,7 @@ export const setCanvasMode =
 			mode === 'edit' &&
 			registry
 				.select( preferencesStore )
-				.get( 'core/edit-site', 'showListViewByDefault' ) &&
+				.get( 'core', 'showListViewByDefault' ) &&
 			! registry
 				.select( preferencesStore )
 				.get( 'core/edit-site', 'distractionFree' )

diff --git a/...references-persistence/src/migrations/preferences-package-data/convert-editor-settings.js b/...references-persistence/src/migrations/preferences-package-data/convert-editor-settings.js
@@ -9,6 +9,7 @@ export default function convertEditorSettings( data ) {
 		'keepCaretInsideBlock',
 		'showBlockBreadcrumbs',
 		'showIconLabels',
+		'showListViewByDefault',
 	];
 
 	settingsToMoveToCore.forEach( ( setting ) => {

diff --git a/test/e2e/specs/editor/various/block-renaming.spec.js b/test/e2e/specs/editor/various/block-renaming.spec.js
@@ -37,7 +37,7 @@ test.describe( 'Block Renaming', () => {
 			pageUtils,
 		} ) => {
 			// Turn on block list view by default.
-			await editor.setPreferences( 'core/edit-site', {
+			await editor.setPreferences( 'core', {
 				showListViewByDefault: true,
 			} );
 

diff --git a/test/e2e/specs/site-editor/list-view.spec.js b/test/e2e/specs/site-editor/list-view.spec.js
@@ -30,7 +30,7 @@ test.describe( 'Site Editor List View', () => {
 		).toBeHidden();
 
 		// Turn on block list view by default.
-		await editor.setPreferences( 'core/edit-site', {
+		await editor.setPreferences( 'core', {
 			showListViewByDefault: true,
 		} );
 
@@ -41,7 +41,7 @@ test.describe( 'Site Editor List View', () => {
 		).toBeVisible();
 
 		// The preferences cleanup.
-		await editor.setPreferences( 'core/edit-site', {
+		await editor.setPreferences( 'core', {
 			showListViewByDefault: false,
 		} );
 	} );