From 86327cd80881d9bdbc05029fc10fd3c296682265 Mon Sep 17 00:00:00 2001
From: Danny Brown <danny.ri.brown@gmail.com>
Date: Sat, 4 Jul 2020 13:25:23 -0400
Subject: [PATCH] bump RCV version and use new prop to control resize/refresh
 behavior (#1869)

---
 extensions/cornerstone/package.json           |  2 +-
 .../src/OHIFCornerstoneViewport.js            | 20 +++----------------
 extensions/dicom-sr/package.json              |  2 +-
 .../dicom-sr/src/OHIFCornerstoneSRViewport.js |  3 +++
 .../viewports/TrackedCornerstoneViewport.js   |  5 ++++-
 yarn.lock                                     |  9 +++++----
 6 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json
index 98d24669c..6e90c486d 100644
--- a/extensions/cornerstone/package.json
+++ b/extensions/cornerstone/package.json
@@ -50,6 +50,6 @@
     "classnames": "^2.2.6",
     "lodash.merge": "^4.6.2",
     "lodash.throttle": "^4.1.1",
-    "react-cornerstone-viewport": "3.0.0"
+    "react-cornerstone-viewport": "4.0.0"
   }
 }
diff --git a/extensions/cornerstone/src/OHIFCornerstoneViewport.js b/extensions/cornerstone/src/OHIFCornerstoneViewport.js
index 56f6a10c1..e498c3421 100644
--- a/extensions/cornerstone/src/OHIFCornerstoneViewport.js
+++ b/extensions/cornerstone/src/OHIFCornerstoneViewport.js
@@ -1,28 +1,11 @@
 import React, { Component } from 'react';
 import CornerstoneViewport from 'react-cornerstone-viewport';
-//import ConnectedCornerstoneViewport from './ConnectedCornerstoneViewport';
 import OHIF from '@ohif/core';
 import PropTypes from 'prop-types';
 import debounce from 'lodash.debounce';
-import throttle from 'lodash.throttle';
 
 import { setEnabledElement } from './state';
 
-// const {
-//   onAdded,
-//   onRemoved,
-//   onModified,
-// } = OHIF.measurements.MeasurementHandlers;
-
-// // TODO: Transition to enums for the action names so that we can ensure they stay up to date
-// // everywhere they're used.
-// const MEASUREMENT_ACTION_MAP = {
-//   added: onAdded,
-//   removed: onRemoved,
-//   modified: throttle(event => {
-//     return onModified(event);
-//   }, 300),
-// };
 
 // const cine = viewportSpecificData.cine;
 
@@ -228,6 +211,9 @@ class OHIFCornerstoneViewport extends Component {
             const enabledElement = evt.detail.element;
             setEnabledElement(viewportIndex, enabledElement);
           }}
+          // Sync resize throttle w/ sidepanel animation duration to prevent
+          // seizure inducing strobe blinking effect
+          resizeRefreshRateMs={150}
         />
         {childrenWithProps}
       </>
diff --git a/extensions/dicom-sr/package.json b/extensions/dicom-sr/package.json
index a4406bfad..bc036db54 100644
--- a/extensions/dicom-sr/package.json
+++ b/extensions/dicom-sr/package.json
@@ -50,6 +50,6 @@
     "classnames": "^2.2.6",
     "lodash.merge": "^4.6.2",
     "lodash.throttle": "^4.1.1",
-    "react-cornerstone-viewport": "3.0.0"
+    "react-cornerstone-viewport": "4.0.0"
   }
 }
diff --git a/extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js b/extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js
index 38fea2487..9cac23138 100644
--- a/extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js
+++ b/extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js
@@ -453,6 +453,9 @@ function OHIFCornerstoneSRViewport({
           isPlaying={false}
           frameRate={24}
           isOverlayVisible={false}
+          // Sync resize throttle w/ sidepanel animation duration to prevent
+          // seizure inducing strobe blinking effect
+          resizeRefreshRateMs={150}
         />
         {childrenWithProps}
       </div>
diff --git a/extensions/measurement-tracking/src/viewports/TrackedCornerstoneViewport.js b/extensions/measurement-tracking/src/viewports/TrackedCornerstoneViewport.js
index d73140f7f..f07ba8830 100644
--- a/extensions/measurement-tracking/src/viewports/TrackedCornerstoneViewport.js
+++ b/extensions/measurement-tracking/src/viewports/TrackedCornerstoneViewport.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import cornerstone from 'cornerstone-core';
 import cornerstoneTools from 'cornerstone-tools';
 import CornerstoneViewport from 'react-cornerstone-viewport';
-import OHIF, { DicomMetadataStore, utils } from '@ohif/core';
+import OHIF, { utils } from '@ohif/core';
 import {
   Notification,
   ViewportActionBar,
@@ -345,6 +345,9 @@ function TrackedCornerstoneViewport({
               imageIndex: currentImageIdIndex,
             });
           }}
+          // Sync resize throttle w/ sidepanel animation duration to prevent
+          // seizure inducing strobe blinking effect
+          resizeRefreshRateMs={150}
           // TODO: ViewportGrid Context?
           isActive={true} // todo
           isStackPrefetchEnabled={true} // todo
diff --git a/yarn.lock b/yarn.lock
index 31f1dc938..190e5d635 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17900,13 +17900,14 @@ react-cornerstone-viewport@2.3.9:
     prop-types "^15.7.2"
     react-resize-detector "^4.2.1"
 
-react-cornerstone-viewport@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/react-cornerstone-viewport/-/react-cornerstone-viewport-3.0.0.tgz#c7be6dc29762fc844c639a73c3292feb69e31ba5"
-  integrity sha512-hLneVVOrZZlCkIhsKVdIHBGVPbOmeu5tsrPXaeCfsOlA5y7JhtacjuKHL4xzGmlXiCipftgiZ9+4gC2gcJSlcw==
+react-cornerstone-viewport@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/react-cornerstone-viewport/-/react-cornerstone-viewport-4.0.0.tgz#7bdec830e7207ef1f62a6135a4c92d272691592d"
+  integrity sha512-5fDvd147PziAaCy2tIrHOnSNJ7Yn7csK5mTul46mbG3nkzEu1KSEPh4XHGbIk2u6DUlLHViwQULVmdqu4KvRew==
   dependencies:
     classnames "^2.2.6"
     date-fns "^2.2.1"
+    lodash.debounce "^4.0.8"
     prop-types "^15.7.2"
     react-resize-detector "^4.2.1"