Merge origin/main

This commit is contained in:
Frank Johnson
2021-09-11 06:05:17 -04:00
15 changed files with 2894 additions and 2593 deletions

View File

@@ -8,6 +8,7 @@ import Svg from 'src/components/Svg/Svg'
import { useIdeInit } from 'src/components/EncodedUrl/helpers'
import { useIdeContext } from 'src/helpers/hooks/useIdeContext'
import { useSaveCode } from 'src/components/IdeWrapper/useSaveCode'
import { ShortcutsModalContext } from 'src/components/EditorMenu/AllShortcutsModal'
interface Props {
cadPackage: string
@@ -22,9 +23,15 @@ const IdeWrapper = ({ cadPackage }: Props) => {
saveCode({ code: state.code })
}
useIdeInit(cadPackage, project?.code || state?.code)
const [shortcutModalOpen, setShortcutModalOpen] = useState(false)
const shortcutModalContextValues = {
open: shortcutModalOpen,
toggleOpen: () => setShortcutModalOpen(!shortcutModalOpen),
}
return (
<div className="h-full flex flex-col">
<ShortcutsModalContext.Provider value={shortcutModalContextValues}>
<nav className="flex">
<IdeHeader handleRender={onRender} />
</nav>
@@ -36,6 +43,7 @@ const IdeWrapper = ({ cadPackage }: Props) => {
<IdeContainer />
</div>
</div>
</ShortcutsModalContext.Provider>
</div>
)
}