From c360c5c922f20057fc47ae10c4be34ca88e981cf Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Fri, 29 Sep 2023 17:28:38 +0100 Subject: [PATCH] Show/hide controls on zoom --- .../components/ImageItem/ImageItem.android.tsx | 11 ++++++++--- src/view/com/lightbox/ImageViewing/index.tsx | 2 -- 2 files changed, 8 insertions(+), 5 deletions(-) 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 62a4d5f573..323c3a227e 100644 --- a/src/view/com/lightbox/ImageViewing/components/ImageItem/ImageItem.android.tsx +++ b/src/view/com/lightbox/ImageViewing/components/ImageItem/ImageItem.android.tsx @@ -180,13 +180,18 @@ const ImageItem = ({ } return false; }, - (isScaledNow, wasScaledBefore) => { - if (isScaledNow !== wasScaledBefore) { - runOnJS(setIsScaled)(isScaledNow) + (nextIsScaled, prevIsScaled) => { + if (nextIsScaled !== prevIsScaled) { + runOnJS(handleZoom)(nextIsScaled) } } ) + function handleZoom(nextIsScaled) { + setIsScaled(nextIsScaled) + onZoom(nextIsScaled) + } + const animatedStyle = useAnimatedStyle(() => { let t = createTransform(); prependPan(t, panTranslation.value); diff --git a/src/view/com/lightbox/ImageViewing/index.tsx b/src/view/com/lightbox/ImageViewing/index.tsx index 1a64fb3afb..23b4498753 100644 --- a/src/view/com/lightbox/ImageViewing/index.tsx +++ b/src/view/com/lightbox/ImageViewing/index.tsx @@ -87,8 +87,6 @@ function ImageViewing({ const onZoom = useCallback( (isScaled: boolean) => { - // @ts-ignore - imageList?.current?.setNativeProps({scrollEnabled: !isScaled}) toggleBarsVisible(!isScaled) }, [toggleBarsVisible],