From 320e8e4fb8ac018cfae55138529a1a4a9c8f6c2d Mon Sep 17 00:00:00 2001
From: Kurt Hutten <kurt@kurthutten.com>
Date: Mon, 26 Apr 2021 19:18:53 +1000
Subject: [PATCH] Fix bug where images was being converted to stl and erroring

---
 web/src/components/IdeToolbarNew/IdeToolbarNew.js |  2 +-
 web/src/components/IdeViewer/IdeViewer.js         | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/web/src/components/IdeToolbarNew/IdeToolbarNew.js b/web/src/components/IdeToolbarNew/IdeToolbarNew.js
index b99f9d3..dc12d73 100644
--- a/web/src/components/IdeToolbarNew/IdeToolbarNew.js
+++ b/web/src/components/IdeToolbarNew/IdeToolbarNew.js
@@ -50,7 +50,7 @@ const IdeToolbarNew = ({ cadPackage }) => {
   }
 
   return (
-    <IdeContext.Provider value={{ state, thunkDispatch: thunkDispatch }}>
+    <IdeContext.Provider value={{ state, thunkDispatch }}>
       <div className="h-full flex flex-col">
         <nav className="flex">
           <button
diff --git a/web/src/components/IdeViewer/IdeViewer.js b/web/src/components/IdeViewer/IdeViewer.js
index b5f295b..0362e32 100644
--- a/web/src/components/IdeViewer/IdeViewer.js
+++ b/web/src/components/IdeViewer/IdeViewer.js
@@ -14,19 +14,19 @@ import { requestRender } from 'src/helpers/hooks/useIdeState'
 
 extend({ OrbitControls })
 
-function Asset({ url }) {
+function Asset({ stlData }) {
   const [loadedGeometry, setLoadedGeometry] = useState()
   const mesh = useRef()
   const ref = useUpdate((geometry) => {
     geometry.attributes = loadedGeometry.attributes
   })
   useEffect(() => {
-    if (url) {
-      const decoded = atob(url)
+    if (stlData) {
+      const decoded = atob(stlData)
       const loader = new STLLoader()
       setLoadedGeometry(loader.parse(decoded))
     }
-  }, [url])
+  }, [stlData])
   if (!loadedGeometry) return null
   return (
     <mesh ref={mesh} scale={[1, 1, 1]}>
@@ -228,7 +228,11 @@ const IdeViewer = () => {
             </>
           )}
           {state.ideType === 'cadQuery' && (
-            <Asset url={state.objectData?.data} />
+            <Asset
+              stlData={
+                state.objectData?.type === 'stl' && state.objectData?.data
+              }
+            />
           )}
         </Canvas>
       </div>