Fix race with importing before WASM is done

a-b-street · Mar 20, 2024 · 08f5a07 · 08f5a07
1 parent 0893453
commit 08f5a07
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/web/src/lane-editor/App.svelte b/web/src/lane-editor/App.svelte
@@ -15,8 +15,10 @@
   import RenderLaneMarkings from "../common/layers/RenderLaneMarkings.svelte";
   import RenderLanePolygons from "../common/layers/RenderLanePolygons.svelte";
 
+  let wasmReady = false;
   onMount(async () => {
     await init();
+    wasmReady = true;
   });
 
   let way: bigint | null = null;
@@ -54,7 +56,9 @@
     </p>
     <hr />
 
-    <ImportControls />
+    {#if wasmReady}
+      <ImportControls />
+    {/if}
     <hr />
 
     <EditWayControls {way} />

diff --git a/web/src/street-explorer/App.svelte b/web/src/street-explorer/App.svelte
@@ -24,8 +24,10 @@
   import IntersectionPopup from "./IntersectionPopup.svelte";
   import LanePopup from "./LanePopup.svelte";
 
+  let wasmReady = false;
   onMount(async () => {
     await init();
+    wasmReady = true;
   });
 
   // Some of the layer contents need to be under the Map component for Svelte
@@ -53,7 +55,9 @@
 
     <hr />
 
-    <ImportControls />
+    {#if wasmReady}
+      <ImportControls />
+    {/if}
 
     <br />