Prevent skin tone selection being lost on picker close. TODO: Fully p…

…ort store util to React Native

package.json

@@ -1,6 +1,6 @@
 {
   "name": "emoji-mart-native",
-  "version": "0.2.8-beta",
+  "version": "0.2.9-beta",
   "description": "Customizable Slack-like emoji picker for React Native",
   "main": "dist/index.js",
   "repository": {

src/components/picker/nimble-picker.js

@@ -11,7 +11,7 @@ import {
   // PixelRatio,
 } from 'react-native'
 
-import store from '../../utils/store'
+import skinStore from '../../utils/skin'
 import frequently from '../../utils/frequently'
 import { deepMerge } from '../../utils'
 import { uncompress } from '../../utils/data'
@@ -104,7 +104,7 @@ export default class NimblePicker extends React.PureComponent {
     this.data = props.data
     this.i18n = deepMerge(I18N, props.i18n)
     this.state = {
-      skin: props.skin || store.get('skin') || props.defaultSkin,
+      skin: props.skin || skinStore.get() || props.defaultSkin,
       firstRender: true,
     }
 
@@ -217,7 +217,7 @@ export default class NimblePicker extends React.PureComponent {
   componentWillReceiveProps(props) {
     if (props.skin) {
       this.setState({ skin: props.skin })
-    } else if (props.defaultSkin && !store.get('skin')) {
+    } else if (props.defaultSkin && !skinStore.get()) {
       this.setState({ skin: props.defaultSkin })
     }
   }
@@ -376,11 +376,11 @@ export default class NimblePicker extends React.PureComponent {
   }
 
   handleSkinChange(skin) {
-    var newState = { skin: skin },
+    var newState = { skin },
       { onSkinChange } = this.props
 
     this.setState(newState)
-    store.update(newState)
+    skinStore.set(skin)
 
     onSkinChange(skin)
   }

src/utils/shared-props.js

@@ -108,7 +108,7 @@ const PickerDefaultProps = {
   emoji: 'department_store',
   color: '#ae65c5',
   set: EmojiDefaultProps.set,
-  skin: EmojiDefaultProps.skin,
+  skin: null,
   defaultSkin: EmojiDefaultProps.skin,
   native: EmojiDefaultProps.native,
   emojiImageFn: EmojiDefaultProps.emojiImageFn,

src/utils/skin.js

@@ -0,0 +1,23 @@
+import store from './store'
+
+let skin, initialized
+
+function init() {
+  initialized = true
+  skin = store.get('skin')
+}
+
+function set(skinTone) {
+  if (!initialized) init()
+
+  skin = skinTone
+  store.set('skin', skinTone)
+}
+
+function get() {
+  if (!initialized) init()
+
+  return skin
+}
+
+export default { set, get }