react-native-expo-cropper 1.2.36 → 1.2.37

package/dist/ImageProcessor.js

@@ -1,53 +1,41 @@
-"use strict";
-
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.enhanceImage = void 0;
-var ImageManipulator = _interopRequireWildcard(require("expo-image-manipulator"));
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
-function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
-function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
-function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
-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, maxHeight, newWidth, newHeight, result, _t;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.p = _context.n) {
-        case 0:
-          _context.p = 0;
-          _context.n = 1;
-          return ImageManipulator.manipulateAsync(uri, []);
-        case 1:
-          imageInfo = _context.v;
-          ratio = imageInfo.height / imageInfo.width;
-          maxHeight = addheight;
-          newWidth = Math.round(maxHeight / ratio);
-          newHeight = Math.round(newWidth * ratio);
-          _context.n = 2;
-          return ImageManipulator.manipulateAsync(uri, [{
-            resize: {
-              width: newWidth,
-              height: newHeight
-            }
-          }], {
-            compress: 1,
-            format: ImageManipulator.SaveFormat.PNG
-          });
-        case 2:
-          result = _context.v;
-          return _context.a(2, result.uri);
-        case 3:
-          _context.p = 3;
-          _t = _context.v;
-          console.error("Erreur T404K:", _t);
-          return _context.a(2, uri);
-      }
-    }, _callee, null, [[0, 3]]);
-  }));
-  return function enhanceImage(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
+"use strict";
+
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.enhanceImage = void 0;
+var ImageManipulator = _interopRequireWildcard(require("expo-image-manipulator"));
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
+function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
+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); }); }; }
+/**
+ * Retourne l'image originale sans redimensionnement pour préserver la qualité maximale.
+ * Le redimensionnement destructif a été supprimé pour éviter la perte de résolution.
+ * 
+ * @param {string} uri - URI de l'image originale
+ * @param {number} addheight - Paramètre conservé pour compatibilité (non utilisé)
+ * @returns {Promise<string>} URI de l'image originale (sans modification)
+ */
+var enhanceImage = exports.enhanceImage = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(uri, addheight) {
+    var _t;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.p = _context.n) {
+        case 0:
+          _context.p = 0;
+          return _context.a(2, uri);
+        case 1:
+          _context.p = 1;
+          _t = _context.v;
+          console.error("Erreur enhanceImage:", _t);
+          return _context.a(2, uri);
+      }
+    }, _callee, null, [[0, 1]]);
+  }));
+  return function enhanceImage(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
 }();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-expo-cropper",
-  "version": "1.2.36",
+  "version": "1.2.37",
   "description": "Recadrage polygonal d'images.",
   "main": "index.js",
   "author": "PCS AGRI",
@@ -45,10 +45,10 @@
     "url": "https://github.com/pcsagri/react-native-expo-cropper/issues"
   },
   "homepage": "https://github.com/pcsagri/react-native-expo-cropper#readme",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "npx babel src --out-dir dist"
