Refactor Loading

a-b-street · Apr 26, 2024 · c02e5e5 · c02e5e5
1 parent af9dd28
commit c02e5e5
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 29 deletions.
diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/src/common/Loading.svelte b/web/src/common/Loading.svelte
diff --git a/web/src/common/import/ImportControls.svelte b/web/src/common/import/ImportControls.svelte
@@ -12,7 +12,7 @@
  } from "../store";
  import { bbox, downloadGeneratedFile } from "../utils";
  import Osm2streetsSettings from "./Osm2streetsSettings.svelte";
- import { Loading } from "../";
+ import { Loading } from "svelte-utils";
 
  // This component manages a state machine for importing OSM data (from
  // Overpass or built-in files) and letting the user change import settings. It
@@ -157,7 +157,7 @@
  {#if imported.kind === "nothing"}
  <p>Choose an option above to import somewhere</p>
  {:else if imported.kind === "loading"}
- <Loading msg={imported.msg} />
+ <Loading loading={imported.msg} />
  {:else if imported.kind === "done"}
  <div>
  <button type="button" on:click={update}>Update OSM data</button>

diff --git a/web/src/common/index.ts b/web/src/common/index.ts
@@ -1,7 +1,6 @@
 export { default as BasemapPicker } from "./BasemapPicker.svelte";
 export { default as Geocoder } from "./Geocoder.svelte";
 export { default as Layout } from "./Layout.svelte";
-export { default as Loading } from "./Loading.svelte";
 export { default as Map } from "./Map.svelte";
 export { default as StreetView } from "./StreetView.svelte";
 export { default as ThemePicker } from "./ThemePicker.svelte";