Simplify loading emoji data (#1790)

bluesky-social · Nov 1, 2023 · f9944b5 · f9944b5
1 parent 9fb2051
commit f9944b5
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 22 deletions.
diff --git a/src/platform/polyfills.web.ts b/src/platform/polyfills.web.ts
@@ -6,12 +6,3 @@ findLast.shim()
 
 // @ts-ignore whatever typescript wants to complain about here, I dont care about -prf
 window.setImmediate = (cb: () => void) => setTimeout(cb, 0)
-
-// @ts-ignore not on the TS signature due to bad support -prf
-if (!globalThis.Intl?.Segmenter) {
-  // loading emoji mart data
-  // TODO: This condition doesn't make sense; emojimart has nothing to do with Intl.
-  const emojiMartScript = document.createElement('script')
-  emojiMartScript.setAttribute('src', '/static/js/emoji-mart-data.js')
-  document.head.appendChild(emojiMartScript)
-}
diff --git a/src/view/com/composer/text-input/web/EmojiPicker.web.tsx b/src/view/com/composer/text-input/web/EmojiPicker.web.tsx
@@ -72,8 +72,9 @@ export function EmojiPicker({close}: {close: () => void}) {
               },
             ]}>
             <Picker
-              // @ts-ignore we set emojiMartData in `emoji-mart-data.js` file
-              data={window.emojiMartData}
+              data={async () => {
+                return (await import('./EmojiPickerData.json')).default
+              }}
               onEmojiSelect={onInsert}
               autoFocus={false}
             />

diff --git a/bskyweb/static/emojis.2023.json → ...poser/text-input/web/EmojiPickerData.json b/bskyweb/static/emojis.2023.json → ...poser/text-input/web/EmojiPickerData.json
diff --git a/web/static/js/emoji-mart-data.js b/web/static/js/emoji-mart-data.js