File tree Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -35,15 +35,15 @@ const KeyboardAwareListView = createReactClass({
35
35
let newContentContainerStyle
36
36
37
37
if ( Platform . OS === 'android' && enableOnAndroid ) {
38
- newContentContainerStyle = { }
39
- newContentContainerStyle . paddingBottom = ( contentContainerStyle ? contentContainerStyle . paddingBottom : 0 ) + keyboardSpace
38
+ newContentContainerStyle = Object . assign ( { } , contentContainerStyle )
39
+ newContentContainerStyle . paddingBottom = ( newContentContainerStyle . paddingBottom || 0 ) + keyboardSpace
40
40
}
41
41
42
42
return (
43
43
< ListView
44
44
ref = '_rnkasv_keyboardView'
45
45
keyboardDismissMode = 'interactive'
46
- contentInset = { { bottom : this . state . keyboardSpace } }
46
+ contentInset = { { bottom : keyboardSpace } }
47
47
showsVerticalScrollIndicator = { true }
48
48
scrollEventThrottle = { 0 }
49
49
{ ...this . props }
Original file line number Diff line number Diff line change @@ -36,15 +36,15 @@ const KeyboardAwareScrollView = createReactClass({
36
36
let newContentContainerStyle
37
37
38
38
if ( Platform . OS === 'android' && enableOnAndroid ) {
39
- newContentContainerStyle = { }
40
- newContentContainerStyle . paddingBottom = ( contentContainerStyle ? contentContainerStyle . paddingBottom : 0 ) + keyboardSpace
39
+ newContentContainerStyle = Object . assign ( { } , contentContainerStyle )
40
+ newContentContainerStyle . paddingBottom = ( newContentContainerStyle . paddingBottom || 0 ) + keyboardSpace
41
41
}
42
42
43
43
return (
44
44
< ScrollView
45
45
ref = '_rnkasv_keyboardView'
46
46
keyboardDismissMode = 'interactive'
47
- contentInset = { { bottom : this . state . keyboardSpace } }
47
+ contentInset = { { bottom : keyboardSpace } }
48
48
showsVerticalScrollIndicator = { true }
49
49
scrollEventThrottle = { 0 }
50
50
{ ...this . props }
You can’t perform that action at this time.
0 commit comments