⭐️ Impl: ModalView.isModalContentLazy

dominicstop · Mar 3, 2023 · c6f41b2 · c6f41b2
1 parent 0ee8a5b
commit c6f41b2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/src/components/ModalView/ModalView.tsx b/src/components/ModalView/ModalView.tsx
@@ -109,6 +109,7 @@ export class ModalView extends
       setEnableSwipeGestureFromProps,
       setModalInPresentationFromProps,
       containerStyle,
+      isModalContentLazy,
 
       children,
       ...viewProps
@@ -149,6 +150,9 @@ export class ModalView extends
       isModalInPresentation: (
         isModalInPresentation ?? false
       ),
+      isModalContentLazy: (
+        isModalContentLazy ?? true
+      ),
 
       // B - Pass down...
       modalID,
@@ -192,6 +196,7 @@ export class ModalView extends
     nextVisible: boolean,
     childProps: object | null = null
   ) => {
+    const props = this.getProps();
     const { isModalVisible: prevVisible } = this.state;
 
     const didChange = (prevVisible !== nextVisible);
@@ -210,11 +215,13 @@ export class ModalView extends
       });
 
       // wait for view to mount
-      await Helpers.promiseWithTimeout(500, new Promise<void>((resolve) => {
-        this.emitter.once(ModalViewEmitterEvents.onLayoutModalContentContainer, () => {
-          resolve();
-        });
-      }));
+      if (props.isModalContentLazy){
+        await Helpers.promiseWithTimeout(500, new Promise<void>((resolve) => {
+          this.emitter.once(ModalViewEmitterEvents.onLayoutModalContentContainer, () => {
+            resolve();
+          });
+        }));
+      }
     }
 
     try {
@@ -394,7 +401,10 @@ export class ModalView extends
       }),
     };
 
-    const shouldMountModalContent = state.isModalVisible;
+    // TODO: Fix `isModalContentLazy` props
+    // * Error when opening modal once it's been closed
+    const shouldMountModalContent =
+      !props.isModalContentLazy || state.isModalVisible;
 
     return (
       <RNIModalView

diff --git a/src/components/ModalView/ModalViewTypes.ts b/src/components/ModalView/ModalViewTypes.ts
@@ -33,6 +33,7 @@ export type ModalViewBaseProps = Partial<
   autoCloseOnUnmount?: boolean;
   setEnableSwipeGestureFromProps?: boolean;
   setModalInPresentationFromProps?: boolean;
+  isModalContentLazy?: boolean;
 
   containerStyle: ViewStyle;
   children?: React.ReactNode;