Skip to content

fix: import emoji-mart dynamically like (#950) #1491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 5, 2025
Merged

fix: import emoji-mart dynamically like (#950) #1491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1a6cf9
fix: import emoji-mart dynamically like (#950)
nperez0111 Mar 5, 2025
addd923
fix: load emoji data dynamically and initialize emoji mart with that …
nperez0111 Mar 5, 2025
267cc31
fix: handle races for fetching
nperez0111 Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 34 additions & 17 deletions packages/core/src/extensions/SuggestionMenu/getDefaultEmojiPickerItems.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,42 @@ import {
} from "../../schema/index.js";
import { DefaultGridSuggestionItem } from "./DefaultGridSuggestionItem.js";

let data:
// Temporary fix for https://github.com/missive/emoji-mart/pull/929
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fyi, the reason data was global and could be a promise would be to prevent duplicate loads when loadEmojiMart is called twice in a row.

Didn't help readability and it might be a premature optimization so I'm ok with the new version as long as we don't see this causing any issues

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I can de-dupe easily. I'll pull that in.

let emojiLoadingPromise:
| Promise<{
default: EmojiMartData;
emojiMart: typeof import("emoji-mart");
emojiData: EmojiMartData;
}>
| undefined;

let emojiMart: typeof import("emoji-mart") | undefined;
async function loadEmojiMart() {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Decided to make both of these the same, and also made them Node.js safe

if (emojiLoadingPromise) {
return emojiLoadingPromise;
}

emojiLoadingPromise = (async () => {
// load dynamically because emoji-mart doesn't specify type: module and breaks in nodejs
const [emojiMartModule, emojiDataModule] = await Promise.all([
import("emoji-mart"),
// use a dynamic import to encourage bundle-splitting
// and a smaller initial client bundle size
import("@emoji-mart/data"),
]);

const emojiMart =
"default" in emojiMartModule ? emojiMartModule.default : emojiMartModule;
const emojiData =
"default" in emojiDataModule
? (emojiDataModule.default as EmojiMartData)
: (emojiDataModule as EmojiMartData);

await emojiMart.init({ data: emojiData });

return { emojiMart, emojiData };
})();

return emojiLoadingPromise;
}

export async function getDefaultEmojiPickerItems<
BSchema extends BlockSchema,
Expand All @@ -29,23 +58,11 @@ export async function getDefaultEmojiPickerItems<
return [];
}

if (!data) {
// use a dynamic import to encourage bundle-splitting
// and a smaller initial client bundle size

data = import("@emoji-mart/data") as any;

// load dynamically because emoji-mart doesn't specify type: module and breaks in nodejs
emojiMart = await import("emoji-mart");
const emojiMartData = (await data)!.default;
await emojiMart.init({ data: emojiMartData });
}

const emojiMartData = (await data)!.default;
const { emojiData, emojiMart } = await loadEmojiMart();

const emojisToShow =
query.trim() === ""
? Object.values(emojiMartData.emojis)
? Object.values(emojiData.emojis)
: ((await emojiMart!.SearchIndex.search(query)) as Emoji[]);

return emojisToShow.map((emoji) => ({
Expand Down
45 changes: 43 additions & 2 deletions packages/react/src/components/Comments/EmojiMartPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,43 @@
// From https://github.com/missive/emoji-mart/blob/main/packages/emoji-mart-react/react.tsx
import type { EmojiMartData } from "@emoji-mart/data";
import React, { useEffect, useRef } from "react";
import { Picker } from "emoji-mart";

// Temporary fix for https://github.com/missive/emoji-mart/pull/929
let emojiLoadingPromise:
| Promise<{
emojiMart: typeof import("emoji-mart");
emojiData: EmojiMartData;
}>
| undefined;

async function loadEmojiMart() {
if (emojiLoadingPromise) {
return emojiLoadingPromise;
}

emojiLoadingPromise = (async () => {
// load dynamically because emoji-mart doesn't specify type: module and breaks in nodejs
const [emojiMartModule, emojiDataModule] = await Promise.all([
import("emoji-mart"),
// use a dynamic import to encourage bundle-splitting
// and a smaller initial client bundle size
import("@emoji-mart/data"),
]);

const emojiMart =
"default" in emojiMartModule ? emojiMartModule.default : emojiMartModule;
const emojiData =
"default" in emojiDataModule
? (emojiDataModule.default as EmojiMartData)
: (emojiDataModule as EmojiMartData);

await emojiMart.init({ data: emojiData });

return { emojiMart, emojiData };
})();

return emojiLoadingPromise;
}

// eslint-disable-next-line @typescript-eslint/no-explicit-any
export default function EmojiPicker(props: any) {
Expand All @@ -12,7 +49,11 @@ export default function EmojiPicker(props: any) {
}

useEffect(() => {
instance.current = new Picker({ ...props, ref });
(async () => {
const { emojiMart } = await loadEmojiMart();

instance.current = new emojiMart.Picker({ ...props, ref });
})();

return () => {
instance.current = null;
Expand Down
Loading