Merge pull request #152 from tunoltd/v0.6.0-beta

v0.6.0 beta

Author: pederjohnsen

.babelrc

@@ -0,0 +1 @@
+*.md

.prettierignore

@@ -1,7 +1,7 @@
 {
   "arrowParens": "always",
   "bracketSpacing": false,
-  "printWidth": 120,
+  "printWidth": 80,
   "semi": false,
   "singleQuote": true,
   "trailingComma": "all",

.prettierrc

@@ -1,11 +1,11 @@
-import { configure } from '@storybook/react';
-import { setOptions } from '@storybook/addon-options';
+import {configure} from '@storybook/react'
+import {setOptions} from '@storybook/addon-options'
 
 setOptions({
   name: 'Contribute on GitHub',
-  url: 'https://github.com/missive/emoji-mart',
+  url: 'https://github.com/tunoltd/emoji-mart-native',
   downPanelInRight: true,
   sidebarAnimations: false,
 })
 
-configure(() => require('../stories'), module);
+configure(() => require('../stories'), module)

.storybook/config.js

@@ -0,0 +1,40 @@
+const {devDependencies} = require('./package.json')
+
+module.exports = {
+  presets: ['module:metro-react-native-babel-preset'],
+  plugins: [
+    '@babel/plugin-transform-runtime',
+    '@babel/plugin-proposal-class-properties',
+    [
+      'babel-plugin-transform-define',
+      {
+        'process.env.NODE_ENV': 'production',
+        EMOJI_DATASOURCE_VERSION: devDependencies['emoji-datasource'],
+      },
+    ],
+  ],
+  env: {
+    cjs: {
+      presets: [
+        [
+          '@babel/preset-env',
+          {
+            modules: 'cjs',
+          },
+        ],
+      ],
+    },
+    test: {
+      presets: [
+        [
+          '@babel/preset-env',
+          {
+            targets: {
+              node: 'current',
+            },
+          },
+        ],
+      ],
+    },
+  },
+}

README.md

@@ -1,6 +1,6 @@
 {
   "name": "emoji-mart-native",
-  "version": "0.5.0-beta",
+  "version": "0.6.0-beta",
   "description": "Customizable Slack-like emoji picker for React Native",
   "main": "dist/index.js",
   "repository": {
@@ -20,41 +20,39 @@
     "url": "https://github.com/tunoltd/emoji-mart-native/issues"
   },
   "homepage": "https://tunoltd.github.io/emoji-mart-native/",
-  "dependencies": {},
+  "dependencies": {
+    "@babel/runtime": "^7.0.0",
+    "prop-types": "^15.6.0"
+  },
   "peerDependencies": {
     "react": "^0.14.0 || ^15.0.0-0 || ^16.0.0"
   },
   "devDependencies": {
+    "@babel/cli": "^7.0.0",
+    "@babel/core": "^7.0.0",
+    "@babel/plugin-proposal-class-properties": "^7.8.3",
+    "@babel/plugin-transform-runtime": "^7.7.6",
+    "@babel/preset-env": "^7.0.0",
     "@storybook/addon-actions": "^3.2.11",
     "@storybook/addon-knobs": "^3.2.10",
     "@storybook/addon-links": "^3.2.10",
     "@storybook/addon-options": "3.2.10",
     "@storybook/react": "^3.2.11",
-    "babel-cli": "^6.0.0",
-    "babel-core": "^6.0.0",
-    "babel-jest": "^23.6.0",
-    "babel-loader": "^7.0.0",
-    "babel-plugin-module-resolver": "2.7.1",
-    "babel-plugin-transform-define": "^1.3.0",
-    "babel-plugin-transform-es2015-destructuring": "6.9.0",
-    "babel-plugin-transform-object-rest-spread": "6.8.0",
-    "babel-plugin-transform-react-remove-prop-types": "^0.4.8",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-es2015": "6.6.0",
-    "babel-preset-react": "6.5.0",
-    "babel-preset-react-native": "^4.0.0",
-    "babel-runtime": "^6.26.0",
-    "emoji-datasource": "4.1.0",
+    "babel-jest": "^24.9.0",
+    "babel-loader": "^8.0.0",
+    "babel-plugin-transform-define": "^2.0.0",
+    "emoji-datasource": "5.0.1",
     "emojilib": "^2.2.1",
+    "enzyme": "^3.9.0",
+    "enzyme-adapter-react-16": "^1.11.2",
     "inflection": "1.10.0",
-    "jest": "^23.0.0",
+    "jest": "^24.9.0",
+    "metro-react-native-babel-preset": "^0.59.0",
     "mkdirp": "0.5.1",
     "prettier": "^1.16.4",
-    "prop-types": "^15.6.0",
-    "react": "^16.6.3",
+    "react": "^16.11.0",
+    "react-native": "^0.62.2",
     "react-test-renderer": "^16.8.4",
-    "react-native": "^0.57.7",
     "rimraf": "2.5.2",
     "webpack": "^3.6.0"
   },
@@ -63,14 +61,11 @@
     "build:data": "node scripts/build-data",
     "build:localImagesData": "node scripts/local-images/build-data && BABEL_ENV=cjs babel data/local-images --out-dir data/local-images --copy-files",
     "build:dist": "npm run build:cjs",
-    "build:cjs": "BABEL_ENV=cjs babel src --out-dir dist --copy-files --ignore '**/*.test.js'",
-    "build:link": "BABEL_ENV=cjs babel src --copy-files --ignore '**/*.test.js'",
+    "build:cjs": "BABEL_ENV=cjs babel src --out-dir dist --copy-files --ignore  '**/__tests__/*'",
+    "build:link": "BABEL_ENV=cjs babel src --copy-files --ignore '**/__tests__/*'",
     "build": "npm run clean && npm run build:dist",
-    "watch": "BABEL_ENV=cjs babel src --watch --out-dir dist --copy-files --ignore '**/*.test.js'",
+    "watch": "BABEL_ENV=cjs babel src --watch --out-dir dist --copy-files --ignore '**/__tests__/*'",
     "start": "npm run watch",
-    "react:clean": "rimraf node_modules/{react,react-dom,react-addons-test-utils}",
-    "react:14": "npm run react:clean && npm i react@^0.14 react-dom@^0.14 react-addons-test-utils@^0.14 --save-dev",
-    "react:15": "npm run react:clean && npm i react@^15 react-dom@^15 react-addons-test-utils@^15 --save-dev",
     "test": "npm run clean && jest",
     "prepublishOnly": "npm run build",
     "storybook": "start-storybook -p 6006",

babel.config.js

@@ -1,5 +1,5 @@
 const build = require('./build')
-const sets = ['apple', 'facebook', 'google', 'messenger', 'twitter']
+const sets = ['apple', 'facebook', 'google', 'twitter']
 
 build({output: 'data/all.json'})
 

data/all.json

@@ -3,10 +3,11 @@ var fs = require('fs'),
   inflection = require('inflection'),
   mkdirp = require('mkdirp')
 
-var {compress} = require('../src/utils/data')
+var {compress} = require('../dist/utils/data')
 
 var categories = [
-  ['Smileys & People', 'people'],
+  ['Smileys & Emotion', 'smileys'],
+  ['People & Body', 'people'],
   ['Animals & Nature', 'nature'],
   ['Food & Drink', 'foods'],
   ['Activities', 'activity'],
@@ -16,7 +17,7 @@ var categories = [
   ['Flags', 'flags'],
 ]
 
-var sets = ['apple', 'facebook', 'google', 'messenger', 'twitter']
+var sets = ['apple', 'facebook', 'google', 'twitter']
 
 module.exports = (options) => {
   delete require.cache[require.resolve('emoji-datasource')]
@@ -52,7 +53,6 @@ module.exports = (options) => {
 
       options.sets.forEach((set) => {
         if (keepEmoji) return
-
         if (datum[`has_img_${set}`]) {
           keepEmoji = true
         }
@@ -103,6 +103,7 @@ module.exports = (options) => {
     delete datum.au
     delete datum.softbank
     delete datum.google
+    delete datum.image
     delete datum.category
     delete datum.sort_order
 
@@ -118,6 +119,18 @@ module.exports = (options) => {
     })
     .sort()
 
+  // Merge “Smileys & Emotion” and “People & Body” into a single category
+  let smileys = data.categories[0]
+  let people = data.categories[1]
+  let smileysAndPeople = {id: 'people', name: 'Smileys & People'}
+  smileysAndPeople.emojis = []
+    .concat(smileys.emojis.slice(0, 114))
+    .concat(people.emojis)
+    .concat(smileys.emojis.slice(114))
+
+  data.categories.unshift(smileysAndPeople)
+  data.categories.splice(1, 2)
+
   fs.writeFile(options.output, JSON.stringify(data), (err) => {
     if (err) throw err
   })

data/apple.json

@@ -1,5 +1,5 @@
 const build = require('./build')
-const sets = ['apple', 'facebook', 'google', 'messenger', 'twitter']
+const sets = ['apple', 'facebook', 'google', 'twitter']
 
 build({output: 'data/local-images/all.js'})
 

data/facebook.json

@@ -5,7 +5,7 @@ var fs = require('fs'),
 
 var {compress} = require('../../src/utils/data')
 
-var sets = ['apple', 'facebook', 'google', 'messenger', 'twitter']
+var sets = ['apple', 'facebook', 'google', 'twitter']
 
 module.exports = (options) => {
   delete require.cache[require.resolve('emoji-datasource')]
@@ -30,15 +30,21 @@ module.exports = (options) => {
     localImageSets.forEach((set) => {
       var key = `has_img_${set}`
       if (datum[key]) {
-        datum.localImages[set] = [`require('../../../emoji-datasource-${set}/img/${set}/64/${datum.image}')`]
+        datum.localImages[set] = [
+          `require('../../../emoji-datasource-${set}/img/${set}/64/${
+            datum.image
+          }')`,
+        ]
 
         // Skin variations
         if (datum.skin_variations) {
           for (let skinKey in datum.skin_variations) {
             var skinVariations = datum.skin_variations[skinKey]
             if (skinVariations[key])
               datum.localImages[set].push(
-                `require('../../../emoji-datasource-${set}/img/${set}/64/${skinVariations.image}')`,
+                `require('../../../emoji-datasource-${set}/img/${set}/64/${
+                  skinVariations.image
+                }')`,
               )
           }
         }
@@ -98,7 +104,9 @@ module.exports = (options) => {
 
   var stingified = JSON.stringify(data)
     .replace(/\"([A-Za-z_]+)\":/g, '$1:')
-    .replace(/(["'])require(?:(?=(\\?))\2.)*?\1/g, (value) => value.replace(/"/g, ''))
+    .replace(/(["'])require(?:(?=(\\?))\2.)*?\1/g, (value) =>
+      value.replace(/"/g, ''),
+    )
 
   fs.writeFile(options.output, `export default ${stingified}`, (err) => {
     if (err) throw err