h3n3/cadhub
1
0
Fork 0
Code Issues 35 Pull Requests Packages Projects Releases Wiki Activity

Move context provide up one layer to the DevIdePage

Browse Source 
Related to #360
This commit is contained in:
Kurt Hutten
2021-06-12 20:35:13 +10:00
parent cd94f11374
commit e9583166f4
8 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/web/src/components/EditorMenu/EditorMenu.tsx
View File

@@ -1,7 +1,7 @@
import { useContext } from 'react'
import { Menu } from '@headlessui/react'
import { IdeContext } from 'src/components/IdeToolbarNew/IdeToolbarNew'
import { IdeContext } from 'src/pages/DevIdePage/DevIdePage'
import Svg from 'src/components/Svg/Svg'
import { useRender } from 'src/components/IdeToolbarNew/useRender'
import {makeStlDownloadHandler, PullTitleFromFirstLine} from './helpers'

2
app/web/src/components/IdeConsole/IdeConsole.js
View File

@@ -1,5 +1,5 @@
import { useContext, useEffect } from 'react'
import { IdeContext } from 'src/components/IdeToolbarNew'
import { IdeContext } from 'src/pages/DevIdePage/DevIdePage'
import { matchEditorVsDarkTheme } from 'src/components/IdeEditor'
import PanelToolbar from 'src/components/PanelToolbar'

2
app/web/src/components/IdeContainer/IdeContainer.js
View File

@@ -1,6 +1,6 @@
import { useContext, useRef, useEffect } from 'react'
import { Mosaic, MosaicWindow } from 'react-mosaic-component'
import { IdeContext } from 'src/components/IdeToolbarNew'
import { IdeContext } from 'src/pages/DevIdePage/DevIdePage'
import { requestRender } from 'src/helpers/hooks/useIdeState'
import IdeEditor from 'src/components/IdeEditor'
import IdeViewer from 'src/components/IdeViewer'

2
app/web/src/components/IdeEditor/IdeEditor.js
View File

@@ -1,5 +1,5 @@
import { useContext, Suspense, lazy } from 'react'
import { IdeContext } from 'src/components/IdeToolbarNew'
import { IdeContext } from 'src/pages/DevIdePage/DevIdePage'
import { makeCodeStoreKey } from 'src/helpers/hooks/useIdeState'
import { requestRender } from 'src/helpers/hooks/useIdeState'
const Editor = lazy(() => import('@monaco-editor/react'))

59
app/web/src/components/IdeToolbarNew/IdeToolbarNew.js
View File

@@ -1,7 +1,7 @@
import { createContext, useEffect, useState } from 'react'
import { useContext, useEffect, useState } from 'react'
import IdeContainer from 'src/components/IdeContainer'
import { IdeContext } from 'src/pages/DevIdePage/DevIdePage'
import { isBrowser } from '@redwoodjs/prerender/browserUtils'
import { useIdeState } from 'src/helpers/hooks/useIdeState'
import { handleRenderVerbose } from './useRender'
import { decode } from 'src/helpers/compress'
import { flow } from 'lodash/fp'
@@ -19,9 +19,8 @@ export const githubSafe = (url) =>
const prepareEncodedUrl = flow(decodeURIComponent, githubSafe)
export const IdeContext = createContext()
const IdeToolbarNew = ({ cadPackage }) => {
const [state, thunkDispatch] = useIdeState()
const { state, thunkDispatch } = useContext(IdeContext)
const [shouldShowConstructionMessage, setShouldShowConstructionMessage] = useState(true)
const scriptKey = 'encoded_script'
const scriptKeyV2 = 'encoded_script_v2'
@@ -68,34 +67,32 @@ const IdeToolbarNew = ({ cadPackage }) => {
}
return (
<IdeContext.Provider value={{ state, thunkDispatch }}>
<div className="h-full flex">
<div className="w-16 bg-gray-700 flex-shrink-0">
<IdeSideBar />
</div>
<div className="h-full flex flex-grow flex-col">
<nav className="flex">
<IdeHeader handleRender={handleRender} />
</nav>
{shouldShowConstructionMessage && <div className="py-2 bg-pink-200 flex">
<div className="flex-grow text-center">
We're still working on this. Since you're here, have a look what{' '}
<OutBound
className="text-pink-700"
to="https://github.com/Irev-Dev/cadhub/discussions/212"
>
we've got planned
</OutBound>
.
</div>
<button className="flex" onClick={() => setShouldShowConstructionMessage(false)}>
<Svg className="h-4 w-6 text-gray-500 mr-3 items-center" name="x"/>
</button>
</div>}
<IdeContainer />
</div>
<div className="h-full flex">
<div className="w-16 bg-gray-700 flex-shrink-0">
<IdeSideBar />
</div>
</IdeContext.Provider>
<div className="h-full flex flex-grow flex-col">
<nav className="flex">
<IdeHeader handleRender={handleRender} />
</nav>
{shouldShowConstructionMessage && <div className="py-2 bg-pink-200 flex">
<div className="flex-grow text-center">
We're still working on this. Since you're here, have a look what{' '}
<OutBound
className="text-pink-700"
to="https://github.com/Irev-Dev/cadhub/discussions/212"
>
we've got planned
</OutBound>
.
</div>
<button className="flex" onClick={() => setShouldShowConstructionMessage(false)}>
<Svg className="h-4 w-6 text-gray-500 mr-3 items-center" name="x"/>
</button>
</div>}
<IdeContainer />
</div>
</div>
)
}

2
app/web/src/components/IdeToolbarNew/useRender.ts
View File

@@ -1,7 +1,7 @@
import { makeCodeStoreKey } from 'src/helpers/hooks/useIdeState'
import { requestRender } from 'src/helpers/hooks/useIdeState'
import { useContext } from 'react'
import { IdeContext } from 'src/components/IdeToolbarNew/IdeToolbarNew'
import { IdeContext } from 'src/pages/DevIdePage/DevIdePage'
export const handleRenderVerbose = ({thunkDispatch, state}) => {
thunkDispatch((dispatch, getState) => {

2
app/web/src/components/IdeViewer/IdeViewer.js
View File

@@ -1,4 +1,4 @@
import { IdeContext } from 'src/components/IdeToolbarNew'
import { IdeContext } from 'src/pages/DevIdePage/DevIdePage'
import { useRef, useState, useEffect, useContext } from 'react'
import {
Canvas,