Small refactoring of the getClientCoords function

elchininet · Jun 30, 2022 · e9c2c04 · e9c2c04
1 parent e453f0e
commit e9c2c04
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/src/@classes/abstract/IsometricDraggable/IsometricDraggable.ts b/src/@classes/abstract/IsometricDraggable/IsometricDraggable.ts
@@ -41,17 +41,20 @@ const _dragStoreDefault = {
 };
 
 const isMouseEvent = (event: MouseEvent | TouchEvent): event is MouseEvent => 'clientX' in event;
-const getClientCoords = (event: MouseEvent | TouchEvent): ClientCoords => {
-    if (isMouseEvent(event)) {
+const getClientCoords = (event: MouseEvent | TouchEvent | ClientCoords): ClientCoords => {
+    if (event instanceof Event) {
+        if (isMouseEvent(event)) {
+            return {
+                clientX: event.clientX,
+                clientY: event.clientY
+            };
+        }
         return {
-            clientX: event.clientX,
-            clientY: event.clientY
+            clientX: event.touches[0].clientX,
+            clientY: event.touches[0].clientY
         };
     }
-    return {
-        clientX: event.touches[0].clientX,
-        clientY: event.touches[0].clientY
-    };
+    return event;
 };
 
 export abstract class IsometricDraggable extends IsometricElement {
@@ -160,9 +163,7 @@ export abstract class IsometricDraggable extends IsometricElement {
             event.preventDefault();
         }        
 
-        const { clientX, clientY } = event instanceof Event
-            ? getClientCoords(event)
-            : event;
+        const { clientX, clientY } = getClientCoords(event);
         const diffX = clientX - this._dragStore.x;
         const diffY = clientY - this._dragStore.y;
         if (this._drag === PlaneView.TOP) {