💫 Update: ModalSheetView.presentModal

dominicstop · Sep 28, 2024 · 57c146e · 57c146e
1 parent 0fac24c
commit 57c146e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/components/ModalSheetView/ModalSheetView.tsx b/src/components/ModalSheetView/ModalSheetView.tsx
@@ -60,10 +60,19 @@ export const ModalSheetView = React.forwardRef<
         }));
       };
 
-      await nativeRef.current.presentModal({
-        isAnimated: true,
-        ...commandArgs,
-      });
+      const eventEmitter = nativeRef.current!.getEventEmitter();
+
+      await Promise.all([
+        nativeRef.current.presentModal({
+          isAnimated: true,
+          ...commandArgs,
+        }),
+        new Promise<void>(resolve => {
+          eventEmitter.once('onModalDidShow', () => {
+            resolve();
+          });
+        }),
+      ]);
     },
     dismissModal: async (commandArgs) => {
       if(nativeRef.current == null) {

diff --git a/src/components/ModalSheetView/ModalSheetViewTypes.tsx b/src/components/ModalSheetView/ModalSheetViewTypes.tsx
@@ -8,6 +8,7 @@ import type { RNIModalSheetViewProps, RNIModalSheetViewRef } from "../../native_
 type ModalSheetViewRefInherited = Pick<RNIModalSheetViewRef,
   | 'getCachedModalMetrics'
   | 'getModalMetrics'
+  | 'getEventEmitter'
 >;
 
 type ModalSheetViewRefInheritedRaw = Pick<RNIModalSheetViewRef,