fix crash on emoji selection from emojiboard (#2249)

* fix crash on emoji select

* fix crash in message editor on emoji select
This commit is contained in:
Ajay Bura 2025-03-05 13:23:28 +11:00 committed by GitHub
parent 19cf700d61
commit 5d00383d71
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 4 deletions

View file

@ -600,8 +600,13 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
onCustomEmojiSelect={handleEmoticonSelect} onCustomEmojiSelect={handleEmoticonSelect}
onStickerSelect={handleStickerSelect} onStickerSelect={handleStickerSelect}
requestClose={() => { requestClose={() => {
setEmojiBoardTab(undefined); setEmojiBoardTab((t) => {
if (!mobileOrTablet()) ReactEditor.focus(editor); if (t) {
if (!mobileOrTablet()) ReactEditor.focus(editor);
return undefined;
}
return t;
});
}} }}
/> />
} }

View file

@ -305,8 +305,13 @@ export const MessageEditor = as<'div', MessageEditorProps>(
onEmojiSelect={handleEmoticonSelect} onEmojiSelect={handleEmoticonSelect}
onCustomEmojiSelect={handleEmoticonSelect} onCustomEmojiSelect={handleEmoticonSelect}
requestClose={() => { requestClose={() => {
setAnchor(undefined); setAnchor((v) => {
if (!mobileOrTablet()) ReactEditor.focus(editor); if (v) {
if (!mobileOrTablet()) ReactEditor.focus(editor);
return undefined;
}
return v;
});
}} }}
/> />
} }