Refactor Modal

a-b-street · Apr 27, 2024 · da2093c · da2093c
1 parent b577d9d
commit da2093c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 38 deletions.
diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/src/About.svelte b/web/src/About.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-  import { Modal, notNull } from "./common";
+  import { Modal } from "svelte-utils";
+  import { notNull } from "./common";
   import { showAbout } from "./stores";
 </script>
 

diff --git a/web/src/Settings.svelte b/web/src/Settings.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-  import { BasemapPicker, Modal } from "./common";
+  import { BasemapPicker } from "./common";
+  import { Modal } from "svelte-utils";
   import { lightMode } from "./stores";
   import settingsLight from "../assets/settings_light.svg?url";
   import settingsDark from "../assets/settings_dark.svg?url";

diff --git a/web/src/common/Modal.svelte b/web/src/common/Modal.svelte
diff --git a/web/src/common/index.ts b/web/src/common/index.ts
@@ -8,7 +8,6 @@ export { default as BasemapPicker } from "./BasemapPicker.svelte";
 export { default as DisableInteractiveLayers } from "./DisableInteractiveLayers.svelte";
 export { default as Layout } from "./Layout.svelte";
 export { default as Link } from "./Link.svelte";
-export { default as Modal } from "./Modal.svelte";
 export { default as OverpassSelector } from "./OverpassSelector.svelte";
 export { default as Popup } from "./Popup.svelte";
 export { default as StreetView } from "./StreetView.svelte";

diff --git a/web/src/edit/ChangeModalFilter.svelte b/web/src/edit/ChangeModalFilter.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
+  import { Modal } from "svelte-utils";
   import { filterType } from "../stores";
-  import { Modal, notNull } from "../common";
+  import { notNull } from "../common";
 
   // TODO Use of import.meta.env.BASE_URL below is to workaround https://github.com/vitejs/vite/issues/10601