fix: Fix RotateTool on mobile devices (#1385)

* Fix - RotateTool for mobile devices * Refactor fix RotateTool * Feature - testUnit for RotateTool on mobile devices * Refactor validation on RotateTool * Change validation structure Co-authored-by: Luis Alberto Martinez <[email protected]>
cornerstonejs · Jul 30, 2021 · cdf23b5 · cdf23b5
1 parent c9837ca
commit cdf23b5
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/tools/RotateTool.js b/src/tools/RotateTool.js
@@ -56,7 +56,10 @@ export default class RotateTool extends BaseTool {
 function defaultStrategy(evt) {
   const { roundAngles, rotateScale } = this.configuration;
   const { element, viewport, startPoints, currentPoints } = evt.detail;
-  const initialRotation = viewport.initialRotation;
+
+  const initialRotation = viewport.initialRotation
+    ? viewport.initialRotation
+    : viewport.rotation;
 
   // Calculate the center of the image
   const rect = element.getBoundingClientRect(element);

diff --git a/src/tools/RotateTool.test.js b/src/tools/RotateTool.test.js
@@ -13,6 +13,15 @@ const mockEvt = {
   },
 };
 
+const forMobileMockEvt = {
+  detail: {
+    viewport: {
+      rotation: 50,
+      initialRotation: undefined,
+    },
+  },
+};
+
 describe('RotateTool.js', () => {
   describe('default values', () => {
     it('has a default name of "Rotate"', () => {
@@ -48,5 +57,15 @@ describe('RotateTool.js', () => {
       instantiatedTool.dragCallback(mockEvt);
       expect(external.cornerstone.setViewport).toHaveBeenCalled();
     });
+
+    it('can be created on mobile device', () => {
+      const instantiatedTool = new RotateTool();
+
+      instantiatedTool.applyActiveStrategy = jest.fn();
+      external.cornerstone.setViewport = jest.fn();
+
+      instantiatedTool.dragCallback(forMobileMockEvt);
+      expect(external.cornerstone.setViewport).toHaveBeenCalled();
+    });
   });
 });