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({
3535 let newContentContainerStyle
3636
3737 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
4040 }
4141
4242 return (
4343 < ListView
4444 ref = '_rnkasv_keyboardView'
4545 keyboardDismissMode = 'interactive'
46- contentInset = { { bottom : this . state . keyboardSpace } }
46+ contentInset = { { bottom : keyboardSpace } }
4747 showsVerticalScrollIndicator = { true }
4848 scrollEventThrottle = { 0 }
4949 { ...this . props }
Original file line number Diff line number Diff line change @@ -36,15 +36,15 @@ const KeyboardAwareScrollView = createReactClass({
3636 let newContentContainerStyle
3737
3838 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
4141 }
4242
4343 return (
4444 < ScrollView
4545 ref = '_rnkasv_keyboardView'
4646 keyboardDismissMode = 'interactive'
47- contentInset = { { bottom : this . state . keyboardSpace } }
47+ contentInset = { { bottom : keyboardSpace } }
4848 showsVerticalScrollIndicator = { true }
4949 scrollEventThrottle = { 0 }
5050 { ...this . props }
You can’t perform that action at this time.
0 commit comments