Bail prior to establishing dimensions

parameter1 · Nov 7, 2022 · add140d · add140d
1 parent 9aba1e3
commit add140d
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/packages/image/src/crop-rectangle.js b/packages/image/src/crop-rectangle.js
@@ -43,28 +43,30 @@ module.exports = ({ width, height, cropDimensions }) => {
       cropped: false,
     });
   }
+
+  const coords = ['x1', 'x2', 'y1', 'y2'];
+  if (coords.some(key => cropDimensions[key] == null || Number.isNaN(cropDimensions[key]))) {
+    return new CropRectangle({
+      x: 0,
+      y: 0,
+      width,
+      height,
+      cropped: false,
+    });
+  }
+
   // @see Cygnus\ApplicationBundle\Apps\Management\Controller::cropImageAction
   const scale = width / 640;
   const {
     x1,
     x2,
     y1,
     y2,
-  } = ['x1', 'x2', 'y1', 'y2'].reduce((o, key) => {
+  } = coords.reduce((o, key) => {
     const v = Math.round(cropDimensions[key] * scale);
     return { ...o, [key]: v };
   }, {});
 
-  const dimExists = dimension => (typeof dimension !== 'undefined' && dimension !== null && !Number.isNaN(Number(dimension)));
-  if (!dimExists(x1) || !dimExists(x2) || !dimExists(y1) || !dimExists(y2)) {
-    return new CropRectangle({
-      x: 0,
-      y: 0,
-      width,
-      height,
-      cropped: false,
-    });
-  }
 
   return new CropRectangle({
     x: x1,