Improve native text field keyboard offsetting

Author: adamaveray

packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.m

@@ -20,8 +20,8 @@
 #import <React/RCTTextAttributes.h>
 #import <React/RCTTextSelection.h>
 
-/** Native iOS empty text field bottom keyboard offset amount */
-static const CGFloat kEmptyKeyboardBottomOffset = 15.0;
+/** Native iOS text field bottom keyboard offset amount */
+static const CGFloat kSingleLineKeyboardBottomOffset = 15.0;
 
 @implementation RCTBaseTextInputView {
   __weak RCTBridge *_bridge;
@@ -45,11 +45,12 @@ - (void)reactUpdateResponderOffsetForScrollView:(RCTScrollView *)scrollView
     scrollView.firstResponderFocus = [self convertRect:self.bounds toView:nil];
   } else {
     // Focus on text selection frame
+    BOOL isMultiline = [self.backedTextInputView isKindOfClass:[UITextView class]];
     CGRect focusRect = CGRectMake(
       selection.rect.origin.x,
       selection.rect.origin.y,
       selection.rect.size.width,
-      selection.rect.size.height + (selectedTextRange.empty ? kEmptyKeyboardBottomOffset : 0)
+      selection.rect.size.height + (isMultiline ? 0 : kSingleLineKeyboardBottomOffset)
     );
     scrollView.firstResponderFocus = [self convertRect:focusRect toView:nil];
   }

packages/react-native/React/Views/ScrollView/RCTScrollView.m

@@ -331,7 +331,8 @@ - (void)_keyboardWillChangeFrame:(NSNotification *)notification
   if ([[UIApplication sharedApplication] sendAction:@selector(reactUpdateResponderOffsetForScrollView:) to:nil from:self forEvent:nil]) {
     // Inner text field focused
     CGFloat focusEnd = CGRectGetMaxY(self.firstResponderFocus);
-    if (focusEnd > endFrame.origin.y && focusEnd != INFINITY) {
+    BOOL didFocusExternalTextField = focusEnd == INFINITY;
+    if (!didFocusExternalTextField && focusEnd > endFrame.origin.y) {
       // Text field active region is below visible area with keyboard - update diff to bring into view
       contentDiff = endFrame.origin.y - focusEnd;
     }