diff --git a/app/web/src/components/EditorMenu/AllShortcutsModal.tsx b/app/web/src/components/EditorMenu/AllShortcutsModal.tsx index 5af3486..2a63e4e 100644 --- a/app/web/src/components/EditorMenu/AllShortcutsModal.tsx +++ b/app/web/src/components/EditorMenu/AllShortcutsModal.tsx @@ -1,8 +1,10 @@ +import { Menu } from '@headlessui/react' import { useEffect, useState } from 'react' import { useHotkeys } from 'react-hotkeys-hook'; import { makeStyles } from '@material-ui/core/styles' import Dialog from '@material-ui/core/Dialog' import { editorMenuConfig } from './menuConfig'; +import { useIdeContext } from 'src/helpers/hooks/useIdeContext' const SHORTCUT = 'ctrl+/, command+/' @@ -16,8 +18,22 @@ const AllShortcutsModal = () => { const classes = useStyles() const [open, setOpen] = useState(false) useHotkeys(SHORTCUT, () => setOpen(!open), [open]) + const { state, thunkDispatch } = useIdeContext() - return ( + return (<> +
+ + { editorMenuConfig.filter(menu => menu.items.length).map(menu => + menu.items.map(item => ( + + )) + )} + +
setOpen(false)} className={classes.root}>

All Shortcuts

@@ -35,7 +51,7 @@ const AllShortcutsModal = () => { )}
- ) + ) } diff --git a/app/web/src/components/EditorMenu/menuConfig.tsx b/app/web/src/components/EditorMenu/menuConfig.tsx index b72cd63..a6f87c5 100644 --- a/app/web/src/components/EditorMenu/menuConfig.tsx +++ b/app/web/src/components/EditorMenu/menuConfig.tsx @@ -54,7 +54,7 @@ const fileMenuConfig = { }, { label: 'Cook Donut', - shortcut: 'ctrl+os+d', + shortcut: 'ctrl+d, command+d', shortcutLabel: cmdOrCtrl() + ' D', component: (props) => { const { config } = props