chore: fix keyboard shortcut priority

This commit is contained in:
Aman Harwara
2023-05-04 22:25:58 +05:30
parent 9fa6919618
commit c7d28d2b2f
3 changed files with 21 additions and 9 deletions

View File

@@ -93,7 +93,7 @@ const EditorWidthSelectionModal = ({
command: ESCAPE_COMMAND,
onKeyDown() {
close()
return
return true
},
})
}, [application.keyboardService, close])

View File

@@ -9,6 +9,8 @@ import { useAndroidBackHandler } from '@/NativeMobileWeb/useAndroidBackHandler'
import Modal from '../Modal/Modal'
import { classNames } from '@standardnotes/snjs'
import { isIOS } from '@/Utils'
import { useCommandService } from '../CommandProvider'
import { ESCAPE_COMMAND } from '@standardnotes/ui-services'
const PreferencesView: FunctionComponent<PreferencesProps> = ({
application,
@@ -17,6 +19,8 @@ const PreferencesView: FunctionComponent<PreferencesProps> = ({
userProvider,
mfaProvider,
}) => {
const commandService = useCommandService()
const menu = useMemo(
() => new PreferencesMenu(application, viewControllerManager.enableUnfinishedFeatures),
[viewControllerManager.enableUnfinishedFeatures, application],
@@ -42,6 +46,16 @@ const PreferencesView: FunctionComponent<PreferencesProps> = ({
}
}, [addAndroidBackHandler, closePreferences])
useEffect(() => {
return commandService.addCommandHandler({
command: ESCAPE_COMMAND,
onKeyDown: () => {
closePreferences()
return true
},
})
}, [commandService, closePreferences])
return (
<Modal
close={closePreferences}