Merge pull request #169 from Geode-solutions/next

Next

components/RemoteRenderingView.vue

@@ -1,6 +1,6 @@
 <template>
   <ClientOnly>
-    <div style="position: relative; width: 100%; height: 100%">
+    <div style="position: relative; width: 100%; height: calc(100vh - 80px)">
       <view-toolbar />
       <slot name="ui"></slot>
       <v-col
@@ -22,12 +22,17 @@
 
 <script setup>
   import vtkRemoteView from "@kitware/vtk.js/Rendering/Misc/RemoteView"
-  import { useElementSize } from "@vueuse/core"
+  import { useElementSize, useWindowSize } from "@vueuse/core"
   import viewer_schemas from "@geode/opengeodeweb-viewer/schemas.json"
 
   const viewer_store = use_viewer_store()
   const { client, is_running, picking_mode } = storeToRefs(viewer_store)
 
+  const viewer = ref(null)
+  const { width, height } = useElementSize(viewer)
+
+  const { width: windowWidth, height: windowHeight } = useWindowSize()
+
   function get_x_y(event) {
     if (picking_mode.value === true) {
       const { offsetX, offsetY } = event
@@ -43,36 +48,38 @@
     viewId: { type: String, default: "-1" },
   })
 
-  const viewer = ref(null)
-  const { width, height } = useElementSize(viewer)
-
-  function resize() {
-    view.getCanvasView().setSize(0, 0)
-    view.resize()
-  }
-
-  watch(picking_mode, (value) => {
-    const cursor = value == true ? "crosshair" : "pointer"
-    view.getCanvasView().setCursor(cursor)
-  })
-  watch(width, (value) => {
-    resize()
-  })
-  watch(height, (value) => {
-    resize()
-  })
   const { viewId } = toRefs(props)
   const connected = ref(false)
 
   const view = vtkRemoteView.newInstance({
     rpcWheelEvent: "viewport.mouse.zoom.wheel",
   })
-  // default of 0.5 causes 2x size labels on high-DPI screens. 1 good for demo, not for production.
+
   if (location.hostname.split(".")[0] === "localhost") {
     view.setInteractiveRatio(1)
   }
 
-  watch(client, (new_client) => {
+  function resize() {
+    if (view) {
+      view.getCanvasView().setSize(0, 0)
+      view.resize()
+    }
+  }
+
+  watch([windowWidth, windowHeight], () => {
+    resize()
+  })
+
+  watch(picking_mode, (value) => {
+    const cursor = value ? "crosshair" : "pointer"
+    view.getCanvasView().setCursor(cursor)
+  })
+
+  watch([width, height], () => {
+    resize()
+  })
+
+  watch(client, () => {
     connect()
   })
 
@@ -83,16 +90,6 @@
     }
   })
 
-  onMounted(async () => {
-    if (process.client) {
-      window.addEventListener("resize", resize)
-      await nextTick()
-      view.setContainer(viewer.value.$el)
-      connect()
-      resize()
-    }
-  })
-
   function connect() {
     if (!is_running.value) {
       return
@@ -103,6 +100,16 @@
     connected.value = true
     view.render()
   }
+
+  onMounted(async () => {
+    if (process.client) {
+      window.addEventListener("resize", resize)
+      await nextTick()
+      view.setContainer(viewer.value.$el)
+      connect()
+      resize()
+    }
+  })
 </script>
 
 <style scoped>

test/components/FileSelector.nuxt.test.js

@@ -123,6 +123,7 @@ describe("FileSelector.vue", async () => {
       await flushPromises()
 
       const file_uploader = wrapper.findComponent(FileUploader)
+      console.log("wrapper", wrapper)
       expect(wrapper.vm.props.files).toEqual(files)
       const upload_files = vi.spyOn(file_uploader.vm, "upload_files")
       expect(upload_files).not.toHaveBeenCalled()