feat : add auto leave props for loader popup

hel-axelor · Feb 2, 2024 · da78ed7 · da78ed7
1 parent a8cbc51
commit da78ed7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/packages/apps/stock/src/screens/loader/LoaderScreen.js b/packages/apps/stock/src/screens/loader/LoaderScreen.js
@@ -77,6 +77,7 @@ const LoaderScreen = () => {
           onSuccess={handleSuccessAction}
           onError={handleErrorAction}
           disabled={false}
+          autoLeave={true}
         />
       </View>
     </Screen>

diff --git a/packages/core/src/components/templates/Loader/LoaderPopup.tsx b/packages/core/src/components/templates/Loader/LoaderPopup.tsx
@@ -39,6 +39,7 @@ interface LoaderPopupProps {
   runProccess: boolean;
   timeout: number;
   disabled: boolean;
+  autoLeave: boolean;
 }
 
 const LoaderPopup = ({
@@ -48,6 +49,7 @@ const LoaderPopup = ({
   runProccess = false,
   timeout = 100,
   disabled = false,
+  autoLeave = false,
 }: LoaderPopupProps) => {
   const navigation = useNavigation();
   const I18n = useTranslator();
@@ -66,10 +68,10 @@ const LoaderPopup = ({
   });
 
   useEffect(() => {
-    if (notifyMe) {
+    if (autoLeave || notifyMe) {
       navigation.goBack();
     }
-  }, [navigation, notifyMe]);
+  }, [navigation, autoLeave, notifyMe]);
 
   useEffect(() => {
     if (runProccess) {
@@ -94,7 +96,14 @@ const LoaderPopup = ({
       setActivityIndicator(false);
       clearTimeout(timeoutRef.current);
     };
-  }, [timeout, loading, showPopup, setActivityIndicator, setShowPopup]);
+  }, [
+    timeout,
+    loading,
+    showPopup,
+    autoLeave,
+    setActivityIndicator,
+    setShowPopup,
+  ]);
 
   if (!loading || !showPopup) {
     return null;