fix: avoid events to be trigger twice (#130)

jeremybarbet · Feb 4, 2020 · 9413350 · 9413350
1 parent 9d06edf
commit 9413350
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 42 deletions.
diff --git a/examples/expo/src/components/modals/FixedContent.js b/examples/expo/src/components/modals/FixedContent.js
@@ -39,7 +39,7 @@ export class FixedContent extends React.PureComponent {
 
   render() {
     return (
-      <Modalize ref={this.modal} adjustToContentHeight>
+      <Modalize ref={this.modal} scrollViewProps={{ scrollEnabled: false }} adjustToContentHeight>
         {this.renderContent()}
       </Modalize>
     );

diff --git a/examples/react-native-navigation/src/screens/FixedContent.js b/examples/react-native-navigation/src/screens/FixedContent.js
@@ -48,7 +48,12 @@ export class FixedContent extends React.PureComponent {
 
   render() {
     return (
-      <Modalize ref={this.modal} onClosed={this.onClosed} adjustToContentHeight>
+      <Modalize
+        ref={this.modal}
+        onClosed={this.onClosed}
+        scrollViewProps={{ scrollEnabled: false }}
+        adjustToContentHeight
+      >
         {this.renderContent()}
       </Modalize>
     );

diff --git a/examples/react-navigation/src/components/modals/FixedContent.js b/examples/react-navigation/src/components/modals/FixedContent.js
@@ -39,7 +39,7 @@ export class FixedContent extends React.PureComponent {
 
   render() {
     return (
-      <Modalize ref={this.modal} adjustToContentHeight>
+      <Modalize ref={this.modal} scrollViewProps={{ scrollEnabled: false }} adjustToContentHeight>
         {this.renderContent()}
       </Modalize>
     );

diff --git a/src/index.tsx b/src/index.tsx
@@ -69,7 +69,6 @@ export class Modalize<FlatListItem = any, SectionListItem = any> extends React.C
   private snaps: number[] = [];
   private snapEnd: number;
   private beginScrollYValue: number = 0;
-  private contentAlreadyCalculated: boolean = false;
   private beginScrollY: Animated.Value = new Animated.Value(0);
   private dragY: Animated.Value = new Animated.Value(0);
   private translateY: Animated.Value = new Animated.Value(screenHeight);
@@ -158,17 +157,13 @@ export class Modalize<FlatListItem = any, SectionListItem = any> extends React.C
   }
 
   public open = (): void => {
-    const { adjustToContentHeight, onOpen } = this.props;
+    const { onOpen } = this.props;
 
     if (onOpen) {
       onOpen();
     }
 
-    if (!adjustToContentHeight || this.contentAlreadyCalculated) {
-      this.onAnimateOpen();
-    } else {
-      this.setState({ isVisible: true });
-    }
+    this.onAnimateOpen();
   };
 
   public close = (dest: 'alwaysOpen' | 'default' = 'default'): void => {
@@ -375,36 +370,6 @@ export class Modalize<FlatListItem = any, SectionListItem = any> extends React.C
     });
   };
 
-  private onContentViewLayout = ({ nativeEvent }: LayoutChangeEvent): void => {
-    const { adjustToContentHeight, snapPoint, alwaysOpen } = this.props;
-    const { contentHeight, modalHeight } = this.state;
-
-    if (
-      !adjustToContentHeight ||
-      (modalHeight || 0) <= nativeEvent.layout.height ||
-      snapPoint ||
-      this.contentAlreadyCalculated
-    ) {
-      if ((modalHeight || 0) <= nativeEvent.layout.height) {
-        this.onAnimateOpen(alwaysOpen);
-      }
-
-      return;
-    }
-
-    // @todo: modalHeight should be equal to the nativeEvent's height,
-    // and not to the state's value which is 0 at the first mount
-    this.setState(
-      {
-        contentHeight: nativeEvent.layout.height || contentHeight,
-      },
-      () => {
-        this.contentAlreadyCalculated = true;
-        this.onAnimateOpen();
-      },
-    );
-  };
-
   private onHandleComponent = ({ nativeEvent }: PanGestureHandlerStateChangeEvent): void => {
     if (nativeEvent.oldState === State.BEGAN) {
       this.beginScrollY.setValue(0);
@@ -611,7 +576,7 @@ export class Modalize<FlatListItem = any, SectionListItem = any> extends React.C
         { useNativeDriver: false },
       ),
       scrollEventThrottle: 16,
-      onLayout: this.onContentViewLayout,
+      keyboardDismissMode,
     };
 
     if (flatListProps) {
@@ -623,7 +588,7 @@ export class Modalize<FlatListItem = any, SectionListItem = any> extends React.C
     }
 
     return (
-      <Animated.ScrollView {...opts} {...scrollViewProps} keyboardDismissMode={keyboardDismissMode}>
+      <Animated.ScrollView {...opts} {...scrollViewProps}>
         {children}
       </Animated.ScrollView>
     );