From 3c059207051984113eb2c98ede4f73ae92e868f5 Mon Sep 17 00:00:00 2001
From: James Petts <jamesapetts@gmail.com>
Date: Thu, 15 Oct 2020 15:15:28 +0100
Subject: [PATCH] [IDC-2098] Update RVTKJSV (#2107)

* Update RVTKJSV

* Update react-vtkjs-viewport

* Fix WWWC tool with new rvtkjsv version
---
 extensions/vtk/package.json          |  2 +-
 extensions/vtk/src/commandsModule.js | 13 ++++++++++---
 yarn.lock                            |  8 ++++----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/extensions/vtk/package.json b/extensions/vtk/package.json
index 473a12642..6107d1b9a 100644
--- a/extensions/vtk/package.json
+++ b/extensions/vtk/package.json
@@ -50,7 +50,7 @@
   "dependencies": {
     "@babel/runtime": "^7.5.5",
     "lodash.throttle": "^4.1.1",
-    "react-vtkjs-viewport": "^0.13.1"
+    "react-vtkjs-viewport": "^0.14.0"
   },
   "devDependencies": {
     "@ohif/core": "^2.10.7",
diff --git a/extensions/vtk/src/commandsModule.js b/extensions/vtk/src/commandsModule.js
index bef54783b..901b2a853 100644
--- a/extensions/vtk/src/commandsModule.js
+++ b/extensions/vtk/src/commandsModule.js
@@ -270,7 +270,10 @@ const commandsModule = ({ commandsManager, UINotificationService }) => {
       apis.forEach((api, apiIndex) => {
         const istyle = vtkInteractorStyleMPRRotate.newInstance();
 
-        api.setInteractorStyle({ istyle, configuration: { apis, apiIndex } });
+        api.setInteractorStyle({
+          istyle,
+          configuration: { apis, apiIndex, uid: api.uid },
+        });
       });
     },
     enableCrosshairsTool: () => {
@@ -318,10 +321,14 @@ const commandsModule = ({ commandsManager, UINotificationService }) => {
         },
       };
 
-      apis.forEach(api => {
+      apis.forEach((api, apiIndex) => {
         const istyle = vtkInteractorStyleMPRWindowLevel.newInstance();
 
-        api.setInteractorStyle({ istyle, callbacks });
+        api.setInteractorStyle({
+          istyle,
+          callbacks,
+          configuration: { apis, apiIndex, uid: api.uid },
+        });
       });
     },
     setSlabThickness: ({ slabThickness }) => {
diff --git a/yarn.lock b/yarn.lock
index ab705ed9a..31839c6f8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16061,10 +16061,10 @@ react-transition-group@^4.1.1:
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
 
-react-vtkjs-viewport@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/react-vtkjs-viewport/-/react-vtkjs-viewport-0.13.1.tgz#11b69873377cd66b6522079eb05d54317c2e8903"
-  integrity sha512-P2jmv0rZtas9+pZCzVBr0R/EqmXpWqPP8JA1DScwKgFoYj4ApqnQeLXSVz2VHXi58q87k2uay9k7xcchLiStrQ==
+react-vtkjs-viewport@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/react-vtkjs-viewport/-/react-vtkjs-viewport-0.14.0.tgz#0bb4aeb02d4b32eb253ea1296e2032ade9772766"
+  integrity sha512-axKPSizH6y2P++33XPbV2mYF37EHMhp42e9TqPM9uxx0nQSXBe3HA5741z6CBGtbU7e2NT4ZBv9TduY86XetQw==
   dependencies:
     date-fns "^2.2.1"
     gl-matrix "^3.1.0"