From caefefc2c22704fc4f678a680592d885880193d0 Mon Sep 17 00:00:00 2001
From: Robin Townsend <robin@robin.town>
Date: Tue, 27 Jul 2021 17:22:49 -0400
Subject: [PATCH 1/3] Add regional indicators to emoji picker

Signed-off-by: Robin Townsend <robin@robin.town>
---
 src/emoji.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/emoji.ts b/src/emoji.ts
index 321eae63f69..1445f737d69 100644
--- a/src/emoji.ts
+++ b/src/emoji.ts
@@ -35,6 +35,9 @@ export const EMOTICON_TO_EMOJI = new Map<string, IEmoji>();
 
 export const getEmojiFromUnicode = unicode => UNICODE_TO_EMOJI.get(stripVariation(unicode));
 
+const isRegionalIndicator = (x: string) =>
+    Array.from(x).length === 1 && x >= '\u{1f1e6}' && x <= '\u{1f1ff}';
+
 const EMOJIBASE_GROUP_ID_TO_CATEGORY = [
     "people", // smileys
     "people", // actually people
@@ -72,7 +75,11 @@ export const EMOJI: IEmoji[] = EMOJIBASE.map((emojiData: Omit<IEmoji, "shortcode
         shortcodes: typeof shortcodeData === "string" ? [shortcodeData] : shortcodeData,
     };
 
-    const categoryId = EMOJIBASE_GROUP_ID_TO_CATEGORY[emoji.group];
+    // We manually include regional indicators in the symbols group, since
+    // Emojibase intentionally leaves them uncategorized
+    const categoryId = EMOJIBASE_GROUP_ID_TO_CATEGORY[emoji.group] ??
+        (isRegionalIndicator(emoji.unicode) ? "symbols" : null);
+
     if (DATA_BY_CATEGORY.hasOwnProperty(categoryId)) {
         DATA_BY_CATEGORY[categoryId].push(emoji);
     }

From d3c69e0d042b833b7ca72df52b18ab6ca9217d5b Mon Sep 17 00:00:00 2001
From: Robin Townsend <robin@robin.town>
Date: Tue, 27 Jul 2021 17:35:34 -0400
Subject: [PATCH 2/3] Add more types

Signed-off-by: Robin Townsend <robin@robin.town>
---
 src/emoji.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/emoji.ts b/src/emoji.ts
index 1445f737d69..e871e0bb580 100644
--- a/src/emoji.ts
+++ b/src/emoji.ts
@@ -35,7 +35,7 @@ export const EMOTICON_TO_EMOJI = new Map<string, IEmoji>();
 
 export const getEmojiFromUnicode = unicode => UNICODE_TO_EMOJI.get(stripVariation(unicode));
 
-const isRegionalIndicator = (x: string) =>
+const isRegionalIndicator = (x: string): boolean =>
     Array.from(x).length === 1 && x >= '\u{1f1e6}' && x <= '\u{1f1ff}';
 
 const EMOJIBASE_GROUP_ID_TO_CATEGORY = [

From fef2d408f6520aa4e7ed6647d1968bb42fc126c7 Mon Sep 17 00:00:00 2001
From: Robin Townsend <robin@robin.town>
Date: Thu, 5 Aug 2021 17:56:16 -0400
Subject: [PATCH 3/3] Add comments to isRegionalIndicator

Signed-off-by: Robin Townsend <robin@robin.town>
---
 src/emoji.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/emoji.ts b/src/emoji.ts
index e871e0bb580..ee84583fc97 100644
--- a/src/emoji.ts
+++ b/src/emoji.ts
@@ -35,8 +35,15 @@ export const EMOTICON_TO_EMOJI = new Map<string, IEmoji>();
 
 export const getEmojiFromUnicode = unicode => UNICODE_TO_EMOJI.get(stripVariation(unicode));
 
-const isRegionalIndicator = (x: string): boolean =>
-    Array.from(x).length === 1 && x >= '\u{1f1e6}' && x <= '\u{1f1ff}';
+const isRegionalIndicator = (x: string): boolean => {
+    // First verify that the string is a single character. We use Array.from
+    // to make sure we count by characters, not UTF-8 code units.
+    return Array.from(x).length === 1 &&
+        // Next verify that the character is within the code point range for
+        // regional indicators.
+        // http://unicode.org/charts/PDF/Unicode-6.0/U60-1F100.pdf
+        x >= '\u{1f1e6}' && x <= '\u{1f1ff}';
+};
 
 const EMOJIBASE_GROUP_ID_TO_CATEGORY = [
     "people", // smileys