[RSKImageCropper] [RSKImageCropViewController] Fix zooming to the spe…

…cified area.
ruslanskorb · Apr 7, 2024 · a97fb6c · a97fb6c
1 parent f36aab3
commit a97fb6c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/Example/RSKImageCropperExampleTests/RSKImageCropViewControllerTests.m b/Example/RSKImageCropperExampleTests/RSKImageCropViewControllerTests.m
@@ -1083,17 +1083,10 @@ - (void)resetZoomScale;
     });
 
     it(@"zooms to a specific area of the image", ^{
-        CGRect rect = CGRectMake(100.0, 100.0, 400.0, 400.0);
+        CGRect rect = CGRectMake(196.0f, 290.0f, 60.0f, 60.0f);
         [imageCropViewController zoomToRect:rect animated:NO];
 
-        UIScrollView *imageScrollView = imageCropViewController.imageScrollView;
-        CGRect visibleRect = CGRectMake(round(imageScrollView.contentOffset.x / imageScrollView.zoomScale),
-                                        round(imageScrollView.contentOffset.y / imageScrollView.zoomScale),
-                                        imageScrollView.bounds.size.width / imageScrollView.zoomScale,
-                                        imageScrollView.bounds.size.height / imageScrollView.zoomScale);
-
-        BOOL contains = CGRectContainsRect(visibleRect, rect);
-        expect(contains).to.beTruthy();
+        expect(imageCropViewController.view).to.haveValidSnapshot();
     });
 
     after(^{

diff --git a/...eCropViewControllerSpec/[email protected] b/...eCropViewControllerSpec/[email protected]
diff --git a/RSKImageCropper/RSKImageCropViewController.h b/RSKImageCropper/RSKImageCropViewController.h
@@ -59,7 +59,7 @@ NS_SWIFT_UI_ACTOR
 /**
  Zooms to a specific area of the image so that it is visible.
  
- @param rect A rectangle defining an area of the image.
+ @param rect A rectangle defining an area of the image. The rectangle should be in the coordinate space of the image view controller's view.
  @param animated YES if the scrolling should be animated, NO if it should be immediate.
  */
 - (void)zoomToRect:(CGRect)rect animated:(BOOL)animated;

diff --git a/RSKImageCropper/RSKImageCropViewController.m b/RSKImageCropper/RSKImageCropViewController.m
@@ -652,7 +652,7 @@ - (void)handleRotation:(UIRotationGestureRecognizer *)gestureRecognizer
 
 - (void)zoomToRect:(CGRect)rect animated:(BOOL)animated
 {
-    [self.imageScrollView zoomToRect:rect animated:animated];
+    [self.imageScrollView zoomToRect:[self.imageScrollView convertRect:rect fromView:self.view] animated:animated];
 }
 
 #pragma mark - Public