From d627dee3b234d867228f0da76f021509e9e80f1f Mon Sep 17 00:00:00 2001
From: James Petts <jamesapetts@gmail.com>
Date: Tue, 20 Oct 2020 13:45:52 +0100
Subject: [PATCH] Update crosshairs UI and fix bug where you could scroll
 offscreen. (#2126)

* Update crosshairs UI and fix bug where you could scroll offscreen.

* Update tests for removed rotate tool.
---
 extensions/vtk/package.json                   |  2 +-
 extensions/vtk/src/toolbarModule.js           |  2 ++
 .../integration/pwa/OHIFExtensionVTK.spec.js  | 22 -------------------
 platform/viewer/cypress/support/aliases.js    |  1 -
 yarn.lock                                     |  8 +++----
 5 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/extensions/vtk/package.json b/extensions/vtk/package.json
index 674ee5987..6e44e0987 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.14.0"
+    "react-vtkjs-viewport": "^0.14.1"
   },
   "devDependencies": {
     "@ohif/core": "^2.10.7",
diff --git a/extensions/vtk/src/toolbarModule.js b/extensions/vtk/src/toolbarModule.js
index 7cdfd5c38..4b93f66cd 100644
--- a/extensions/vtk/src/toolbarModule.js
+++ b/extensions/vtk/src/toolbarModule.js
@@ -34,6 +34,7 @@ const definitions = [
     commandName: 'resetMPRView',
     commandOptions: {},
   },
+  /*
   {
     id: 'Rotate',
     label: 'Rotate',
@@ -43,6 +44,7 @@ const definitions = [
     commandName: 'enableRotateTool',
     commandOptions: {},
   },
+  */
   /*
   {
     id: 'setBlendModeToComposite',
diff --git a/platform/viewer/cypress/integration/pwa/OHIFExtensionVTK.spec.js b/platform/viewer/cypress/integration/pwa/OHIFExtensionVTK.spec.js
index 935f51759..9e1b26b02 100644
--- a/platform/viewer/cypress/integration/pwa/OHIFExtensionVTK.spec.js
+++ b/platform/viewer/cypress/integration/pwa/OHIFExtensionVTK.spec.js
@@ -36,9 +36,6 @@ describe('OHIF VTK Extension', () => {
     cy.get('@wwwcBtn')
       .should('be.visible')
       .contains('WWWC');
-    cy.get('@rotateBtn')
-      .should('be.visible')
-      .contains('Rotate');
     cy.get('@slabSlider')
       .should('be.visible')
       .contains('Slab Thickness');
@@ -90,23 +87,4 @@ describe('OHIF VTK Extension', () => {
         );
       });
   });
-
-  it('checks Rotate tool', () => {
-    cy.get('@rotateBtn').click();
-
-    // Click and Move the mouse inside the viewport
-    cy.get('[data-cy="viewport-container-0"]')
-      .trigger('mousedown', 'center', {
-        which: 1,
-      })
-      .trigger('mousemove', 'top', { which: 1 })
-      .trigger('mousedown', 'center', {
-        which: 1,
-      })
-      .trigger('mousemove', 'top', { which: 1 })
-      .trigger('mouseup', { which: 1 });
-
-    //Take Screenshot
-    cy.screenshot('VTK Rotate tool - Should rotate image');
-  });
 });
diff --git a/platform/viewer/cypress/support/aliases.js b/platform/viewer/cypress/support/aliases.js
index d73646631..82c000c01 100644
--- a/platform/viewer/cypress/support/aliases.js
+++ b/platform/viewer/cypress/support/aliases.js
@@ -47,7 +47,6 @@ export function initVTKToolsAliases() {
   cy.get('[data-cy="exit 2d mpr"]').as('exit2dmprBtn');
   cy.get('[data-cy="crosshairs"]').as('crosshairsBtn');
   cy.get('[data-cy="wwwc"]').as('wwwcBtn');
-  cy.get('[data-cy="rotate"]').as('rotateBtn');
   cy.get('.slab-thickness').as('slabSlider');
   cy.get('.select-ohif').as('modeDropdown');
   cy.get('.ohif-check-label').as('modeCheckbox');
diff --git a/yarn.lock b/yarn.lock
index 31839c6f8..c087482b5 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.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==
+react-vtkjs-viewport@^0.14.1:
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/react-vtkjs-viewport/-/react-vtkjs-viewport-0.14.1.tgz#32ecdbbe0e61066d8cbaa211933184d3ebda6603"
+  integrity sha512-DAAF1yyEjq75BFYj/p/eO3/h6DiiGtEHJj/mbuk83LTgpcXlKNsYvQoh2oWWCyNVFo5hjBy8zlHUlRyKbu8GOg==
   dependencies:
     date-fns "^2.2.1"
     gl-matrix "^3.1.0"