Small refactor

Author: M-i-k-e-l

src/components/panningViews/panView.tsx

@@ -18,7 +18,8 @@ import {
   Frame,
   PanDismissThreshold,
   getTranslation,
-  getDismissVelocity
+  getDismissVelocity,
+  DEFAULT_THRESHOLD
 } from './panningUtil';
 export {PanningDirections, TranslationLock, PanDismissThreshold};
 
@@ -67,12 +68,6 @@ interface Props extends PanViewProps {
   children?: React.ReactNode | React.ReactNode[];
 }
 
-const DEFAULT_THRESHOLD: Required<PanDismissThreshold> = {
-  velocity: 750,
-  x: Constants.screenWidth / 4,
-  y: Constants.screenHeight / 4
-};
-
 const RETURN_ANIMATION_SPRING_CONFIG = {velocity: 300, damping: 15, stiffness: 300, mass: 0.8};
 
 const PanView = (props: Props) => {

src/components/panningViews/panningUtil.ts

@@ -142,6 +142,21 @@ function getVelocityDirectionClamp(event: PanGestureHandlerEventExtra, direction
   return {x, y};
 }
 
+function checkThresholds(event: PanGestureHandlerEventExtra,
+  directions: PanningDirections[],
+  velocity: number,
+  threshold: Required<PanDismissThreshold>) {
+  const velocityPassedThreshold = velocity > threshold.velocity;
+  const xPassedThreshold =
+    (directions.includes(PanningDirections.RIGHT) && event.translationX > threshold.x) ||
+    (directions.includes(PanningDirections.LEFT) && -event.translationX > threshold.x);
+  const yPassedThreshold =
+    (directions.includes(PanningDirections.DOWN) && event.translationY > threshold.y) ||
+    (directions.includes(PanningDirections.UP) && -event.translationY > threshold.y);
+
+  return {velocityPassedThreshold, xPassedThreshold, yPassedThreshold};
+}
+
 /**
  * Will return undefined if should not dismiss
  */
@@ -157,15 +172,12 @@ export function getDismissVelocity(event: PanGestureHandlerEventExtra,
     x: threshold?.x || DEFAULT_THRESHOLD.x,
     y: threshold?.y || DEFAULT_THRESHOLD.y
   };
-  const allowedVelocity = getVelocityDirectionClamp(event, directions);
-  const velocity = Math.sqrt(Math.pow(allowedVelocity.x, 2) + Math.pow(allowedVelocity.y, 2));
-  const velocityPassedThreshold = velocity > _threshold.velocity;
-  const xPassedThreshold =
-    (directions.includes(PanningDirections.RIGHT) && event.translationX > _threshold.x) ||
-    (directions.includes(PanningDirections.LEFT) && -event.translationX > _threshold.x);
-  const yPassedThreshold =
-    (directions.includes(PanningDirections.DOWN) && event.translationY > _threshold.y) ||
-    (directions.includes(PanningDirections.UP) && -event.translationY > _threshold.y);
+  const clampedVelocity = getVelocityDirectionClamp(event, directions);
+  const velocity = Math.sqrt(Math.pow(clampedVelocity.x, 2) + Math.pow(clampedVelocity.y, 2));
+  const {velocityPassedThreshold, xPassedThreshold, yPassedThreshold} = checkThresholds(event,
+    directions,
+    velocity,
+    _threshold);
   if (velocityPassedThreshold || xPassedThreshold || yPassedThreshold) {
     let velocity: Partial<Frame> = {};
     if (velocityPassedThreshold) {