From 1ef7d3bc6ac0439e9e5b08e8113e4b66cb7e38ee Mon Sep 17 00:00:00 2001
From: tellthemachines <tellthemachines@users.noreply.github.com>
Date: Wed, 2 Sep 2020 10:23:43 +1000
Subject: [PATCH] Add option to show icon labels. (#24234)

* Add option to show icon labels.

* Address review feedback and consolidate

* Move option to general section

* Remove unnecessary dispatch
---
 packages/edit-post/src/components/options-modal/index.js      | 4 ++++
 .../components/options-modal/test/__snapshots__/index.js.snap | 4 ++++
 packages/edit-post/src/store/defaults.js                      | 1 +
 3 files changed, 9 insertions(+)

diff --git a/packages/edit-post/src/components/options-modal/index.js b/packages/edit-post/src/components/options-modal/index.js
index ce985918449606..0a983af5709c48 100644
--- a/packages/edit-post/src/components/options-modal/index.js
+++ b/packages/edit-post/src/components/options-modal/index.js
@@ -54,6 +54,10 @@ export function OptionsModal( { isModalActive, isViewable, closeModal } ) {
 						'Enable the Most Used Blocks category in the block library'
 					) }
 				/>
+				<EnableFeature
+					featureName="showIconLabels"
+					label={ __( 'Show button text labels' ) }
+				/>
 			</Section>
 			<Section title={ __( 'Keyboard options' ) }>
 				<EnableFeature
diff --git a/packages/edit-post/src/components/options-modal/test/__snapshots__/index.js.snap b/packages/edit-post/src/components/options-modal/test/__snapshots__/index.js.snap
index b89eb08f2ccb29..0bf5becdb51b36 100644
--- a/packages/edit-post/src/components/options-modal/test/__snapshots__/index.js.snap
+++ b/packages/edit-post/src/components/options-modal/test/__snapshots__/index.js.snap
@@ -16,6 +16,10 @@ exports[`OptionsModal should match snapshot when the modal is active 1`] = `
       featureName="mostUsedBlocks"
       label="Enable the Most Used Blocks category in the block library"
     />
+    <WithSelect(WithDispatch(BaseOption))
+      featureName="showIconLabels"
+      label="Show button text labels"
+    />
   </Section>
   <Section
     title="Keyboard options"
diff --git a/packages/edit-post/src/store/defaults.js b/packages/edit-post/src/store/defaults.js
index 64435c05ce74c1..46949ec9cea198 100644
--- a/packages/edit-post/src/store/defaults.js
+++ b/packages/edit-post/src/store/defaults.js
@@ -9,6 +9,7 @@ export const PREFERENCES_DEFAULTS = {
 		fixedToolbar: false,
 		welcomeGuide: true,
 		fullscreenMode: true,
+		showIconLabels: false,
 	},
 	hiddenBlockTypes: [],
 	preferredStyleVariations: {},