refactor: calling dismiss without a key will remove the current modal…

… if any (#676)(by @Shywim)
gorhom · Oct 3, 2021 · fd4bb8d · fd4bb8d
1 parent c1fce95
commit fd4bb8d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/components/bottomSheetModalProvider/BottomSheetModalProvider.tsx b/src/components/bottomSheetModalProvider/BottomSheetModalProvider.tsx
@@ -135,13 +135,15 @@ const BottomSheetModalProviderWrapper = ({
   //#endregion
 
   //#region public methods
-  const handleDismiss = useCallback((key: string) => {
-    const sheetToBeDismissed = sheetsQueueRef.current.find(
-      item => item.key === key
-    );
+  const handleDismiss = useCallback((key?: string) => {
+    const sheetToBeDismissed = key
+      ? sheetsQueueRef.current.find(item => item.key === key)
+      : sheetsQueueRef.current[sheetsQueueRef.current.length - 1];
     if (sheetToBeDismissed) {
       sheetToBeDismissed.ref.current.dismiss();
+      return true;
     }
+    return false;
   }, []);
   const handleDismissAll = useCallback(() => {
     sheetsQueueRef.current.map(item => {

diff --git a/src/contexts/modal/external.ts b/src/contexts/modal/external.ts
@@ -1,7 +1,7 @@
 import { createContext } from 'react';
 
 export interface BottomSheetModalContextType {
-  dismiss: (key: string) => void;
+  dismiss: (key?: string) => boolean;
   dismissAll: () => void;
 }