Dont call onChange + onComplete if onImageLoaded callback returns false

#245
sekoyo · Mar 6, 2019 · 2b48e6e · 2b48e6e
1 parent d9becbe
commit 2b48e6e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/dist/ReactCrop.js b/dist/ReactCrop.js
@@ -575,9 +575,11 @@ var ReactCrop = function (_PureComponent) {
 
       var resolvedCrop = resolveCrop(crop, image);
 
-      onImageLoaded(image, getPixelCrop(image, resolvedCrop, useNaturalImageDimensions));
+      // Return false from onImageLoaded if you set the crop with setState in there as otherwise the subsequent
+      // onChange + onComplete will not have your updated crop.
+      var res = onImageLoaded(image, getPixelCrop(image, resolvedCrop, useNaturalImageDimensions));
 
-      if (resolvedCrop !== crop) {
+      if (res !== false && resolvedCrop !== crop) {
         onChange(resolvedCrop, getPixelCrop(image, resolvedCrop, useNaturalImageDimensions));
         onComplete(resolvedCrop, getPixelCrop(image, resolvedCrop, useNaturalImageDimensions));
       }

diff --git a/dist/ReactCrop.min.js b/dist/ReactCrop.min.js
diff --git a/lib/ReactCrop.js b/lib/ReactCrop.js
@@ -459,9 +459,11 @@ class ReactCrop extends PureComponent {
 
     const resolvedCrop = resolveCrop(crop, image);
 
-    onImageLoaded(image, getPixelCrop(image, resolvedCrop, useNaturalImageDimensions));
+    // Return false from onImageLoaded if you set the crop with setState in there as otherwise the subsequent
+    // onChange + onComplete will not have your updated crop.
+    const res = onImageLoaded(image, getPixelCrop(image, resolvedCrop, useNaturalImageDimensions));
 
-    if (resolvedCrop !== crop) {
+    if (res !== false && resolvedCrop !== crop) {
       onChange(resolvedCrop, getPixelCrop(image, resolvedCrop, useNaturalImageDimensions));
       onComplete(resolvedCrop, getPixelCrop(image, resolvedCrop, useNaturalImageDimensions));
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-image-crop",
-  "version": "6.0.16",
+  "version": "6.0.17",
   "description": "A responsive image cropping tool for React",
   "repository": "https://github.com/DominicTobias/react-image-crop",
   "main": "dist/ReactCrop.js",