Iterate grouping for options panel (#26198)

This responds to feedback on #25837 and iterates the grouping.
WordPress · Oct 16, 2020 · c45aceb · c45aceb
1 parent 602fcc3
commit c45aceb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/packages/edit-post/src/components/preferences-modal/index.js b/packages/edit-post/src/components/preferences-modal/index.js
@@ -57,11 +57,6 @@ export function PreferencesModal( { isModalActive, isViewable, closeModal } ) {
 					) }
 					label={ __( 'Show most used blocks' ) }
 				/>
-				<EnableFeature
-					featureName="showIconLabels"
-					help={ __( 'Shows text instead of icons in toolbar.' ) }
-					label={ __( 'Display button labels' ) }
-				/>
 			</Section>
 			<Section title={ __( 'Keyboard' ) }>
 				<EnableFeature
@@ -73,11 +68,6 @@ export function PreferencesModal( { isModalActive, isViewable, closeModal } ) {
 				/>
 			</Section>
 			<Section title={ __( 'Appearance' ) }>
-				<EnableFeature
-					featureName="themeStyles"
-					help={ __( 'Make the editor look like your theme.' ) }
-					label={ __( 'Use theme styles' ) }
-				/>
 				<EnableFeature
 					featureName="reducedUI"
 					help={ __(
@@ -92,6 +82,16 @@ export function PreferencesModal( { isModalActive, isViewable, closeModal } ) {
 					) }
 					label={ __( 'Spotlight mode' ) }
 				/>
+				<EnableFeature
+					featureName="showIconLabels"
+					help={ __( 'Shows text instead of icons in toolbar.' ) }
+					label={ __( 'Display button labels' ) }
+				/>
+				<EnableFeature
+					featureName="themeStyles"
+					help={ __( 'Make the editor look like your theme.' ) }
+					label={ __( 'Use theme styles' ) }
+				/>
 			</Section>
 			<Section
 				title={ __( 'Document settings' ) }

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
@@ -18,11 +18,6 @@ exports[`PreferencesModal should match snapshot when the modal is active 1`] = `
       help="Places the most frequent blocks in the block library."
       label="Show most used blocks"
     />
-    <WithSelect(WithDispatch(BaseOption))
-      featureName="showIconLabels"
-      help="Shows text instead of icons in toolbar."
-      label="Display button labels"
-    />
   </Section>
   <Section
     title="Keyboard"
@@ -36,11 +31,6 @@ exports[`PreferencesModal should match snapshot when the modal is active 1`] = `
   <Section
     title="Appearance"
   >
-    <WithSelect(WithDispatch(BaseOption))
-      featureName="themeStyles"
-      help="Make the editor look like your theme."
-      label="Use theme styles"
-    />
     <WithSelect(WithDispatch(BaseOption))
       featureName="reducedUI"
       help="Compacts options and outlines in the toolbar."
@@ -51,6 +41,16 @@ exports[`PreferencesModal should match snapshot when the modal is active 1`] = `
       help="Highlights the current block and fades other content."
       label="Spotlight mode"
     />
+    <WithSelect(WithDispatch(BaseOption))
+      featureName="showIconLabels"
+      help="Shows text instead of icons in toolbar."
+      label="Display button labels"
+    />
+    <WithSelect(WithDispatch(BaseOption))
+      featureName="themeStyles"
+      help="Make the editor look like your theme."
+      label="Use theme styles"
+    />
   </Section>
   <Section
     description="Choose what displays in the panel."