-  },
+ "scripts": {
+  "test": "echo \"Error: no test specified\" && exit 1",
+  "build": "npx --package=@babel/cli babel src --out-dir dist"
+},
   "devDependencies": {
     "@babel/cli": "^7.28.3",
     "@babel/core": "^7.28.5",

package/src/CustomCamera.js

@@ -13,23 +13,22 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { Camera, CameraView } from 'expo-camera';
 const { width } = Dimensions.get('window');
 
-export default function CustomCamera({ onPhotoCaptured}) {
+export default function CustomCamera({ onPhotoCaptured, onFrameCalculated }) {
   const [isReady, setIsReady] = useState(false);
   const [loadingBeforeCapture, setLoadingBeforeCapture] = useState(false);
   const [hasPermission, setHasPermission] = useState(null);
   const cameraRef = useRef(null);
+  const cameraWrapperRef = useRef(null);
   const insets = useSafeAreaInsets();
+  const [cameraWrapperLayout, setCameraWrapperLayout] = useState({ width: 0, height: 0, x: 0, y: 0 });
+  const [greenFrame, setGreenFrame] = useState(null);
 
- 
-
-useEffect(() => {
-  (async () => {
-    const { status } = await Camera.requestCameraPermissionsAsync();
-    setHasPermission(status === 'granted');
-  })();
-}, []);
-
-
+  useEffect(() => {
+    (async () => {
+      const { status } = await Camera.requestCameraPermissionsAsync();
+      setHasPermission(status === 'granted');
+    })();
+  }, []);
 
   // Helper function to wait for multiple render cycles (works on iOS)
   const waitForRender = (cycles = 5) => {
@@ -49,6 +48,52 @@ useEffect(() => {
 
 
 
+  // ✅ CRITICAL FIX: Calculate green frame coordinates relative to camera preview
+  // The green frame should be calculated on the wrapper (as it's visually drawn there)
+  // But we store it with wrapper dimensions so ImageCropper can map it correctly
+  const calculateGreenFrameCoordinates = () => {
+    const wrapperWidth = cameraWrapperLayout.width;
+    const wrapperHeight = cameraWrapperLayout.height;
+    
+    if (wrapperWidth === 0 || wrapperHeight === 0) {
+      console.warn("Camera wrapper layout not ready, cannot calculate green frame");
+      return null;
+    }
+    
+    // ✅ Green frame dimensions: 80% width, 80% height (centered)
+    // The green frame should cover 80% of the image area, centered
+    const frameWidth = wrapperWidth * 0.80; // 80% width
+    const frameHeight = wrapperHeight * 0.80; // 80% height
+    const frameX = (wrapperWidth - frameWidth) / 2; // Centered horizontally
+    const frameY = (wrapperHeight - frameHeight) / 2; // Centered vertically
+    
+    const frameCoords = {
+      x: frameX,
+      y: frameY,
+      width: frameWidth,
+      height: frameHeight,
+      wrapperWidth,
+      wrapperHeight,
+      // ✅ Store percentages for easier mapping later
+      percentX: (frameX / wrapperWidth) * 100,
+      percentY: (frameY / wrapperHeight) * 100,
+      percentWidth: 80,
+      percentHeight: 80
+    };
+    
+    console.log("✅ Green frame coordinates calculated:", frameCoords);
+    return frameCoords;
+  };
+
+  // 🔁 Keep green frame state in sync with wrapper layout so we can both render it
+  // and send the exact same coordinates along with the captured photo.
+  useEffect(() => {
+    const coords = calculateGreenFrameCoordinates();
+    if (coords) {
+      setGreenFrame(coords);
+    }
+  }, [cameraWrapperLayout]);
+
   const takePicture = async () => {
     if (cameraRef.current) {
       try {
@@ -79,14 +124,21 @@ useEffect(() => {
             exif: photo.exif ? "present" : "missing"
           });
 
+          // ✅ CRITICAL FIX: Use the same green frame coordinates that are used for rendering
+          // Fallback to recalculation if, for some reason, state is not yet set
+          const greenFrameCoords = greenFrame || calculateGreenFrameCoordinates();
+          
           // ✅ REFACTORISATION : Utiliser directement l'URI de la photo
           // L'orientation sera gérée dans ImageCropper si l'utilisateur utilise la fonction de rotation
           // skipProcessing: true préserve la qualité mais peut laisser l'orientation EXIF non appliquée
           // C'est acceptable car l'utilisateur peut corriger via la rotation dans ImageCropper
           const fixedUri = photo.uri;
   
-          // Envoyer directement à ImageCropper (la qualité est préservée)
-          onPhotoCaptured(fixedUri);
+          // Envoyer l'URI et les coordonnées du green frame à ImageCropper
+          onPhotoCaptured(fixedUri, {
+            greenFrame: greenFrameCoords,
+            capturedImageSize: { width: photo.width, height: photo.height }
+          });
           setLoadingBeforeCapture(false);
       } catch (error) {
         console.error("Error capturing photo:", error);
@@ -99,7 +151,20 @@ useEffect(() => {
 
   return (
     <SafeAreaView style={styles.outerContainer}>
-      <View style={styles.cameraWrapper}>
+      <View 
+        style={styles.cameraWrapper}
+        ref={cameraWrapperRef}
+        onLayout={(e) => {
+          const layout = e.nativeEvent.layout;
+          setCameraWrapperLayout({
+            width: layout.width,
+            height: layout.height,
+            x: layout.x,
+            y: layout.y
+          });
+          console.log("Camera wrapper layout updated:", layout);
+        }}
+      >
         <CameraView
           style={styles.camera}
           facing="back"
@@ -121,8 +186,20 @@ useEffect(() => {
           </>
         )}
 
-        {/* Cadre de scan */}
-        <View style={styles.scanFrame} />
+        {/* Cadre de scan - rendered using calculated coordinates (x, y, width, height) */}
+        {greenFrame && (
+          <View
+            style={[
+              styles.scanFrame,
+              {
+                left: greenFrame.x,
+                top: greenFrame.y,
+                width: greenFrame.width,
+                height: greenFrame.height,
+              },
+            ]}
+          />
+        )}
       </View>
 
       <View style={[styles.buttonContainer, { bottom: (insets?.bottom || 0) + 16, marginBottom: 0 }]}>
@@ -161,8 +238,6 @@ const styles = StyleSheet.create({
   },
   scanFrame: {
     position: 'absolute',
-    width: '95%',
-    height: '80%',
     borderWidth: 4,
     borderColor: PRIMARY_GREEN,
     borderRadius: 5,