From e69d263252a33bf76d8c7ea508e9882bfe9400f7 Mon Sep 17 00:00:00 2001 From: Frank Noirot Date: Wed, 20 Sep 2023 10:32:36 -0400 Subject: [PATCH] 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 --- src/App.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 4ba4ffead..9376d1f43 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -38,7 +38,7 @@ export function App() { const streamRef = useRef(null) useHotKeyListener() const { - deferredSetCode, + setCode, engineCommandManager, buttonDownInStream, openPanes, @@ -51,7 +51,7 @@ export function App() { } = useStore((s) => ({ guiMode: s.guiMode, setGuiMode: s.setGuiMode, - deferredSetCode: s.deferredSetCode, + setCode: s.setCode, engineCommandManager: s.engineCommandManager, buttonDownInStream: s.buttonDownInStream, openPanes: s.openPanes, @@ -142,15 +142,15 @@ export function App() { // on mount, and overwrite any locally-stored code useEffect(() => { if (isTauri() && loadedCode !== null) { - deferredSetCode(loadedCode) + setCode(loadedCode) } return () => { // Clear code on unmount if in desktop app if (isTauri()) { - deferredSetCode('') + setCode('') } } - }, [loadedCode, deferredSetCode]) + }, [loadedCode, setCode]) useSetupEngineManager(streamRef, token) useEngineConnectionSubscriptions()