feat: escape when submenu is open should close it instead of entire menu
This commit is contained in:
@@ -2,7 +2,7 @@ import { AppState } from '@/ui_models/app_state';
|
||||
import { toDirective, useCloseOnBlur } from './utils';
|
||||
import { observer } from 'mobx-react-lite';
|
||||
import { NotesOptions } from './NotesOptions';
|
||||
import { useEffect, useRef } from 'preact/hooks';
|
||||
import { useEffect, useRef, useState } from 'preact/hooks';
|
||||
|
||||
type Props = {
|
||||
appState: AppState;
|
||||
@@ -12,12 +12,18 @@ const NotesContextMenu = observer(({ appState }: Props) => {
|
||||
const contextMenuRef = useRef<HTMLDivElement>();
|
||||
const [closeOnBlur, setLockCloseOnBlur] = useCloseOnBlur(
|
||||
contextMenuRef,
|
||||
(open: boolean) => appState.notes.setContextMenuOpen(open)
|
||||
(open: boolean) => null
|
||||
);
|
||||
const [submenuOpen, setSubmenuOpen] = useState(false);
|
||||
|
||||
const closeOnClickOutside = (event: MouseEvent) => {
|
||||
if (!contextMenuRef.current?.contains(event.target as Node)) {
|
||||
appState.notes.setContextMenuOpen(false);
|
||||
if (submenuOpen) {
|
||||
setSubmenuOpen(false);
|
||||
} else {
|
||||
console.log('here');
|
||||
appState.notes.setContextMenuOpen(false);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -38,6 +44,8 @@ const NotesContextMenu = observer(({ appState }: Props) => {
|
||||
appState={appState}
|
||||
closeOnBlur={closeOnBlur}
|
||||
setLockCloseOnBlur={setLockCloseOnBlur}
|
||||
submenuOpen={submenuOpen}
|
||||
setSubmenuOpen={setSubmenuOpen}
|
||||
/>
|
||||
</div>
|
||||
) : null;
|
||||
|
||||
Reference in New Issue
Block a user