Editor preferences: update order and copy (#40981)

* Bring consistency to the site and post editors' preference panes by: - making the copy the same - placing common preferences in the same order * Update snappy shots * Add full-stop to sentence.
WordPress · May 11, 2022 · 1d44164 · 1d44164
1 parent 0ae80c5
commit 1d44164
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 26 deletions.
diff --git a/packages/edit-post/src/components/preferences-modal/index.js b/packages/edit-post/src/components/preferences-modal/index.js
@@ -102,18 +102,18 @@ export default function EditPostPreferencesModal() {
 							) }
 						>
 							<EnableFeature
-								featureName="reducedUI"
+								featureName="focusMode"
 								help={ __(
-									'Compacts options and outlines in the toolbar.'
+									'Highlights the current block and fades other content.'
 								) }
-								label={ __( 'Reduce the interface' ) }
+								label={ __( 'Spotlight mode' ) }
 							/>
 							<EnableFeature
-								featureName="focusMode"
+								featureName="showIconLabels"
+								label={ __( 'Show button text labels' ) }
 								help={ __(
-									'Highlights the current block and fades other content.'
+									'Show text instead of icons on buttons.'
 								) }
-								label={ __( 'Spotlight mode' ) }
 							/>
 							<EnableFeature
 								featureName="showListViewByDefault"
@@ -123,9 +123,11 @@ export default function EditPostPreferencesModal() {
 								label={ __( 'Always open list view' ) }
 							/>
 							<EnableFeature
-								featureName="showIconLabels"
-								help={ __( 'Shows text instead of icons.' ) }
-								label={ __( 'Display button labels' ) }
+								featureName="reducedUI"
+								help={ __(
+									'Compacts options and outlines in the toolbar.'
+								) }
+								label={ __( 'Reduce the interface' ) }
 							/>
 							<EnableFeature
 								featureName="themeStyles"

diff --git a/packages/edit-post/src/components/preferences-modal/test/__snapshots__/index.js.snap b/packages/edit-post/src/components/preferences-modal/test/__snapshots__/index.js.snap
@@ -22,25 +22,25 @@ exports[`EditPostPreferencesModal should match snapshot when the modal is active
               description="Customize options related to the block editor interface and editing flow."
               title="Appearance"
             >
-              <WithSelect(WithDispatch(BaseOption))
-                featureName="reducedUI"
-                help="Compacts options and outlines in the toolbar."
-                label="Reduce the interface"
-              />
               <WithSelect(WithDispatch(BaseOption))
                 featureName="focusMode"
                 help="Highlights the current block and fades other content."
                 label="Spotlight mode"
               />
+              <WithSelect(WithDispatch(BaseOption))
+                featureName="showIconLabels"
+                help="Show text instead of icons on buttons."
+                label="Show button text labels"
+              />
               <WithSelect(WithDispatch(BaseOption))
                 featureName="showListViewByDefault"
                 help="Opens the block list view sidebar by default."
                 label="Always open list view"
               />
               <WithSelect(WithDispatch(BaseOption))
-                featureName="showIconLabels"
-                help="Shows text instead of icons."
-                label="Display button labels"
+                featureName="reducedUI"
+                help="Compacts options and outlines in the toolbar."
+                label="Reduce the interface"
               />
               <WithSelect(WithDispatch(BaseOption))
                 featureName="themeStyles"
@@ -153,25 +153,25 @@ exports[`EditPostPreferencesModal should match snapshot when the modal is active
               description="Customize options related to the block editor interface and editing flow."
               title="Appearance"
             >
-              <WithSelect(WithDispatch(BaseOption))
-                featureName="reducedUI"
-                help="Compacts options and outlines in the toolbar."
-                label="Reduce the interface"
-              />
               <WithSelect(WithDispatch(BaseOption))
                 featureName="focusMode"
                 help="Highlights the current block and fades other content."
                 label="Spotlight mode"
               />
+              <WithSelect(WithDispatch(BaseOption))
+                featureName="showIconLabels"
+                help="Show text instead of icons on buttons."
+                label="Show button text labels"
+              />
               <WithSelect(WithDispatch(BaseOption))
                 featureName="showListViewByDefault"
                 help="Opens the block list view sidebar by default."
                 label="Always open list view"
               />
               <WithSelect(WithDispatch(BaseOption))
-                featureName="showIconLabels"
-                help="Shows text instead of icons."
-                label="Display button labels"
+                featureName="reducedUI"
+                help="Compacts options and outlines in the toolbar."
+                label="Reduce the interface"
               />
               <WithSelect(WithDispatch(BaseOption))
                 featureName="themeStyles"

diff --git a/packages/edit-site/src/components/preferences-modal/index.js b/packages/edit-site/src/components/preferences-modal/index.js
@@ -39,7 +39,7 @@ export default function EditSitePreferencesModal( {
 					<EnableFeature
 						featureName="showIconLabels"
 						label={ __( 'Show button text labels' ) }
-						help={ __( 'Show text instead of icons on buttons' ) }
+						help={ __( 'Show text instead of icons on buttons.' ) }
 					/>
 					<EnableFeature
 						featureName="showListViewByDefault"