fix: stabilise modal un-mounting (#254)

gorhom · Feb 1, 2021 · 43efd16 · 43efd16
1 parent d11a889
commit 43efd16
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/components/bottomSheetModal/BottomSheetModal.tsx b/src/components/bottomSheetModal/BottomSheetModal.tsx
@@ -76,18 +76,19 @@ const BottomSheetModalComponent = forwardRef<
 
   //#region callbacks
   const doDismiss = useCallback(() => {
-    if (_providedOnDismiss) {
-      _providedOnDismiss();
-    }
+    // reset
+    isMinimized.current = false;
+    isForcedDismissed.current = false;
 
+    // unmount the sheet and the portal
     unmountSheet(key);
     unmountPortal(key);
-
     setMount(false);
 
-    // reset
-    isMinimized.current = false;
-    isForcedDismissed.current = false;
+    // fire the call back
+    if (_providedOnDismiss) {
+      _providedOnDismiss();
+    }
   }, [key, _providedOnDismiss, unmountSheet, unmountPortal]);
   const handleOnChange = useCallback(
     (_index: number) => {