feat: escape when submenu is open should close it instead of entire menu

This commit is contained in:
Antonella Sgarlatta
2021-05-07 18:08:22 -03:00
parent dd5873b513
commit 660525dc18
3 changed files with 29 additions and 12 deletions

View File

@@ -2,7 +2,7 @@ import { AppState } from '@/ui_models/app_state';
import { Icon, IconType } from './Icon';
import { Switch } from './Switch';
import { observer } from 'mobx-react-lite';
import { useEffect, useRef, useState } from 'preact/hooks';
import { useRef, useState, useEffect } from 'preact/hooks';
import {
Disclosure,
DisclosureButton,
@@ -13,19 +13,16 @@ type Props = {
appState: AppState;
closeOnBlur: (event: { relatedTarget: EventTarget | null }) => void;
setLockCloseOnBlur: (lock: boolean) => void;
onSubmenuChange?: (submenuOpen: boolean) => void;
};
export const NotesOptions = observer(
({ appState, closeOnBlur, setLockCloseOnBlur }: Props) => {
({ appState, closeOnBlur, setLockCloseOnBlur, onSubmenuChange }: Props) => {
const [tagsMenuOpen, setTagsMenuOpen] = useState(false);
const [tagsMenuPosition, setTagsMenuPosition] = useState({
top: 0,
right: 0,
});
const [lockedBlurAction, setLockedBlurAction] = useState<
Promise<void> | null
>(null);
const [shouldRunLockedBlurAction, setShouldRunLockedBlurAction] = useState(false);
const notes = Object.values(appState.notes.selectedNotes);
const hidePreviews = !notes.some((note) => !note.hidePreview);
@@ -43,6 +40,12 @@ export const NotesOptions = observer(
'cursor-pointer hover:bg-contrast color-text bg-transparent px-3 ' +
'text-left';
useEffect(() => {
if (onSubmenuChange) {
onSubmenuChange(tagsMenuOpen);
}
}, [tagsMenuOpen, onSubmenuChange]);
return (
<>
<Switch
@@ -173,7 +176,7 @@ export const NotesOptions = observer(
onClick={async () => {
setLockCloseOnBlur(true);
await appState.notes.setTrashSelectedNotes(!trashed, trashButtonRef);
setLockCloseOnBlur(true);
setLockCloseOnBlur(false);
}}
>
<Icon type={trashed ? IconType.Restore : IconType.Trash} className={iconClass} />