Skip to content

fix: image gallery animation and wrong indexing #3241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
khushal87 merged 2 commits into from
Oct 8, 2025
Merged

fix: image gallery animation and wrong indexing #3241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94b1b40
fix: image gallery animation and wrong indexing
khushal87 Oct 7, 2025
2a059d4
fix: image gallery animation and wrong indexing
khushal87 Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions package/src/components/ImageGallery/ImageGallery.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,14 +309,8 @@ export const ImageGallery = (props: Props) => {
}
};

const newIndex = photos.findIndex(
(photo) =>
photo.messageId === selectedMessage?.messageId &&
stripQueryFromUrl(photo.uri) === stripQueryFromUrl(selectedMessage?.url || ''),
);

runOnUI(updatePosition)(newIndex);
}, [selectedMessage, photos, index, translationX, fullWindowWidth]);
runOnUI(updatePosition)(photoSelectedIndex);
}, [fullWindowWidth, index, photoSelectedIndex, translationX]);

/**
* Image heights are not provided and therefore need to be calculated.
Expand Down Expand Up @@ -389,7 +383,7 @@ export const ImageGallery = (props: Props) => {
const pagerStyle = useAnimatedStyle<ImageStyle>(
() => ({
transform: [
{ scaleX: -1 },
{ scaleX: 1 },
{
translateX: translationX.value,
},
Expand Down
2 changes: 1 addition & 1 deletion package/src/components/ImageGallery/components/ImageGalleryFooter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ export const ImageGalleryFooterWithContext = (props: ImageGalleryFooterPropsWith
<View style={[styles.centerContainer, centerContainer]}>
<Text style={[styles.imageCountText, { color: black }, imageCountText]}>
{t('{{ index }} of {{ photoLength }}', {
index: photoLength - selectedIndex,
index: selectedIndex + 1,
photoLength,
})}
</Text>
Expand Down
21 changes: 14 additions & 7 deletions package/src/components/ImageGallery/hooks/useImageGalleryGestures.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Gesture, GestureType } from 'react-native-gesture-handler';
import {
cancelAnimation,
Easing,
ReduceMotion,
runOnJS,
SharedValue,
useSharedValue,
Expand Down Expand Up @@ -242,8 +243,8 @@ export const useImageGalleryGestures = ({
*/
translateX.value =
scale.value !== offsetScale.value
? offsetX.value * localEvtScale - event.translationX
: offsetX.value - event.translationX;
? offsetX.value * localEvtScale + event.translationX
: offsetX.value + event.translationX;
translateY.value =
isSwiping.value !== IsSwiping.TRUE
? scale.value !== offsetScale.value
Expand Down Expand Up @@ -285,12 +286,14 @@ export const useImageGalleryGestures = ({
* If there is a next photo, the image is lined up to the right
* edge, the swipe is to the left, and the final position is more
* than half the screen width, move to the next image
*
* As we move towards the left to move to next image, the translationX value will be negative on X axis.
*/
if (
index < photoLength - 1 &&
Math.abs(halfScreenWidth * (scale.value - 1) + offsetX.value) < 3 &&
translateX.value < 0 &&
finalXPosition < -halfScreenWidth &&
finalXPosition > halfScreenWidth &&
isSwiping.value === IsSwiping.TRUE
) {
cancelAnimation(translationX);
Expand All @@ -310,13 +313,15 @@ export const useImageGalleryGestures = ({
/**
* If there is a previous photo, the image is lined up to the left
* edge, the swipe is to the right, and the final position is more
* than half the screen width, move to the previous image
* than half the screen width, move to the previous image.
*
* As we move towards the right to move to previous image, the translationX value will be positive on X axis.
*/
} else if (
index > 0 &&
Math.abs(-halfScreenWidth * (scale.value - 1) + offsetX.value) < 3 &&
translateX.value > 0 &&
finalXPosition > halfScreenWidth &&
finalXPosition < -halfScreenWidth &&
isSwiping.value === IsSwiping.TRUE
) {
cancelAnimation(translationX);
Expand Down Expand Up @@ -370,9 +375,11 @@ export const useImageGalleryGestures = ({
*/
translateY.value =
currentImageHeight * scale.value < screenHeight
? withTiming(0)
? withTiming(0, { reduceMotion: ReduceMotion.Never })
: translateY.value > (currentImageHeight / 2) * scale.value - halfScreenHeight
? withTiming((currentImageHeight / 2) * scale.value - halfScreenHeight)
? withTiming((currentImageHeight / 2) * scale.value - halfScreenHeight, {
reduceMotion: ReduceMotion.Never,
})
: translateY.value < (-currentImageHeight / 2) * scale.value + halfScreenHeight
? withTiming((-currentImageHeight / 2) * scale.value + halfScreenHeight)
: withDecay({
Expand Down