From 6685a37975b91dd86fa5993621089150315b1365 Mon Sep 17 00:00:00 2001
From: Zeng Xian <themezeng@gmail.com>
Date: Thu, 9 Feb 2023 16:46:01 +0800
Subject: [PATCH 1/3] Fix: reset imageIndex after closed

---
 src/ImageViewing.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/ImageViewing.tsx b/src/ImageViewing.tsx
index 3782ee0e..0712b185 100644
--- a/src/ImageViewing.tsx
+++ b/src/ImageViewing.tsx
@@ -69,7 +69,7 @@ function ImageViewing({
 }: Props) {
   const imageList = useRef<VirtualizedList<ImageSource>>(null);
   const [opacity, onRequestCloseEnhanced] = useRequestClose(onRequestClose);
-  const [currentImageIndex, onScroll] = useImageIndexChange(imageIndex, SCREEN);
+  const [currentImageIndex, onScroll, setImageIndex] = useImageIndexChange(imageIndex, SCREEN);
   const [headerTransform, footerTransform, toggleBarsVisible] =
     useAnimatedComponents();
 
@@ -78,7 +78,13 @@ function ImageViewing({
       onImageIndexChange(currentImageIndex);
     }
   }, [currentImageIndex]);
-
+  
+  useEffect(() => {
+    if(!visible) {
+      setImageIndex(imageIndex);
+    }
+  },[visible, setImageIndex]);
+  
   const onZoom = useCallback(
     (isScaled: boolean) => {
       // @ts-ignore

From 819348c7a98d01c4aa6d901a7921d7c94194be28 Mon Sep 17 00:00:00 2001
From: Zeng Xian <themezeng@gmail.com>
Date: Thu, 9 Feb 2023 16:49:40 +0800
Subject: [PATCH 2/3] Update useImageIndexChange.ts

---
 src/hooks/useImageIndexChange.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/useImageIndexChange.ts b/src/hooks/useImageIndexChange.ts
index c49aab7a..a6c7e426 100644
--- a/src/hooks/useImageIndexChange.ts
+++ b/src/hooks/useImageIndexChange.ts
@@ -26,7 +26,7 @@ const useImageIndexChange = (imageIndex: number, screen: Dimensions) => {
     }
   };
 
-  return [currentImageIndex, onScroll] as const;
+  return [currentImageIndex, onScroll, setImageIndex] as const;
 };
 
 export default useImageIndexChange;

From 82f8674dee742c9ff7269a066f7e4aaea75f0d5d Mon Sep 17 00:00:00 2001
From: Zeng Xian <themezeng@gmail.com>
Date: Thu, 9 Feb 2023 16:51:46 +0800
Subject: [PATCH 3/3] fix code format

---
 src/ImageViewing.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ImageViewing.tsx b/src/ImageViewing.tsx
index 0712b185..3e1e2522 100644
--- a/src/ImageViewing.tsx
+++ b/src/ImageViewing.tsx
@@ -83,7 +83,7 @@ function ImageViewing({
     if(!visible) {
       setImageIndex(imageIndex);
     }
-  },[visible, setImageIndex]);
+  }, [visible, setImageIndex]);
   
   const onZoom = useCallback(
     (isScaled: boolean) => {