From d666a2d7c3e55044435cfecd548caa3467b735d9 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 6 Nov 2024 20:38:22 +0000 Subject: [Lightbox] Set 2 as minimal allowed zoom level (#6132) * [Lightbox] Set 2 as minimal allowed zoom level on iOS * Fix both Android and iOS --- .../components/ImageItem/ImageItem.android.tsx | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/view/com/lightbox/ImageViewing/components/ImageItem/ImageItem.android.tsx') diff --git a/src/view/com/lightbox/ImageViewing/components/ImageItem/ImageItem.android.tsx b/src/view/com/lightbox/ImageViewing/components/ImageItem/ImageItem.android.tsx index ea77ec273..ed6020000 100644 --- a/src/view/com/lightbox/ImageViewing/components/ImageItem/ImageItem.android.tsx +++ b/src/view/com/lightbox/ImageViewing/components/ImageItem/ImageItem.android.tsx @@ -26,7 +26,7 @@ import { TransformMatrix, } from '../../transforms' -const MIN_DOUBLE_TAP_SCALE = 2 +const MIN_SCREEN_ZOOM = 2 const MAX_ORIGINAL_IMAGE_ZOOM = 2 const initialTransform = createTransform() @@ -166,8 +166,10 @@ const ImageItem = ({ // Don't let the picture zoom in so close that it gets blurry. // Also, like in stock Android apps, don't let the user zoom out further than 1:1. const [, , committedScale] = readTransform(committedTransform.value) - const maxCommittedScale = - (imageDimensions.width / screenSize.width) * MAX_ORIGINAL_IMAGE_ZOOM + const maxCommittedScale = Math.max( + MIN_SCREEN_ZOOM, + (imageDimensions.width / screenSize.width) * MAX_ORIGINAL_IMAGE_ZOOM, + ) const minPinchScale = 1 / committedScale const maxPinchScale = maxCommittedScale / committedScale const nextPinchScale = Math.min( @@ -277,11 +279,13 @@ const ImageItem = ({ const candidateScale = Math.max( imageAspect / screenAspect, screenAspect / imageAspect, - MIN_DOUBLE_TAP_SCALE, + MIN_SCREEN_ZOOM, ) // But don't zoom in so close that the picture gets blurry. - const maxScale = - (imageDimensions.width / screenSize.width) * MAX_ORIGINAL_IMAGE_ZOOM + const maxScale = Math.max( + MIN_SCREEN_ZOOM, + (imageDimensions.width / screenSize.width) * MAX_ORIGINAL_IMAGE_ZOOM, + ) const scale = Math.min(candidateScale, maxScale) // Calculate where we would be if the user pinched into the double tapped point. -- cgit 1.4.1