Upgrade emoji-mart to 3.0.1

app/styles/emoji_picker.scss

@@ -21,6 +21,7 @@
     border-bottom-width: 1px;
     border-top-left-radius: 5px;
     border-top-right-radius: 5px;
+    background: var(--background-color);
   }
 
   &:last-child {
@@ -47,6 +48,8 @@
   overflow: hidden;
   transition: color 0.1s ease-out;
   cursor: pointer;
+  background: transparent;
+  border: 0;
 
   &:hover {
     color: var(--primary-text-color--faint);
@@ -105,16 +108,18 @@
   padding: 10px;
   padding-right: 45px;
   background: var(--foreground-color);
+  position: relative;
 
   input {
     font-size: 14px;
     font-weight: 400;
-    color: var(--primary-text-color);
     padding: 7px 9px;
+    padding-right: 25px;
     font-family: inherit;
     display: block;
     width: 100%;
     background: var(--background-color);
+    color: var(--primary-text-color);
     border: 1px solid var(--brand-color--faint);
     border-radius: 9999px;
 
@@ -130,6 +135,30 @@
   }
 }
 
+.emoji-mart-search-icon {
+  position: absolute;
+  top: 18px;
+  right: 45px + 5px;
+  z-index: 2;
+  padding: 2px 5px 1px;
+  border: 0;
+  background: none;
+  transition: all 100ms linear;
+  transition-property: opacity;
+  pointer-events: auto;
+  opacity: 0.7;
+
+  &:disabled {
+    cursor: default;
+    pointer-events: none;
+    opacity: 0.3;
+  }
+
+  svg {
+    fill: var(--brand-color);
+  }
+}
+
 .emoji-mart-category .emoji-mart-emoji {
   cursor: pointer;
 
@@ -168,9 +197,36 @@
   }
 }
 
+/* For screenreaders only, via https://stackoverflow.com/a/19758620 */
+.emoji-mart-sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  border: 0;
+}
+
+.emoji-mart-category-list {
+  margin: 0;
+  padding: 0;
+}
+
+.emoji-mart-category-list li {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  display: inline-block;
+}
+
 .emoji-mart-emoji {
   position: relative;
   display: inline-block;
+  background: transparent;
+  border: 0;
+  padding: 0;
   font-size: 0;
 
   .fa {
@@ -188,19 +244,17 @@
 
 .emoji-mart-no-results {
   font-size: 14px;
-  text-align: center;
-  padding-top: 70px;
   color: var(--primary-text-color--faint);
-
+  text-align: center;
-  .emoji-mart-category-label {
+  padding: 5px 6px;
-    display: none;
+  padding-top: 70px;
-  }
 
   .emoji-mart-no-results-label {
     margin-top: 0.2em;
   }
 
   .emoji-mart-emoji:hover::before {
+    cursor: default;
     content: none;
   }
 }

package.json

@@ -66,7 +66,7 @@
     "detect-passive-events": "^2.0.0",
     "dotenv": "^8.0.0",
     "emoji-datasource": "4.0.4",
-    "emoji-mart": "https://gitlab.com/soapbox-pub/emoji-mart#build",
+    "emoji-mart": "^3.0.1",
     "es6-symbol": "^3.1.1",
     "escape-html": "^1.0.3",
     "exif-js": "^2.3.0",

yarn.lock

@@ -1444,6 +1444,13 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.14.6", "@babel/runtime@^7.8.4":
+  version "7.14.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.6.tgz#535203bc0892efc7dec60bdc27b2ecf6e409062d"
+  integrity sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/runtime@^7.1.2":
   version "7.4.5"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12"
@@ -1465,13 +1472,6 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.14.6", "@babel/runtime@^7.8.4":
-  version "7.14.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.6.tgz#535203bc0892efc7dec60bdc27b2ecf6e409062d"
-  integrity sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
 "@babel/runtime@^7.7.2":
   version "7.7.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.2.tgz#111a78002a5c25fc8e3361bedc9529c696b85a6a"
@@ -4978,9 +4978,13 @@ emoji-datasource@4.0.4:
   resolved "https://registry.yarnpkg.com/emoji-datasource/-/emoji-datasource-4.0.4.tgz#516b9ab2f34569e468e4e3753a34a47a0b2b5aa3"
   integrity sha1-UWuasvNFaeRo5ON1OjSkegsrWqM=
 
-"emoji-mart@https://gitlab.com/soapbox-pub/emoji-mart#build":
+emoji-mart@^3.0.1:
-  version "2.6.3"
+  version "3.0.1"
-  resolved "https://gitlab.com/soapbox-pub/emoji-mart#4bdefa3d3ee7eb58716adc8727f688facc557291"
+  resolved "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-3.0.1.tgz#9ce86706e02aea0506345f98464814a662ca54c6"
+  integrity sha512-sxpmMKxqLvcscu6mFn9ITHeZNkGzIvD0BSNFE/LJESPbCA8s1jM6bCDPjWbV31xHq7JXaxgpHxLB54RCbBZSlg==
+  dependencies:
+    "@babel/runtime" "^7.0.0"
+    prop-types "^15.6.0"
 
 emoji-regex@^7.0.1:
   version "7.0.3"