Merge pull request #10 from arronhunt/development

v0.1.7
arronhunt · Apr 7, 2019 · 1f632a4 · 1f632a4
2 parents 9487c62 + 704201b
commit 1f632a4
Show file tree

Hide file tree

Showing 7 changed files with 1,218 additions and 689 deletions.
diff --git a/example/app.json b/example/app.json
@@ -3,7 +3,7 @@
     "name": "example",
     "slug": "example",
     "privacy": "public",
-    "sdkVersion": "31.0.0",
+    "sdkVersion": "32.0.0",
     "platforms": [
       "ios",
       "android"

diff --git a/example/module.js b/example/module.js
@@ -84,6 +84,7 @@ const TabBar = ({ theme, activeCategory, onPress }) => {
           }}
         >
         <Text style={{
+          color: '#000000',
           textAlign: 'center',
           paddingBottom: 8,
           fontSize: (tabSize) - 24
@@ -107,7 +108,7 @@ const EmojiCell = ({ emoji, colSize, ...other }) => (
     }}
     {...other}
   >
-    <Text style={{ color: '#FFFFFF', fontSize: (colSize) - 12 }}>
+    <Text style={{ color: '#000000', fontSize: (colSize) - 12 }}>
       { charFromEmojiObject(emoji) }
     </Text>
   </TouchableOpacity>
@@ -240,7 +241,7 @@ export default class EmojiSelector extends Component {
       let name = Categories[c].name;
       emojiList[name] = sortEmoji(emojiByCategory(name));
     });
-    console.log('Prerendered emojis');
+
     this.setState({ 
       emojiList, 
       colSize: Math.floor(width / this.props.columns)
@@ -251,18 +252,18 @@ export default class EmojiSelector extends Component {
   //  LIFECYCLE METHODS
   //
   componentDidMount() {
-    const { category } = this.props;
+    const { category, showHistory } = this.props;
     this.setState({ category });
 
-    if (this.props.showHistory) {
+    if (showHistory) {
       this.loadHistoryAsync();
     }      
 
     this.prerenderEmojis(() => {
       this.setState({ isReady: true })
     });
   }
-    
+
   render() {
     const {
       theme,