ソースを参照

fix BottomSheet shaking

master
Bettenbuk Zoltan 5年前
コミット
245eb89b85
1個のファイルの変更12行の追加8行の削除
  1. 12
    8
      react/features/base/dialog/components/native/BottomSheet.js

+ 12
- 8
react/features/base/dialog/components/native/BottomSheet.js ファイルの表示

61
                             styles.sheetItemContainer,
61
                             styles.sheetItemContainer,
62
                             _styles.sheet
62
                             _styles.sheet
63
                         ] }>
63
                         ] }>
64
-                        <ScrollView
65
-                            bounces = { false }
66
-                            showsVerticalScrollIndicator = { false }>
67
-                            { this._getWrappedContent() }
68
-                        </ScrollView>
64
+                        { this._getWrappedContent() }
69
                     </View>
65
                     </View>
70
                 </View>
66
                 </View>
71
             </SlidingView>
67
             </SlidingView>
73
     }
69
     }
74
 
70
 
75
     /**
71
     /**
76
-     * Wraps the content when needed (iOS 11 and above), or just returns the original children.
72
+     * Wraps the content when needed (iOS 11 and above), or just returns the original content.
77
      *
73
      *
78
      * @returns {React$Element}
74
      * @returns {React$Element}
79
      */
75
      */
80
     _getWrappedContent() {
76
     _getWrappedContent() {
77
+        const content = (
78
+            <ScrollView
79
+                bounces = { false }
80
+                showsVerticalScrollIndicator = { false } >
81
+                { this.props.children }
82
+            </ScrollView>
83
+        );
84
+
81
         if (Platform.OS === 'ios') {
85
         if (Platform.OS === 'ios') {
82
             const majorVersionIOS = parseInt(Platform.Version, 10);
86
             const majorVersionIOS = parseInt(Platform.Version, 10);
83
 
87
 
84
             if (majorVersionIOS > 10) {
88
             if (majorVersionIOS > 10) {
85
                 return (
89
                 return (
86
                     <SafeAreaView>
90
                     <SafeAreaView>
87
-                        { this.props.children }
91
+                        { content }
88
                     </SafeAreaView>
92
                     </SafeAreaView>
89
                 );
93
                 );
90
             }
94
             }
91
         }
95
         }
92
 
96
 
93
-        return this.props.children;
97
+        return content;
94
     }
98
     }
95
 }
99
 }
96
 
100
 

読み込み中…
キャンセル
保存