Merge pull request #330 from Kitware/fix-view-loading

fix(VtkView): Mount views when they are created
Kitware · May 3, 2020 · eae975d · eae975d
2 parents 0706cb7 + 8b481c2
commit eae975d
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 17 deletions.
diff --git a/src/components/core/VtkView/script.js b/src/components/core/VtkView/script.js
@@ -45,6 +45,7 @@ export default {
   },
   data() {
     return {
+      internalViewId: -1,
       internalIsActive: false,
       palette: BACKGROUND,
       backgroundSheet: false,
@@ -104,6 +105,11 @@ export default {
       );
     },
   },
+  watch: {
+    view(view) {
+      this.tryMountView(view);
+    },
+  },
   proxyManagerHooks: {
     onActiveViewChange(view) {
       this.internalIsActive = view === this.view;
@@ -141,30 +147,16 @@ export default {
   },
   mounted() {
     if (this.view) {
-      this.view.setContainer(this.$el.querySelector('.js-view'));
-      const widgetManager = this.view.getReferenceByName('widgetManager');
-      if (widgetManager) {
-        widgetManager.setUseSvgLayer(true);
-        // workaround to disable picking if previously disabled
-        if (!widgetManager.getPickingEnabled()) {
-          widgetManager.disablePicking();
-        }
-      }
+      this.tryMountView(this.view);
     }
-
     window.addEventListener('resize', this.resizeCurrentView);
 
     // Initial setup
     this.resizeCurrentView();
   },
   beforeDestroy() {
     if (this.view) {
-      const widgetManager = this.view.getReferenceByName('widgetManager');
-      if (widgetManager) {
-        // we can't use svg anyways if there is no container
-        widgetManager.setUseSvgLayer(false);
-      }
-      this.view.setContainer(null);
+      this.unmountView(this.view);
     }
     window.removeEventListener('resize', this.resizeCurrentView);
   },
@@ -174,6 +166,34 @@ export default {
     }
   },
   methods: {
+    tryMountView(view) {
+      if (this.internalViewId > -1) {
+        const oldView = this.$proxyManager.getProxyById(this.internalViewId);
+        this.unmountView(oldView);
+        this.internalViewId = -1;
+      }
+
+      if (view) {
+        this.internalViewId = view.getProxyId();
+        view.setContainer(this.$el.querySelector('.js-view'));
+        const widgetManager = view.getReferenceByName('widgetManager');
+        if (widgetManager) {
+          widgetManager.setUseSvgLayer(true);
+          // workaround to disable picking if previously disabled
+          if (!widgetManager.getPickingEnabled()) {
+            widgetManager.disablePicking();
+          }
+        }
+      }
+    },
+    unmountView(view) {
+      const widgetManager = view.getReferenceByName('widgetManager');
+      if (widgetManager) {
+        // we can't use svg anyways if there is no container
+        widgetManager.setUseSvgLayer(false);
+      }
+      view.setContainer(null);
+    },
     changeViewType(viewType) {
       this.swapViews({
         index: this.layoutIndex,

diff --git a/src/components/core/VtkView/template.html b/src/components/core/VtkView/template.html
@@ -143,7 +143,7 @@
         <v-spacer />
         <v-tooltip
           top
-          v-if="view.getProxyName() === 'View3D'"
+          v-if="type === 'View3D'"
           :disabled="smallScreen || viewPointMenuVisible"
         >
           <template v-slot:activator="{ on: tooltip }">