Prevent flickering with adjustToContentHeight

linddominic · Oct 11, 2019 · a2585c6 · a2585c6
1 parent 88d7a11
commit a2585c6
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/Modalize.tsx b/src/Modalize.tsx
@@ -130,13 +130,17 @@ export default class Modalize<FlatListItem = any, SectionListItem = any>
   }
 
   public open = (): void => {
-    const { onOpen } = this.props;
+    const { adjustToContentHeight, onOpen } = this.props;
 
     if (onOpen) {
       onOpen();
     }
 
-    this.onAnimateOpen();
+    if (!adjustToContentHeight || this.contentAlreadyCalculated) {
+      this.onAnimateOpen();
+    } else {
+      this.setState({ isVisible: true });
+    }
   }
 
   public close = (): void => {
@@ -297,6 +301,7 @@ export default class Modalize<FlatListItem = any, SectionListItem = any>
       modalHeight: contentHeight - this.handleHeight,
     }, () => {
       this.contentAlreadyCalculated = true;
+      this.onAnimateOpen();
     });
   }