From 56ae7b49c5812d6146df838c4608b8cabb46a873 Mon Sep 17 00:00:00 2001
From: Etienne Lemay <etienne@heliom.ca>
Date: Mon, 16 Mar 2020 11:08:13 -0400
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20sort=20frequent=20emojis=20by?=
 =?UTF-8?q?=20default?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/picker/nimble-picker.js |  3 +--
 src/utils/shared-default-props.js      |  2 +-
 src/utils/shared-props.js              |  2 +-
 stories/index.js                       | 23 +----------------------
 4 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/src/components/picker/nimble-picker.js b/src/components/picker/nimble-picker.js
index 6c3d09a..6f63a56 100644
--- a/src/components/picker/nimble-picker.js
+++ b/src/components/picker/nimble-picker.js
@@ -289,7 +289,7 @@ export default class NimblePicker extends React.PureComponent {
     var component = this.categoryRefs['category-1']
     if (component) {
       let maxMargin = component.maxMargin
-      if (!this.props.disableFrequentEmojiSort) {
+      if (this.props.enableFrequentEmojiSort) {
         component.forceUpdate()
       }
 
@@ -525,7 +525,6 @@ export default class NimblePicker extends React.PureComponent {
         exclude,
         recent,
         autoFocus,
-        disableFrequentEmojiSort,
         skinEmoji,
         notFound,
         notFoundEmoji,
diff --git a/src/utils/shared-default-props.js b/src/utils/shared-default-props.js
index 1fa9bb2..c4c869e 100644
--- a/src/utils/shared-default-props.js
+++ b/src/utils/shared-default-props.js
@@ -37,7 +37,7 @@ const PickerDefaultProps = {
   ),
   emojiTooltip: EmojiDefaultProps.tooltip,
   autoFocus: false,
-  disableFrequentEmojiSort: false,
+  enableFrequentEmojiSort: false,
   custom: [],
   skinEmoji: '',
   notFound: () => {},
diff --git a/src/utils/shared-props.js b/src/utils/shared-props.js
index b2d0fa5..8f6eb85 100644
--- a/src/utils/shared-props.js
+++ b/src/utils/shared-props.js
@@ -43,7 +43,7 @@ const PickerPropTypes = {
   exclude: PropTypes.arrayOf(PropTypes.string),
   recent: PropTypes.arrayOf(PropTypes.string),
   autoFocus: PropTypes.bool,
-  disableFrequentEmojiSort: PropTypes.bool,
+  enableFrequentEmojiSort: PropTypes.bool,
   custom: PropTypes.arrayOf(
     PropTypes.shape({
       name: PropTypes.string.isRequired,
diff --git a/stories/index.js b/stories/index.js
index df32e5c..20ed726 100644
--- a/stories/index.js
+++ b/stories/index.js
@@ -56,6 +56,7 @@ storiesOf('Picker', module)
       color={color('Highlight color', '#ae65c5')}
       showPreview={boolean('Show preview', true)}
       showSkinTones={boolean('Show skin tones', true)}
+      enableFrequentEmojiSort={boolean('Enable frequent sort', false)}
       custom={CUSTOM_EMOJIS}
     />
   ))
@@ -74,28 +75,6 @@ storiesOf('Picker', module)
     />
   ))
 
-  .add('Pause Frequent Emoji Sort', () => (
-    <Picker
-      disableFrequentEmojiSort={boolean('Unicode', true)}
-      onClick={action('clicked')}
-      onSelect={action('selected')}
-      onSkinChange={action('skin changed')}
-      native={boolean('Unicode', true)}
-      darkMode={boolean('Dark mode', false)}
-      set={select('Emoji pack', SETS, SETS[0])}
-      emojiSize={number('Emoji size', 24)}
-      perLine={number('Per line', 9)}
-      title={text('Idle text', 'Your Title Here')}
-      emoji={text('Idle emoji', 'department_store')}
-      notFoundEmoji={text('Not found emoji', 'sleuth_or_spy')}
-      defaultSkin={number('Default skin tone', 1)}
-      color={color('Highlight color', '#ae65c5')}
-      showPreview={boolean('Show preview', true)}
-      showSkinTones={boolean('Show skin tones', true)}
-      custom={CUSTOM_EMOJIS}
-    />
-  ))
-
   .add('Custom category icons', () => (
     <Picker
       custom={CUSTOM_EMOJIS}