From 5ee4096081399b7b9fed92049dc96a5c26d809e4 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Sun, 19 Nov 2017 13:53:18 -0800
Subject: [PATCH 1/3] Update deps to emoji-datasource 4.0.x

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bc194d4..2e715e9 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
   "author": "unimonkiez",
   "license": "MIT",
   "dependencies": {
-    "emoji-datasource": "2.4.x"
+    "emoji-datasource": "4.0.x"
   },
   "devDependencies": {
     "absurd": "^0.3.34",

From 712272840c7d203aba7e8362928e3d9ff0d75e2f Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Sun, 19 Nov 2017 13:53:42 -0800
Subject: [PATCH 2/3] Update category name map

Category names changed in emoji-data 4.0.x

diff --git a/src/map.js b/src/map.js
index c2f4dc8..45369f9 100644
--- a/src/map.js
+++ b/src/map.js
@@ -4,14 +4,14 @@ const SIZE = Constant.SIZE;
 const CATEGORY = Constant.CATEGORY;

 const categoryDataMap = {
-  Activity: CATEGORY.ACTIVITY,
-  Flags: CATEGORY.FLAGS,
-  Foods: CATEGORY.FOODS,
-  Nature: CATEGORY.NATURE,
-  Objects: CATEGORY.OBJECTS,
-  People: CATEGORY.PEOPLE,
-  Places: CATEGORY.PLACES,
-  Symbols: CATEGORY.SYMBOLS
+  "Activities": CATEGORY.ACTIVITY,
+  "Flags": CATEGORY.FLAGS,
+  "Food & Drink": CATEGORY.FOODS,
+  "Animals & Nature": CATEGORY.NATURE,
+  "Objects": CATEGORY.OBJECTS,
+  "Smileys & People": CATEGORY.PEOPLE,
+  "Travel & Places": CATEGORY.PLACES,
+  "Symbols": CATEGORY.SYMBOLS
 };

 const categoryNameMap = {
---
 src/map.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/map.js b/src/map.js
index c2f4dc8..dd020dd 100644
--- a/src/map.js
+++ b/src/map.js
@@ -4,14 +4,14 @@ const SIZE = Constant.SIZE;
 const CATEGORY = Constant.CATEGORY;
 
 const categoryDataMap = {
-  Activity: CATEGORY.ACTIVITY,
-  Flags: CATEGORY.FLAGS,
-  Foods: CATEGORY.FOODS,
-  Nature: CATEGORY.NATURE,
-  Objects: CATEGORY.OBJECTS,
-  People: CATEGORY.PEOPLE,
-  Places: CATEGORY.PLACES,
-  Symbols: CATEGORY.SYMBOLS
+  'Activities': CATEGORY.ACTIVITY,
+  'Flags': CATEGORY.FLAGS,
+  'Food & Drink': CATEGORY.FOODS,
+  'Animals & Nature': CATEGORY.NATURE,
+  'Objects': CATEGORY.OBJECTS,
+  'Smileys & People': CATEGORY.PEOPLE,
+  'Travel & Places': CATEGORY.PLACES,
+  'Symbols': CATEGORY.SYMBOLS
 };
 
 const categoryNameMap = {

From 27e0123c7a0f20e0ab903944170650e139d9ac7f Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Sun, 19 Nov 2017 14:30:17 -0800
Subject: [PATCH 3/3] Fix background position calculation

Sprite format changed slightly in emoji-datasource 4.0.x

> Added gaps between images in spritesheets to avoid bleed when displaying them
> zoomed - a 1px border around each image at all sizes

https://github.com/iamcal/emoji-data/blob/v4.0.0/CHANGES.md
---
 src/set.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/set.js b/src/set.js
index 8552531..bd6474b 100644
--- a/src/set.js
+++ b/src/set.js
@@ -72,7 +72,7 @@ module.exports = (api, imageSet, size) => {
   }, categoryOrder.reduce((catObj, category) => Object.assign(catObj,
     emojiData[category].reduce((emojiObj, emoji) => Object.assign(emojiObj, {
       [`.ep-e[data-index="${emoji.index}"]`]: Object.assign({
-        'background-position': `-${sizeNumber * emoji.sheet_x}px -${sizeNumber * emoji.sheet_y}px`
+        'background-position': `-${((2 + sizeNumber) * emoji.sheet_x) + 1}px -${((2 + sizeNumber) * emoji.sheet_y) + 1}px`
       }, !emoji[getBoolNameByImageSet(imageSet)] && {
         display: 'none'
       })