jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Single context menu open at a time

This commit is contained in:
Josh Perez 2022-08-12 17:32:27 -04:00 committed by GitHub
parent 933a1e2b39
commit 6da4b03a1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ts/components/ContextMenu.tsx
View File

@ -35,6 +35,8 @@ export type PropsType<T> = {
readonly value?: T;
};
let closeCurrentOpenContextMenu: undefined | (() => unknown);
export function ContextMenu<T>({
children,
i18n,
@ -77,6 +79,7 @@ export function ContextMenu<T>({
const handleOutsideClick = (event: MouseEvent) => {
if (!referenceElement?.contains(event.target as Node)) {
setIsMenuShowing(false);
closeCurrentOpenContextMenu = undefined;
event.stopPropagation();
event.preventDefault();
}
@ -120,12 +123,15 @@ export function ContextMenu<T>({
focusedOption.onClick(focusedOption.value);
}
setIsMenuShowing(false);
closeCurrentOpenContextMenu = undefined;
ev.stopPropagation();
ev.preventDefault();
}
};
const handleClick = (ev: KeyboardEvent | React.MouseEvent) => {
closeCurrentOpenContextMenu?.();
closeCurrentOpenContextMenu = () => setIsMenuShowing(false);
setIsMenuShowing(true);
ev.stopPropagation();
ev.preventDefault();
@ -187,6 +193,7 @@ export function ContextMenu<T>({
onClick={() => {
option.onClick(option.value);
setIsMenuShowing(false);
closeCurrentOpenContextMenu = undefined;
}}
>
<div className={getClassName('__option--container')}>