From 557fdce0167c2e2fdb641ee87761695e44fbf33b Mon Sep 17 00:00:00 2001
From: dannyrb <danny.ri.brown@gmail.com>
Date: Tue, 14 May 2019 22:12:34 -0400
Subject: [PATCH] less error-prone import

---
 .../src/ConnectedCineDialog.js                      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/extensions/ohif-cornerstone-extension/src/ConnectedCineDialog.js b/extensions/ohif-cornerstone-extension/src/ConnectedCineDialog.js
index 369d673cd..6247f6bf2 100644
--- a/extensions/ohif-cornerstone-extension/src/ConnectedCineDialog.js
+++ b/extensions/ohif-cornerstone-extension/src/ConnectedCineDialog.js
@@ -1,9 +1,12 @@
 import { connect } from 'react-redux';
 import { CineDialog } from 'react-viewerbase';
 import OHIF from 'ohif-core';
-import { import as toolImport, getToolState } from 'cornerstone-tools';
+import csTools from 'cornerstone-tools';
+// Our target output kills the `as` and "import" throws a keyword error
+// import { import as toolImport, getToolState } from 'cornerstone-tools';
 import cloneDeep from 'lodash.clonedeep';
 
+const toolImport = csTools.import;
 const scrollToIndex = toolImport('util/scrollToIndex');
 const { setViewportSpecificData } = OHIF.redux.actions;
 
@@ -63,26 +66,26 @@ const mergeProps = (propsFromState, propsFromDispatch, ownProps) => {
       });
     },
     onClickNextButton: () => {
-      const stackData = getToolState(activeEnabledElement, 'stack');
+      const stackData = csTools.getToolState(activeEnabledElement, 'stack');
       if (!stackData || !stackData.data || !stackData.data.length) return;
       const { currentImageIdIndex, imageIds } = stackData.data[0];
       if (currentImageIdIndex >= imageIds.length - 1) return;
       scrollToIndex(activeEnabledElement, currentImageIdIndex + 1);
     },
     onClickBackButton: () => {
-      const stackData = getToolState(activeEnabledElement, 'stack');
+      const stackData = csTools.getToolState(activeEnabledElement, 'stack');
       if (!stackData || !stackData.data || !stackData.data.length) return;
       const { currentImageIdIndex } = stackData.data[0];
       if (currentImageIdIndex === 0) return;
       scrollToIndex(activeEnabledElement, currentImageIdIndex - 1);
     },
     onClickSkipToStart: () => {
-      const stackData = getToolState(activeEnabledElement, 'stack');
+      const stackData = csTools.getToolState(activeEnabledElement, 'stack');
       if (!stackData || !stackData.data || !stackData.data.length) return;
       scrollToIndex(activeEnabledElement, 0);
     },
     onClickSkipToEnd: () => {
-      const stackData = getToolState(activeEnabledElement, 'stack');
+      const stackData = csTools.getToolState(activeEnabledElement, 'stack');
       if (!stackData || !stackData.data || !stackData.data.length) return;
       const lastIndex = stackData.data[0].imageIds.length - 1;
       scrollToIndex(activeEnabledElement, lastIndex);