react-native-expo-cropper 1.0.13 → 1.0.15

package/lib/ImageCropper.js

@@ -227,52 +227,62 @@ var ImageCropper = function ImageCropper(_ref) {
     style: _ImageCropperStyles["default"].buttonText
   }, "Reset")), image && /*#__PURE__*/_react["default"].createElement(_reactNative.TouchableOpacity, {
     style: _ImageCropperStyles["default"].button,
-    onPress: /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-      var capturedUri, enhancedUri, name, _t;
-      return _regenerator().w(function (_context) {
-        while (1) switch (_context.p = _context.n) {
+    onPress: /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
+      var capturePromise, enhancedUri, name, _t;
+      return _regenerator().w(function (_context2) {
+        while (1) switch (_context2.p = _context2.n) {
           case 0:
             // setShowFullScreenCapture(true); 
             setIsLoading(true);
             setShowResult(true);
-            _context.p = 1;
-            _context.n = 2;
+            _context2.p = 1;
+            _context2.n = 2;
             return new Promise(function (resolve) {
               return requestAnimationFrame(resolve);
             });
           case 2:
-            _context.n = 3;
-            return (0, _reactNativeViewShot.captureRef)(viewRef, {
-              format: 'png',
-              quality: 1
-            });
-          case 3:
-            capturedUri = _context.v;
-            _context.n = 4;
+            capturePromise = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+              var capturedUri;
+              return _regenerator().w(function (_context) {
+                while (1) switch (_context.n) {
+                  case 0:
+                    _context.n = 1;
+                    return (0, _reactNativeViewShot.captureRef)(viewRef.current, {
+                      format: 'jpg',
+                      quality: 1,
+                      result: 'tmpfile'
+                    });
+                  case 1:
+                    capturedUri = _context.v;
+                    return _context.a(2, (0, _ImageProcessor.enhanceImage)(capturedUri, addheight));
+                }
+              }, _callee);
+            }))();
+            _context2.n = 3;
             return (0, _ImageProcessor.enhanceImage)(capturedUri, addheight);
-          case 4:
-            enhancedUri = _context.v;
+          case 3:
+            enhancedUri = _context2.v;
             name = "IMAGE XTK".concat(Date.now(), ".png");
             if (onConfirm) {
               onConfirm(enhancedUri, name);
             }
-            _context.n = 6;
+            _context2.n = 5;
             break;
-          case 5:
-            _context.p = 5;
-            _t = _context.v;
+          case 4:
+            _context2.p = 4;
+            _t = _context2.v;
             console.error("Erreur lors de la capture :", _t);
             alert("Erreur lors de la capture !");
-          case 6:
-            _context.p = 6;
+          case 5:
+            _context2.p = 5;
             setShowResult(false);
             setIsLoading(false);
             setShowFullScreenCapture(false);
-            return _context.f(6);
-          case 7:
-            return _context.a(2);
+            return _context2.f(5);
+          case 6:
+            return _context2.a(2);
         }
-      }, _callee, null, [[1, 5, 6, 7]]);
+      }, _callee2, null, [[1, 4, 5, 6]]);
     }))
   }, /*#__PURE__*/_react["default"].createElement(_reactNative.Text, {
     style: _ImageCropperStyles["default"].buttonText

package/lib/ImageProcessor.js

@@ -13,7 +13,7 @@ function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 var enhanceImage = exports.enhanceImage = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(uri, addheight) {
-    var imageInfo, ratio, MAX_TARGET_HEIGHT, targetHeight, newWidth, newHeight, result, _t;
+    var imageInfo, ratio, maxHeight, newWidth, newHeight, result, _t;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.p = _context.n) {
         case 0:
@@ -23,9 +23,8 @@ var enhanceImage = exports.enhanceImage = /*#__PURE__*/function () {
         case 1:
           imageInfo = _context.v;
           ratio = imageInfo.height / imageInfo.width;
-          MAX_TARGET_HEIGHT = Math.min(imageInfo.height, 1600);
-          targetHeight = typeof addheight === 'number' && addheight > 0 ? Math.min(addheight, MAX_TARGET_HEIGHT) : MAX_TARGET_HEIGHT;
-          newWidth = Math.round(targetHeight / ratio);
+          maxHeight = addheight;
+          newWidth = Math.round(maxHeight / ratio);
           newHeight = Math.round(newWidth * ratio);
           _context.n = 2;
           return ImageManipulator.manipulateAsync(uri, [{
@@ -34,8 +33,8 @@ var enhanceImage = exports.enhanceImage = /*#__PURE__*/function () {
               height: newHeight
             }
           }], {
-            compress: 0.92,
-            format: ImageManipulator.SaveFormat.JPEG
+            compress: 1,
+            format: ImageManipulator.SaveFormat.PNG
           });
         case 2:
           result = _context.v;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-expo-cropper",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "Recadrage polygonal d'images.",
   "main": "index.js",
   "author": "PCS AGRI",

package/src/ImageCropper.js

@@ -188,11 +188,14 @@ const ImageCropper = ({ onConfirm, openCameraFirst, initialImage ,addheight}) =>
                         setShowResult(true);
                         try {
                           await new Promise((resolve) => requestAnimationFrame(resolve));
-                          const capturedUri = await captureRef(viewRef, {
-                            format: 'png',
-                            quality: 1,
-                          });
-
+                          const capturePromise = (async () => {
+                            const capturedUri = await captureRef(viewRef.current, {
+                              format: 'jpg',
+                              quality: 1,
+                              result: 'tmpfile',
+                            });
+                            return enhanceImage(capturedUri, addheight);
+                          })();
                         
                         const enhancedUri = await enhanceImage(capturedUri ,addheight);
                         const name = `IMAGE XTK${Date.now()}.png`;

package/src/ImageProcessor.js

@@ -5,12 +5,8 @@ export const enhanceImage = async (uri , addheight) => {
     const imageInfo = await ImageManipulator.manipulateAsync(uri, []);
     const ratio = imageInfo.height / imageInfo.width;
 
-    const MAX_TARGET_HEIGHT = Math.min(imageInfo.height, 1600);
-    const targetHeight = (typeof addheight === 'number' && addheight > 0)
-      ? Math.min(addheight, MAX_TARGET_HEIGHT)
-      : MAX_TARGET_HEIGHT;
-
-    const newWidth = Math.round(targetHeight / ratio);
+    const maxHeight = addheight;
+    const newWidth = Math.round(maxHeight / ratio);
     const newHeight = Math.round(newWidth * ratio);
 
     const result = await ImageManipulator.manipulateAsync(
@@ -19,8 +15,8 @@ export const enhanceImage = async (uri , addheight) => {
         { resize: { width: newWidth, height: newHeight } },
       ],
       {
-        compress: 0.92,
-        format: ImageManipulator.SaveFormat.JPEG
+        compress: 1,
+        format: ImageManipulator.SaveFormat.PNG
       }
     );