Skip to content

Commit 9e8b7c1

Browse files
shivamhwpclaude
andcommitted
fix(mobile): Android image viewer pinches from anywhere on screen
Pan handlers sat on the Animated.Image, so native hit testing only started a pinch when both fingers landed on the fitted image. A wide image fits as a thin strip and could not be zoomed. Move the handlers to a full-viewport View that wraps the image and loading indicator inside the swipe-to-close ScrollView. Fixes #30815 Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 9e85538 commit 9e8b7c1

2 files changed

Lines changed: 14 additions & 9 deletions

File tree

‎patches/[email protected]‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ index 3d7641a9a94864415d207c678b71f8c592c90aa1..2b9ef77c3eb58cd284152ad22b2e711a
6464
offset: SCREEN_WIDTH * index,
6565
index,
6666
diff --git a/dist/components/ImageItem/ImageItem.android.js b/dist/components/ImageItem/ImageItem.android.js
67-
index 5fcaa9f9a7d893817fee89b85186ee3936118e69..3effe838fa54495d165b81cc7501e72d51fbee1b 100644
67+
index 5fcaa9f9a7d893817fee89b85186ee3936118e69..98ecef33888cbf7ad50a61bbf1645aee1857c054 100644
6868
--- a/dist/components/ImageItem/ImageItem.android.js
6969
+++ b/dist/components/ImageItem/ImageItem.android.js
7070
@@ -6,17 +6,17 @@
7171
*
7272
*/
7373
import React, { useCallback, useRef, useState } from "react";
7474
-import { Animated, ScrollView, Dimensions, StyleSheet, } from "react-native";
75-
+import { Animated, ScrollView, Dimensions, } from "react-native";
75+
+import { Animated, ScrollView, Dimensions, View, } from "react-native";
7676
import useImageDimensions from "../../hooks/useImageDimensions";
7777
import usePanResponder from "../../hooks/usePanResponder";
7878
import { getImageStyles, getImageTransform } from "../../utils";
@@ -102,7 +102,7 @@ index 5fcaa9f9a7d893817fee89b85186ee3936118e69..3effe838fa54495d165b81cc7501e72d
102102
const onLongPressHandler = useCallback(() => {
103103
onLongPress(imageSrc);
104104
}, [imageSrc, onLongPress]);
105-
@@ -64,7 +64,7 @@ const ImageItem = ({ imageSrc, onZoom, onRequestClose, onLongPress, delayLongPre
105+
@@ -64,21 +64,15 @@ const ImageItem = ({ imageSrc, onZoom, onRequestClose, onLongPress, delayLongPre
106106
const offsetY = (_c = (_b = (_a = nativeEvent) === null || _a === void 0 ? void 0 : _a.contentOffset) === null || _b === void 0 ? void 0 : _b.y, (_c !== null && _c !== void 0 ? _c : 0));
107107
scrollValueY.setValue(offsetY);
108108
};
@@ -111,8 +111,13 @@ index 5fcaa9f9a7d893817fee89b85186ee3936118e69..3effe838fa54495d165b81cc7501e72d
111111
onScroll,
112112
onScrollEndDrag,
113113
})}>
114-
@@ -72,13 +72,4 @@ const ImageItem = ({ imageSrc, onZoom, onRequestClose, onLongPress, delayLongPre
115-
{(!isLoaded || !imageDimensions) && <ImageLoading />}
114+
- <Animated.Image {...panHandlers} source={imageSrc} style={imageStylesWithOpacity} onLoad={onLoaded}/>
115+
- {(!isLoaded || !imageDimensions) && <ImageLoading />}
116+
+ {/* Pinch from anywhere on screen, not only on the fitted image. */}
117+
+ <View {...panHandlers} style={{ width: SCREEN_WIDTH, height: SCREEN_HEIGHT }}>
118+
+ <Animated.Image source={imageSrc} style={imageStylesWithOpacity} onLoad={onLoaded}/>
119+
+ {(!isLoaded || !imageDimensions) && <ImageLoading />}
120+
+ </View>
116121
</ScrollView>);
117122
};
118123
-const styles = StyleSheet.create({
@@ -254,7 +259,7 @@ index cb5f0f798e5cfeedf459b7d22e92871db3092020..97ca2c9c326b1c53e6a5d90c3bb95d53
254259
};
255260
export default useImageIndexChange;
256261
diff --git a/dist/hooks/usePanResponder.js b/dist/hooks/usePanResponder.js
257-
index 99dcbc7efea4eba86a8bc2bad71dde73c8ebf1b4..3a374c0923879548ec3826a78be16f79c6e01432 100644
262+
index 99dcbc7efea4eba86a8bc2bad71dde73c8ebf1b4..7a7601eef4d330448d876b6460f53bd518a2c18c 100644
258263
--- a/dist/hooks/usePanResponder.js
259264
+++ b/dist/hooks/usePanResponder.js
260265
@@ -8,14 +8,14 @@

‎pnpm-lock.yaml‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)