Add support for Emoji 5 (#1797)

* Add support for Emoji 5

Update to latest emoji-datasource and emoji-js and switch to an up-to-date fork
of emoji-panel.

// FREEBIE

* Dark theme support for emoji-panel

Fixes #1763

// FREEBIE

package.json

@@ -153,9 +153,9 @@
     "electron-config": "^1.0.0",
     "electron-editor-context-menu": "^1.1.1",
     "electron-updater": "^2.16.1",
-    "emoji-datasource-apple": "^3.0.0",
-    "emoji-js": "^3.2.2",
-    "emoji-panel": "^0.5.2",
+    "emoji-datasource-apple": "^4.0.0",
+    "emoji-js": "^3.4.0",
+    "emoji-panel": "https://github.com/liliakai/emoji-panel.git#4e6bdd8",
     "google-libphonenumber": "^3.0.7",
     "lodash": "^4.17.4",
     "mkdirp": "^0.5.1",

stylesheets/_emoji.scss

@@ -113,7 +113,7 @@ button.emoji {
   height: 0px;
   .ep-e {
     background-image: url('../node_modules/emoji-datasource/sheet_apple_64.png');
-    background-size: 1312px;
+    background-size: 1734px;
   }
   .ep-slide {
     background-color: $blue;

stylesheets/android-dark.scss

@@ -33,7 +33,7 @@ $text-dark_l2: darken($text-dark, 30%);
       color: $text-dark;
     }
   }
-  button, .confirmation-dialog .content .buttons button {
+  .confirmation-dialog .content .buttons button {
     background-color: $button-dark;
     border: 1px solid $grey-dark_l2;
     &:hover {
@@ -290,4 +290,21 @@ $text-dark_l2: darken($text-dark, 30%);
   .capture-audio button:hover {
     background-color: $grey-dark;
   }
+  button.emoji {
+    &:hover {
+      background-color: $grey-dark;
+    }
+    &:before {
+      @include color-svg('../images/smile.svg', white);
+    }
+  }
+
+  .emoji-panel-container {
+    .ep-categories {
+      background-color: $grey-dark_l3;
+    }
+    .ep-emojies {
+      background-color: $grey-dark_l2;
+    }
+  }
 }

test/views/message_view_test.js

@@ -79,7 +79,7 @@ describe('MessageView', function() {
     view.render();
     var img = view.$el.find('.content img');
     assert.strictEqual(img.length, 1);
-    assert.strictEqual(img.attr('src'), 'node_modules/emoji-datasource-apple/img/apple/64/2764.png');
+    assert.strictEqual(img.attr('src'), 'node_modules/emoji-datasource-apple/img/apple/64/2764-fe0f.png');
     assert.strictEqual(img.attr('title'), ':heart:');
     assert.strictEqual(img.attr('class'), 'emoji');
   });

yarn.lock

@@ -1161,29 +1161,25 @@ electron@~1.7.9:
     electron-download "^3.0.1"
     extract-zip "^1.0.3"
 
-emoji-datasource-apple@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-datasource-apple/-/emoji-datasource-apple-3.0.0.tgz#1e5eb0443d0a9e20ec3ed01e77114ce601b19cec"
-
-emoji-datasource@2.4.x:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/emoji-datasource/-/emoji-datasource-2.4.4.tgz#b97ac1896bc208ecf1833564a20687a5215d0389"
+emoji-datasource-apple@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-datasource-apple/-/emoji-datasource-apple-4.0.0.tgz#f31a2cbf9295c66b5cc1e78635ee7b617430a08b"
 
-emoji-datasource@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-datasource/-/emoji-datasource-3.0.0.tgz#3c46c5aa4c39bb7a0c8e6877ae02cc94dbc1b12f"
+emoji-datasource@4.0.0, emoji-datasource@4.0.x:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-datasource/-/emoji-datasource-4.0.0.tgz#3fc9c0c2f4fb321d9291138819f6d100603d3e2f"
 
-emoji-js@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/emoji-js/-/emoji-js-3.2.2.tgz#9f371f4bbd04f18dce08429925620b66f49af6a5"
+emoji-js@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/emoji-js/-/emoji-js-3.4.0.tgz#dabdeda60c92d1948a5177e51ba9421d2029b052"
   dependencies:
-    emoji-datasource "3.0.0"
+    emoji-datasource "4.0.0"
 
-emoji-panel@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/emoji-panel/-/emoji-panel-0.5.2.tgz#866e935bd1220d4c7037ec904e381656dd7d0364"
+"emoji-panel@https://github.com/liliakai/emoji-panel.git#4e6bdd8":
+  version "0.5.4"
+  resolved "https://github.com/liliakai/emoji-panel.git#4e6bdd8546eb5f59d17abf9fd9643946c8947e6d"
   dependencies:
-    emoji-datasource "2.4.x"
+    emoji-datasource "4.0.x"
 
 encoding@^0.1.11:
   version "0.1.12"