react-native-expo-cropper 1.2.46 → 1.2.47

package/dist/CustomCamera.js

@@ -45,22 +45,28 @@ function CustomCamera(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     hasPermission = _useState6[0],
     setHasPermission = _useState6[1];
+  // Force a fresh native CameraView instance per "open" to avoid stale/cached preview.
+  var _useState7 = (0, _react.useState)(function () {
+      return "".concat(Date.now(), "-").concat(Math.random().toString(16).slice(2));
+    }),
+    _useState8 = _slicedToArray(_useState7, 1),
+    cameraViewMountKey = _useState8[0];
   var cameraRef = (0, _react.useRef)(null);
   var cameraWrapperRef = (0, _react.useRef)(null);
   var insets = (0, _reactNativeSafeAreaContext.useSafeAreaInsets)();
-  var _useState7 = (0, _react.useState)({
+  var _useState9 = (0, _react.useState)({
       width: 0,
       height: 0,
       x: 0,
       y: 0
     }),
-    _useState8 = _slicedToArray(_useState7, 2),
-    cameraWrapperLayout = _useState8[0],
-    setCameraWrapperLayout = _useState8[1];
-  var _useState9 = (0, _react.useState)(null),
     _useState0 = _slicedToArray(_useState9, 2),
-    greenFrame = _useState0[0],
-    setGreenFrame = _useState0[1];
+    cameraWrapperLayout = _useState0[0],
+    setCameraWrapperLayout = _useState0[1];
+  var _useState1 = (0, _react.useState)(null),
+    _useState10 = _slicedToArray(_useState1, 2),
+    greenFrame = _useState10[0],
+    setGreenFrame = _useState10[1];
   (0, _react.useEffect)(function () {
     _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
       var _yield$Camera$request, status;
@@ -267,6 +273,7 @@ function CustomCamera(_ref) {
       console.log("Camera wrapper layout updated:", layout);
     }
   }, /*#__PURE__*/_react["default"].createElement(_expoCamera.CameraView, {
+    key: cameraViewMountKey,
     style: styles.camera,
     facing: "back",
     ref: cameraRef,

package/dist/ImageCropper.js

@@ -253,6 +253,7 @@ var ImageCropper = function ImageCropper(_ref) {
   var rotationInProgressRef = (0, _react.useRef)(false); // block duplicate taps immediately
   var lastValidPosition = (0, _react.useRef)(null);
   var insets = (0, _reactNativeSafeAreaContext.useSafeAreaInsets)();
+  var openCameraTimeoutRef = (0, _react.useRef)(null);
 
   // ✅ NEW ARCH: mobile does NOT export the final crop.
 
@@ -261,8 +262,17 @@ var ImageCropper = function ImageCropper(_ref) {
   var enableRotation = true; // rotation resets crop box so it is re-initialized on rotated image.
 
   (0, _react.useEffect)(function () {
+    // If a previous open was scheduled, cancel it.
+    if (openCameraTimeoutRef.current) {
+      clearTimeout(openCameraTimeoutRef.current);
+      openCameraTimeoutRef.current = null;
+    }
     if (openCameraFirst) {
-      setShowCustomCamera(true);
+      // Delay opening the camera so the prior session can fully release.
+      openCameraTimeoutRef.current = setTimeout(function () {
+        setShowCustomCamera(true);
+        openCameraTimeoutRef.current = null;
+      }, 800);
     } else if (initialImage) {
       setImage(initialImage);
       sourceImageUri.current = initialImage;
@@ -276,6 +286,12 @@ var ImageCropper = function ImageCropper(_ref) {
       hasInitializedCropBox.current = false;
       imageSource.current = null;
     }
+    return function () {
+      if (openCameraTimeoutRef.current) {
+        clearTimeout(openCameraTimeoutRef.current);
+        openCameraTimeoutRef.current = null;
+      }
+    };
   }, [openCameraFirst, initialImage]);
 
   // ✅ REFACTORISATION : Stocker uniquement les dimensions originales (pas de calcul théorique)
@@ -1305,31 +1321,6 @@ var ImageCropper = function ImageCropper(_ref) {
     style: _ImageCropperStyles["default"].container
   }, showCustomCamera ? /*#__PURE__*/_react["default"].createElement(_CustomCamera["default"], {
     onPhotoCaptured: function onPhotoCaptured(uri, frameData) {
-      // ✅ Reset refs for new image so second (and later) photos don't use first image's layout (fixes white screen on some devices)
-      originalImageDimensions.current = {
-        width: 0,
-        height: 0
-      };
-      imageDisplayRect.current = {
-        x: 0,
-        y: 0,
-        width: 0,
-        height: 0
-      };
-      displayedImageLayout.current = {
-        x: 0,
-        y: 0,
-        width: 0,
-        height: 0
-      };
-      imageMeasure.current = {
-        x: 0,
-        y: 0,
-        width: 0,
-        height: 0
-      };
-      sourceImageUri.current = uri;
-
       // ✅ CRITICAL FIX: Store green frame coordinates for coordinate conversion
       if (frameData && frameData.greenFrame) {
         cameraFrameData.current = {
@@ -1425,7 +1416,6 @@ var ImageCropper = function ImageCropper(_ref) {
       return hasMovement;
     }
   }, /*#__PURE__*/_react["default"].createElement(_reactNative.Image, {
-    key: image,
     source: {
       uri: image
     },

package/package.json

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

package/src/CustomCamera.js

@@ -22,6 +22,8 @@ export default function CustomCamera({ onPhotoCaptured, onFrameCalculated }) {
   const [isReady, setIsReady] = useState(false);
   const [loadingBeforeCapture, setLoadingBeforeCapture] = useState(false);
   const [hasPermission, setHasPermission] = useState(null);
+  // Force a fresh native CameraView instance per "open" to avoid stale/cached preview.
+  const [cameraViewMountKey] = useState(() => `${Date.now()}-${Math.random().toString(16).slice(2)}`);
   const cameraRef = useRef(null);
   const cameraWrapperRef = useRef(null);
   const insets = useSafeAreaInsets();
@@ -213,6 +215,7 @@ export default function CustomCamera({ onPhotoCaptured, onFrameCalculated }) {
         }}
       >
         <CameraView
+          key={cameraViewMountKey}
           style={styles.camera}
           facing="back"
           ref={cameraRef}

package/src/ImageCropper.js

@@ -141,6 +141,7 @@ const ImageCropper = ({ onConfirm, openCameraFirst, initialImage, addheight, rot
   const rotationInProgressRef = useRef(false); // block duplicate taps immediately
   const lastValidPosition = useRef(null);
   const insets = useSafeAreaInsets();
+  const openCameraTimeoutRef = useRef(null);
   
   // ✅ NEW ARCH: mobile does NOT export the final crop.
 
@@ -153,22 +154,39 @@ const ImageCropper = ({ onConfirm, openCameraFirst, initialImage, addheight, rot
 
 
   useEffect(() => {
-  if (openCameraFirst) {
-  setShowCustomCamera(true);
-} else if (initialImage) {
-  setImage(initialImage);
-  sourceImageUri.current = initialImage;
-  // ✅ CRITICAL: Reset points when loading a new image from gallery
-  // This ensures the crop box will be automatically initialized
-  setPoints([]);
-  rotationAngle.current = 0;
-  // Clear camera frame data for gallery images
-  cameraFrameData.current = null;
-  // ✅ CRITICAL: Reset initialization guard for new image
-  hasInitializedCropBox.current = false;
-  imageSource.current = null;
-}
-}, [openCameraFirst, initialImage]);
+    // If a previous open was scheduled, cancel it.
+    if (openCameraTimeoutRef.current) {
+      clearTimeout(openCameraTimeoutRef.current);
+      openCameraTimeoutRef.current = null;
+    }
+
+    if (openCameraFirst) {
+      // Delay opening the camera so the prior session can fully release.
+      openCameraTimeoutRef.current = setTimeout(() => {
+        setShowCustomCamera(true);
+        openCameraTimeoutRef.current = null;
+      }, 800);
+    } else if (initialImage) {
+      setImage(initialImage);
+      sourceImageUri.current = initialImage;
+      // ✅ CRITICAL: Reset points when loading a new image from gallery
+      // This ensures the crop box will be automatically initialized
+      setPoints([]);
+      rotationAngle.current = 0;
+      // Clear camera frame data for gallery images
+      cameraFrameData.current = null;
+      // ✅ CRITICAL: Reset initialization guard for new image
+      hasInitializedCropBox.current = false;
+      imageSource.current = null;
+    }
+
+    return () => {
+      if (openCameraTimeoutRef.current) {
+        clearTimeout(openCameraTimeoutRef.current);
+        openCameraTimeoutRef.current = null;
+      }
+    };
+  }, [openCameraFirst, initialImage]);
 
 
   // ✅ REFACTORISATION : Stocker uniquement les dimensions originales (pas de calcul théorique)
@@ -1100,13 +1118,6 @@ const rotatePreviewImage = async (degrees) => {
       {showCustomCamera ? (
         <CustomCamera
           onPhotoCaptured={(uri, frameData) => { 
-            // ✅ Reset refs for new image so second (and later) photos don't use first image's layout (fixes white screen on some devices)
-            originalImageDimensions.current = { width: 0, height: 0 };
-            imageDisplayRect.current = { x: 0, y: 0, width: 0, height: 0 };
-            displayedImageLayout.current = { x: 0, y: 0, width: 0, height: 0 };
-            imageMeasure.current = { x: 0, y: 0, width: 0, height: 0 };
-            sourceImageUri.current = uri;
-
             // ✅ CRITICAL FIX: Store green frame coordinates for coordinate conversion
             if (frameData && frameData.greenFrame) {
               cameraFrameData.current = {
@@ -1204,7 +1215,6 @@ const rotatePreviewImage = async (degrees) => {
                 }}
               >
                 <Image
-                  key={image}
                   source={{ uri: image }}
                   style={styles.image}
                   resizeMode={cameraFrameData.current?.greenFrame ? 'cover' : 'contain'}