From 3795e512cce2bb6eb1cc83de577b008da6b3c19c Mon Sep 17 00:00:00 2001
From: Yeicor <4929005+Yeicor@users.noreply.github.com>
Date: Sat, 24 Feb 2024 12:21:16 +0100
Subject: [PATCH] better async components

---
 src/tools/LicensesDialogContent.vue |  2 +-
 src/tools/Selection.vue             |  3 +--
 src/tools/Tools.vue                 | 41 ++++++++++++++++++-----------
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/tools/LicensesDialogContent.vue b/src/tools/LicensesDialogContent.vue
index 9eada35..86783a2 100644
--- a/src/tools/LicensesDialogContent.vue
+++ b/src/tools/LicensesDialogContent.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 // License text for all dependencies, only downloaded when/if needed
 // @ts-ignore
-const licenseText = await import("bundle-text:../../assets/licenses.txt");
+import licenseText from "bundle-text:../../assets/licenses.txt";
 </script>
 
 <template>
diff --git a/src/tools/Selection.vue b/src/tools/Selection.vue
index 7062c2d..4a937c2 100644
--- a/src/tools/Selection.vue
+++ b/src/tools/Selection.vue
@@ -6,8 +6,7 @@ import type {ModelViewerElement} from '@google/model-viewer';
 import type {ModelScene} from "@google/model-viewer/lib/three-components/ModelScene";
 import {mdiCursorDefaultClick} from '@mdi/js';
 import type {Intersection, Material, Object3D} from "three";
-
-const {Raycaster} = await import("three");
+import {Raycaster} from "three";
 
 export type MObject3D = Object3D & {
   userData: { noHit?: boolean },
diff --git a/src/tools/Tools.vue b/src/tools/Tools.vue
index d70f5c4..153238e 100644
--- a/src/tools/Tools.vue
+++ b/src/tools/Tools.vue
@@ -7,9 +7,10 @@ import {
   VDivider,
   VSpacer,
   VToolbar,
-  VToolbarTitle
+  VToolbarTitle,
+  VTooltip,
 } from "vuetify/lib/components";
-import {Ref, ref, Suspense} from "vue";
+import {defineAsyncComponent, ref, Ref} from "vue";
 import OrientationGizmo from "./OrientationGizmo.vue";
 import type {PerspectiveCamera} from "three/src/cameras/PerspectiveCamera";
 import {OrthographicCamera} from "three/src/cameras/OrthographicCamera";
@@ -19,8 +20,19 @@ import {SceneMgrRefData} from "../misc/scene";
 import type {ModelViewerElement} from '@google/model-viewer';
 import type {Intersection} from "three";
 import type {MObject3D} from "./Selection.vue";
-import Selection from "./Selection.vue";
-import LicensesDialogContent from "./LicensesDialogContent.vue";
+import Loading from "../misc/Loading.vue";
+
+const SelectionComponent = defineAsyncComponent({
+  loader: () => import("./Selection.vue"),
+  loadingComponent: () => "Loading...",
+  delay: 0,
+});
+
+const LicensesDialogContent = defineAsyncComponent({
+  loader: () => import("./LicensesDialogContent.vue"),
+  loadingComponent: Loading,
+  delay: 0,
+});
 
 
 let props = defineProps<{ refSData: SceneMgrRefData }>();
@@ -95,10 +107,7 @@ async function openGithub() {
   </v-btn>
   <v-divider/>
   <h5>Selection ({{ selection.filter((s) => s.face).length }}F {{ selection.filter((s) => !s.face).length }}E)</h5>
-  <Suspense>
-    <selection :viewer="props.refSData.viewer" :scene="props.refSData.viewerScene" v-model="selection"/>
-    <template #fallback>Loading...</template>
-  </Suspense>
+  <selection-component :viewer="props.refSData.viewer" :scene="props.refSData.viewerScene" v-model="selection"/>
   <v-divider/>
   <v-spacer></v-spacer>
   <h5>Extras</h5>
@@ -122,18 +131,18 @@ async function openGithub() {
           </v-btn>
         </v-toolbar>
         <v-card-text>
-          <Suspense>
-            <licenses-dialog-content/>
-            <template #fallback>Loading...</template>
-          </Suspense>
+          <licenses-dialog-content/>
         </v-card-text>
       </v-card>
     </template>
   </v-dialog>
-  <v-btn icon @click="openGithub">
-    <svg-icon type="mdi" :path="mdiGithub"/>
-  </v-btn>
-  <!-- TODO: Licenses button -->
+  <v-tooltip text="Tooltip">
+    <template v-slot:activator="{ props }">
+      <v-btn v-bind="props" icon @click="openGithub">
+        <svg-icon type="mdi" :path="mdiGithub"/>
+      </v-btn>
+    </template>
+  </v-tooltip>
   <!-- TODO: Tooltips for ALL tools -->
 </template>