Apply content inset to ScrollView regardless of enableAutomaticScroll property. (APSL#280)

Author: ljsnagy

lib/KeyboardAwareHOC.js

@@ -291,13 +291,13 @@ function listenToKeyboardEvents(ScrollableComponent: React$Component) {
 
  // Keyboard actions
  _updateKeyboardSpace = (frames: Object) => {
+ let keyboardSpace: number = frames.endCoordinates.height + this.props.extraScrollHeight
+ if (this.props.viewIsInsideTabBar) {
+ keyboardSpace -= _KAM_DEFAULT_TAB_BAR_HEIGHT
+ }
+ this.setState({ keyboardSpace })
  // Automatically scroll to focused TextInput
  if (this.props.enableAutomaticScroll) {
- let keyboardSpace: number = frames.endCoordinates.height + this.props.extraScrollHeight
- if (this.props.viewIsInsideTabBar) {
- keyboardSpace -= _KAM_DEFAULT_TAB_BAR_HEIGHT
- }
- this.setState({ keyboardSpace })
  const currentlyFocusedField = TextInput.State.currentlyFocusedField()
  const responder = this.getScrollResponder()
  if (!currentlyFocusedField || !responder) {