Revert swapping setCode
for deferredSetCode
in App (#662)
This fix was implemented in https://github.com/KittyCAD/modeling-app/pull/649 to try and address https://github.com/KittyCAD/modeling-app/issues/545. However, we need to run `setCode` to execute immediately here or else files will not render in the 3D view when opened, as reported by @pierremtb. Reverting for now to allow for a timely release https://github.com/KittyCAD/modeling-app/pull/656 Signed-off-by: Frank Noirot <frank@kittycad.io>
This commit is contained in:
10
src/App.tsx
10
src/App.tsx
@ -38,7 +38,7 @@ export function App() {
|
|||||||
const streamRef = useRef<HTMLDivElement>(null)
|
const streamRef = useRef<HTMLDivElement>(null)
|
||||||
useHotKeyListener()
|
useHotKeyListener()
|
||||||
const {
|
const {
|
||||||
deferredSetCode,
|
setCode,
|
||||||
engineCommandManager,
|
engineCommandManager,
|
||||||
buttonDownInStream,
|
buttonDownInStream,
|
||||||
openPanes,
|
openPanes,
|
||||||
@ -51,7 +51,7 @@ export function App() {
|
|||||||
} = useStore((s) => ({
|
} = useStore((s) => ({
|
||||||
guiMode: s.guiMode,
|
guiMode: s.guiMode,
|
||||||
setGuiMode: s.setGuiMode,
|
setGuiMode: s.setGuiMode,
|
||||||
deferredSetCode: s.deferredSetCode,
|
setCode: s.setCode,
|
||||||
engineCommandManager: s.engineCommandManager,
|
engineCommandManager: s.engineCommandManager,
|
||||||
buttonDownInStream: s.buttonDownInStream,
|
buttonDownInStream: s.buttonDownInStream,
|
||||||
openPanes: s.openPanes,
|
openPanes: s.openPanes,
|
||||||
@ -142,15 +142,15 @@ export function App() {
|
|||||||
// on mount, and overwrite any locally-stored code
|
// on mount, and overwrite any locally-stored code
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (isTauri() && loadedCode !== null) {
|
if (isTauri() && loadedCode !== null) {
|
||||||
deferredSetCode(loadedCode)
|
setCode(loadedCode)
|
||||||
}
|
}
|
||||||
return () => {
|
return () => {
|
||||||
// Clear code on unmount if in desktop app
|
// Clear code on unmount if in desktop app
|
||||||
if (isTauri()) {
|
if (isTauri()) {
|
||||||
deferredSetCode('')
|
setCode('')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, [loadedCode, deferredSetCode])
|
}, [loadedCode, setCode])
|
||||||
|
|
||||||
useSetupEngineManager(streamRef, token)
|
useSetupEngineManager(streamRef, token)
|
||||||
useEngineConnectionSubscriptions()
|
useEngineConnectionSubscriptions()
|
||||||
|
Reference in New Issue
Block a user