From 5787d82754eafacfaa0fef6be373b5866c5143cb Mon Sep 17 00:00:00 2001
From: Dominic Go <18517029+dominicstop@users.noreply.github.com>
Date: Fri, 31 Mar 2023 07:18:59 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=AB=20Update:=20Ex=20-=20`Test06`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/src/examples/Test06/ModalGroup.tsx       | 16 +++++++++++++---
 .../examples/Test06/ModalGroupItemContent.tsx    |  3 ++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/example/src/examples/Test06/ModalGroup.tsx b/example/src/examples/Test06/ModalGroup.tsx
index 327dfdf5..93dda30f 100644
--- a/example/src/examples/Test06/ModalGroup.tsx
+++ b/example/src/examples/Test06/ModalGroup.tsx
@@ -64,7 +64,18 @@ export const ModalGroup = React.forwardRef<ModalGroupHandle, ModalGroupProps>(
               setCurrentModalIndex(nextModalIndex);
               modalRef.setVisibility(true);
             }}
-            onPressClosePrevModal={async (modalIndex) => {
+            onPressCloseModal={async (modalIndex) => {
+              const modalRef = modalRefs.current[`${modalIndex}`];
+
+              // guard
+              if (modalRef == null) {
+                return;
+              }
+
+              await modalRef.setVisibility(false);
+              setCurrentModalIndex(modalIndex - 1);
+            }}
+            onPressClosePrevModal={(modalIndex) => {
               const prevModalIndex = modalIndex - 1;
 
               const prevModalRef = modalRefs.current[`${prevModalIndex}`];
@@ -74,8 +85,7 @@ export const ModalGroup = React.forwardRef<ModalGroupHandle, ModalGroupProps>(
                 return;
               }
 
-              await prevModalRef.setVisibility(false);
-              setCurrentModalIndex(prevModalIndex);
+              prevModalRef.setVisibility(false);
             }}
           />
         </ModalView>
diff --git a/example/src/examples/Test06/ModalGroupItemContent.tsx b/example/src/examples/Test06/ModalGroupItemContent.tsx
index 52c2f9c5..0398f090 100644
--- a/example/src/examples/Test06/ModalGroupItemContent.tsx
+++ b/example/src/examples/Test06/ModalGroupItemContent.tsx
@@ -16,6 +16,7 @@ export function ModalGroupItemContent(props: {
   modalIndex: number;
   onPressOpenNextModal: (modalIndex: number) => void;
   onPressClosePrevModal: (modalIndex: number) => void;
+  onPressCloseModal: (modalIndex: number) => void;
 }) {
   const logDisplayRef = React.useRef<CardLogDisplayHandle>(null);
 
@@ -82,7 +83,7 @@ export function ModalGroupItemContent(props: {
         <CardButton
           title={'🚫 Close Modal'}
           onPress={() => {
-            modalContext.setVisibility(false);
+            props.onPressCloseModal(props.modalIndex);
           }}
         />
         {props.modalIndex > 0 && (