From 9545113d9e00aea39f05d4493ca0b17c14e65233 Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Sun, 26 Sep 2021 15:26:32 -0700
Subject: [PATCH] feat: Emoji picker in editor (#2611)

---
 package.json    |  2 +-
 shared/theme.js |  1 +
 yarn.lock       | 26 ++++++++++++++++++++++----
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d5b7c9dc8..523d20fde 100644
--- a/package.json
+++ b/package.json
@@ -149,7 +149,7 @@
     "react-window": "^1.8.6",
     "reakit": "^1.3.10",
     "regenerator-runtime": "^0.13.7",
-    "rich-markdown-editor": "^11.17.10",
+    "rich-markdown-editor": "^11.18.2",
     "semver": "^7.3.2",
     "sequelize": "^6.3.4",
     "sequelize-cli": "^6.2.0",
diff --git a/shared/theme.js b/shared/theme.js
index c0b9f7b6a..038459026 100644
--- a/shared/theme.js
+++ b/shared/theme.js
@@ -93,6 +93,7 @@ export const base = {
   blockToolbarItem: colors.almostBlack,
   blockToolbarText: colors.almostBlack,
   blockToolbarTextSelected: colors.black,
+  blockToolbarSelectedBackground: colors.slateLight,
   blockToolbarHoverBackground: colors.slateLight,
   blockToolbarDivider: colors.slateLight,
   blockToolbarIcon: undefined,
diff --git a/yarn.lock b/yarn.lock
index 2a07ef9a9..56a92c5ee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6861,6 +6861,16 @@ functions-have-names@^1.2.2:
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.2.tgz#98d93991c39da9361f8e50b337c4f6e41f120e21"
   integrity sha512-bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA==
 
+fuzzy-search@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/fuzzy-search/-/fuzzy-search-3.2.1.tgz#65d5faad6bc633aee86f1898b7788dfe312ac6c9"
+  integrity sha512-vAcPiyomt1ioKAsAL2uxSABHJ4Ju/e4UeDM+g1OlR0vV4YhLGMNsdLNvZTpEDY4JCSt0E4hASCNM5t2ETtsbyg==
+
+gemoji@6.x:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/gemoji/-/gemoji-6.1.0.tgz#268fbb0c81d1a8c32a4bcc39bdfdd66080ba7ce9"
+  integrity sha512-MOlX3doQ1fsfzxQX8Y+u6bC5Ssc1pBUBIPVyrS69EzKt+5LIZAOm0G5XGVNhwXFgkBF3r+Yk88ONyrFHo8iNFA==
+
 gensync@^1.0.0-beta.1:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -9803,6 +9813,11 @@ markdown-it-container@^3.0.0:
   resolved "https://registry.yarnpkg.com/markdown-it-container/-/markdown-it-container-3.0.0.tgz#1d19b06040a020f9a827577bb7dbf67aa5de9a5b"
   integrity sha512-y6oKTq4BB9OQuY/KLfk/O3ysFhB3IMYoIWhGJEidXt1NQFocFK2sA2t0NYZAMyMShAGL6x5OPIbrmXPIqaN9rw==
 
+markdown-it-emoji@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/markdown-it-emoji/-/markdown-it-emoji-2.0.0.tgz#3164ad4c009efd946e98274f7562ad611089a231"
+  integrity sha512-39j7/9vP/CPCKbEI44oV8yoPJTpvfeReTn/COgRhSpNrjWF3PfP/JUxxB0hxV6ynOY8KH8Y8aX9NMDdo6z+6YQ==
+
 markdown-it@^10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz#abfc64f141b1722d663402044e43927f1f50a8dc"
@@ -12481,15 +12496,18 @@ retry-as-promised@^3.2.0:
   dependencies:
     any-promise "^1.3.0"
 
-rich-markdown-editor@^11.17.10:
-  version "11.17.10"
-  resolved "https://registry.yarnpkg.com/rich-markdown-editor/-/rich-markdown-editor-11.17.10.tgz#50947b5df8e2f0198b025ff8adc2b638b48d81a0"
-  integrity sha512-MP/kXP0lKvg1Qmxagunh+HkX5/7SgGcSrYGaImhe/0c2zlaEtMJNk/631qIR37BrznF92XRXrB+ZE5hon/jrwQ==
+rich-markdown-editor@^11.18.2:
+  version "11.18.2"
+  resolved "https://registry.yarnpkg.com/rich-markdown-editor/-/rich-markdown-editor-11.18.2.tgz#866d63850065c21fd0e831ff751f31365de7fd14"
+  integrity sha512-mTfAN3qGCZsh/WuTQUq76Xasr1CiIYyXyVzp8ceZv5jipjl1fDMXNjDiXxVPvkB/lL/lpNxsdp6vnsFm6Fy56g==
   dependencies:
     copy-to-clipboard "^3.0.8"
+    fuzzy-search "^3.2.1"
+    gemoji "6.x"
     lodash "^4.17.11"
     markdown-it "^12.2.0"
     markdown-it-container "^3.0.0"
+    markdown-it-emoji "^2.0.0"
     outline-icons "^1.26.1"
     prosemirror-commands "^1.1.6"
     prosemirror-dropcursor "^1.3.3"