mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fix message input emoji focus close (#4727)

Browse source
This commit is contained in:
007 2021-02-04 22:37:47 +00:00 • committed by GitHub
parent 2501584db6
commit 062a1f7dd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ts/components/emoji/EmojiButton.tsx
View file

@ -11,6 +11,7 @@ import { LocalizerType } from '../../types/Util';
export type OwnProps = {
readonly i18n: LocalizerType;
readonly onClose?: () => unknown;
};
export type Props = OwnProps &
@ -23,6 +24,7 @@ export const EmojiButton = React.memo(
({
i18n,
doSend,
onClose,
onPickEmoji,
skinTone,
onSetSkinTone,
@ -43,7 +45,10 @@ export const EmojiButton = React.memo(
const handleClose = React.useCallback(() => {
setOpen(false);
}, [setOpen]);
if (onClose) {
onClose();
}
}, [setOpen, onClose]);
// Create popper root and handle outside clicks
React.useEffect(() => {
@ -51,9 +56,11 @@ export const EmojiButton = React.memo(
const root = document.createElement('div');
setPopperRoot(root);
document.body.appendChild(root);
const handleOutsideClick = ({ target }: MouseEvent) => {
if (!root.contains(target as Node)) {
setOpen(false);
const handleOutsideClick = (event: MouseEvent) => {
if (!root.contains(event.target as Node)) {
handleClose();
event.stopPropagation();
event.preventDefault();
}
};
document.addEventListener('click', handleOutsideClick);
@ -66,7 +73,7 @@ export const EmojiButton = React.memo(
}
return noop;
}, [open, setOpen, setPopperRoot]);
}, [open, setOpen, setPopperRoot, handleClose]);
// Install keyboard shortcut to open emoji picker
React.useEffect(() => {