The Great File Renaming in RCTText

Summary:
The previous file/class name convention seemed cool... but now it drives me BANANAS! It makes all this code really hard to maintain.
So, evething were renamed following common modern RN convention.

Reviewed By: mmmulani

Differential Revision: D6605090

fbshipit-source-id: 88ca13d793a5d2adaac2b7922ec6bd4654aacec5

Author: shergin

Libraries/Components/ScrollResponder.js

@@ -126,8 +126,8 @@ function isTagInstanceOfTextInput(tag) {
   var instance = getInstanceFromNode(tag);
   return instance && instance.viewConfig && (
     instance.viewConfig.uiViewClassName === 'AndroidTextInput' ||
-    instance.viewConfig.uiViewClassName === 'RCTTextView' ||
-    instance.viewConfig.uiViewClassName === 'RCTTextField'
+    instance.viewConfig.uiViewClassName === 'RCTMultilineTextInputView' ||
+    instance.viewConfig.uiViewClassName === 'RCTSinglelineTextInputView'
   );
 }
 

Libraries/Components/TextInput/TextInput.js

@@ -50,8 +50,8 @@ const onlyMultiline = {
 if (Platform.OS === 'android') {
   var AndroidTextInput = requireNativeComponent('AndroidTextInput', null);
 } else if (Platform.OS === 'ios') {
-  var RCTTextView = requireNativeComponent('RCTTextView', null);
-  var RCTTextField = requireNativeComponent('RCTTextField', null);
+  var RCTMultilineTextInputView = requireNativeComponent('RCTMultilineTextInputView', null);
+  var RCTSinglelineTextInputView = requireNativeComponent('RCTSinglelineTextInputView', null);
 }
 
 type Event = Object;
@@ -707,7 +707,7 @@ const TextInput = createReactClass({
         }
       }
       textContainer =
-        <RCTTextField
+        <RCTSinglelineTextInputView
           ref={this._setNativeRef}
           {...props}
           onFocus={this._onFocus}
@@ -733,7 +733,7 @@ const TextInput = createReactClass({
       }
       props.style.unshift(styles.multilineInput);
       textContainer =
-        <RCTTextView
+        <RCTMultilineTextInputView
           ref={this._setNativeRef}
           {...props}
           children={children}
@@ -926,8 +926,8 @@ const TextInput = createReactClass({
 
 var styles = StyleSheet.create({
   multilineInput: {
-    // This default top inset makes RCTTextView seem as close as possible
-    // to single-line RCTTextField defaults, using the system defaults
+    // This default top inset makes RCTMultilineTextInputView seem as close as possible
+    // to single-line RCTSinglelineTextInputView defaults, using the system defaults
     // of font size 17 and a height of 31 points.
     paddingTop: 5,
   },

Libraries/Text/RCTShadowRawText.h Libraries/Text/RCTRawTextShadowView.h

@@ -9,7 +9,7 @@
 
 #import <React/RCTShadowView.h>
 
-@interface RCTShadowRawText : RCTShadowView
+@interface RCTRawTextShadowView : RCTShadowView
 
 @property (nonatomic, copy) NSString *text;
 

Libraries/Text/RCTShadowRawText.m Libraries/Text/RCTRawTextShadowView.m

@@ -7,11 +7,11 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "RCTShadowRawText.h"
+#import "RCTRawTextShadowView.h"
 
 #import <React/RCTUIManager.h>
 
-@implementation RCTShadowRawText
+@implementation RCTRawTextShadowView
 
 - (instancetype)init
 {

Libraries/Text/RCTRawTextManager.h Libraries/Text/RCTRawTextViewManager.h

@@ -9,6 +9,6 @@
 
 #import <React/RCTViewManager.h>
 
-@interface RCTRawTextManager : RCTViewManager
+@interface RCTRawTextViewManager : RCTViewManager
 
 @end

Libraries/Text/RCTRawTextManager.m Libraries/Text/RCTRawTextViewManager.m

@@ -7,17 +7,17 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "RCTRawTextManager.h"
+#import "RCTRawTextViewManager.h"
 
-#import "RCTShadowRawText.h"
+#import "RCTRawTextShadowView.h"
 
-@implementation RCTRawTextManager
+@implementation RCTRawTextViewManager
 
-RCT_EXPORT_MODULE()
+RCT_EXPORT_MODULE(RCTRawText)
 
 - (RCTShadowView *)shadowView
 {
-  return [RCTShadowRawText new];
+  return [RCTRawTextShadowView new];
 }
 
 RCT_EXPORT_SHADOW_PROPERTY(text, NSString)

Libraries/Text/RCTText.xcodeproj/project.pbxproj

@@ -21,7 +21,7 @@ typedef NS_ENUM(NSInteger, RCTSizeComparison)
 extern NSString *const RCTIsHighlightedAttributeName;
 extern NSString *const RCTReactTagAttributeName;
 
-@interface RCTShadowText : RCTShadowView
+@interface RCTTextShadowView : RCTShadowView
 
 @property (nonatomic, strong) UIColor *color;
 @property (nonatomic, strong) UIColor *backgroundColor;

Libraries/Text/RCTShadowText.h Libraries/Text/Text/RCTTextShadowView.h

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "RCTShadowText.h"
+#import "RCTTextShadowView.h"
 
 #import <React/RCTAccessibilityManager.h>
 #import <React/RCTBridge.h>
@@ -18,9 +18,9 @@
 #import <React/RCTUIManager.h>
 #import <React/RCTUtils.h>
 
-#import "RCTShadowRawText.h"
-#import "RCTText.h"
+#import "RCTRawTextShadowView.h"
 #import "RCTTextView.h"
+#import "RCTMultilineTextInputView.h"
 
 NSString *const RCTIsHighlightedAttributeName = @"IsHighlightedAttributeName";
 NSString *const RCTReactTagAttributeName = @"ReactTagAttributeName";
@@ -31,7 +31,7 @@
 static CGFloat const kAutoSizeHeightErrorMargin = 0.025f;
 static CGFloat const kAutoSizeGranularity       = 0.001f;
 
-@implementation RCTShadowText
+@implementation RCTTextShadowView
 {
   NSTextStorage *_cachedTextStorage;
   CGFloat _cachedTextStorageWidth;
@@ -43,7 +43,7 @@ @implementation RCTShadowText
 
 static YGSize RCTMeasure(YGNodeRef node, float width, YGMeasureMode widthMode, float height, YGMeasureMode heightMode)
 {
-  RCTShadowText *shadowText = (__bridge RCTShadowText *)YGNodeGetContext(node);
+  RCTTextShadowView *shadowText = (__bridge RCTTextShadowView *)YGNodeGetContext(node);
   NSTextStorage *textStorage = [shadowText buildTextStorageForWidth:width widthMode:widthMode];
   [shadowText calculateTextFrame:textStorage];
   NSLayoutManager *layoutManager = textStorage.layoutManagers.firstObject;
@@ -109,7 +109,7 @@ - (void)contentSizeMultiplierDidChange:(NSNotification *)note
 - (NSDictionary<NSString *, id> *)processUpdatedProperties:(NSMutableSet<RCTApplierBlock> *)applierBlocks
                                           parentProperties:(NSDictionary<NSString *, id> *)parentProperties
 {
-  if ([[self reactSuperview] isKindOfClass:[RCTShadowText class]]) {
+  if ([[self reactSuperview] isKindOfClass:[RCTTextShadowView class]]) {
     return parentProperties;
   }
 
@@ -122,22 +122,22 @@ - (void)contentSizeMultiplierDidChange:(NSNotification *)note
   CGRect textFrame = [self calculateTextFrame:textStorage];
   BOOL selectable = _selectable;
   [applierBlocks addObject:^(NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    RCTText *view = (RCTText *)viewRegistry[self.reactTag];
+    RCTTextView *view = (RCTTextView *)viewRegistry[self.reactTag];
     view.textFrame = textFrame;
     view.textStorage = textStorage;
     view.selectable = selectable;
 
     /**
      * NOTE: this logic is included to support rich text editing inside multiline
      * `<TextInput>` controls. It is required in order to ensure that the
-     * textStorage (aka attributed string) is copied over from the RCTShadowText
-     * to the RCTText view in time to be used to update the editable text content.
-     * TODO: we should establish a delegate relationship betweeen RCTTextView
-     * and its contaned RCTText element when they get inserted and get rid of this
+     * textStorage (aka attributed string) is copied over from the RCTTextShadowView
+     * to the RCTTextView view in time to be used to update the editable text content.
+     * TODO: we should establish a delegate relationship betweeen RCTMultilineTextInputView
+     * and its contaned RCTTextView element when they get inserted and get rid of this
      */
     UIView *parentView = viewRegistry[parentTag];
     if ([parentView respondsToSelector:@selector(performTextUpdate)]) {
-      [(RCTTextView *)parentView performTextUpdate];
+      [(RCTMultilineTextInputView *)parentView performTextUpdate];
     }
   }];
 
@@ -308,8 +308,8 @@ - (NSAttributedString *)_attributedStringWithFontFamily:(NSString *)fontFamily
   CGFloat heightOfTallestSubview = 0.0;
   NSMutableAttributedString *attributedString = [NSMutableAttributedString new];
   for (RCTShadowView *child in [self reactSubviews]) {
-    if ([child isKindOfClass:[RCTShadowText class]]) {
-      RCTShadowText *shadowText = (RCTShadowText *)child;
+    if ([child isKindOfClass:[RCTTextShadowView class]]) {
+      RCTTextShadowView *shadowText = (RCTTextShadowView *)child;
       [attributedString appendAttributedString:
        [shadowText _attributedStringWithFontFamily:fontFamily
                                           fontSize:fontSize
@@ -321,8 +321,8 @@ - (NSAttributedString *)_attributedStringWithFontFamily:(NSString *)fontFamily
                                    backgroundColor:shadowText.backgroundColor ?: backgroundColor
                                            opacity:opacity * shadowText.opacity]];
       [child setTextComputed];
-    } else if ([child isKindOfClass:[RCTShadowRawText class]]) {
-      RCTShadowRawText *shadowRawText = (RCTShadowRawText *)child;
+    } else if ([child isKindOfClass:[RCTRawTextShadowView class]]) {
+      RCTRawTextShadowView *shadowRawText = (RCTRawTextShadowView *)child;
       [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:shadowRawText.text ?: @""]];
       [child setTextComputed];
     } else {
@@ -340,7 +340,7 @@ - (NSAttributedString *)_attributedStringWithFontFamily:(NSString *)fontFamily
       if (height > heightOfTallestSubview) {
         heightOfTallestSubview = height;
       }
-      // Don't call setTextComputed on this child. RCTTextManager takes care of
+      // Don't call setTextComputed on this child. RCTTextViewManager takes care of
       // processing inline UIViews.
     }
   }
@@ -653,8 +653,8 @@ - (void)setAllowFontScaling:(BOOL)allowFontScaling
 {
   _allowFontScaling = allowFontScaling;
   for (RCTShadowView *child in [self reactSubviews]) {
-    if ([child isKindOfClass:[RCTShadowText class]]) {
-      ((RCTShadowText *)child).allowFontScaling = allowFontScaling;
+    if ([child isKindOfClass:[RCTTextShadowView class]]) {
+      ((RCTTextShadowView *)child).allowFontScaling = allowFontScaling;
     }
   }
   [self dirtyText];
@@ -668,8 +668,8 @@ - (void)setFontSizeMultiplier:(CGFloat)fontSizeMultiplier
     _fontSizeMultiplier = 1.0;
   }
   for (RCTShadowView *child in [self reactSubviews]) {
-    if ([child isKindOfClass:[RCTShadowText class]]) {
-      ((RCTShadowText *)child).fontSizeMultiplier = fontSizeMultiplier;
+    if ([child isKindOfClass:[RCTTextShadowView class]]) {
+      ((RCTTextShadowView *)child).fontSizeMultiplier = fontSizeMultiplier;
     }
   }
   [self dirtyText];

Libraries/Text/RCTShadowText.m Libraries/Text/Text/RCTTextShadowView.m

@@ -9,7 +9,7 @@
 
 #import <UIKit/UIKit.h>
 
-@interface RCTText : UIView
+@interface RCTTextView : UIView
 
 @property (nonatomic, assign) UIEdgeInsets contentInset;
 @property (nonatomic, strong) NSTextStorage *textStorage;

Libraries/Text/RCTText.h Libraries/Text/Text/RCTTextView.h

@@ -7,27 +7,27 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "RCTText.h"
+#import "RCTTextView.h"
 
 #import <MobileCoreServices/UTCoreTypes.h>
 
 #import <React/RCTUtils.h>
 #import <React/UIView+React.h>
 
-#import "RCTShadowText.h"
+#import "RCTTextShadowView.h"
 
-static void collectNonTextDescendants(RCTText *view, NSMutableArray *nonTextDescendants)
+static void collectNonTextDescendants(RCTTextView *view, NSMutableArray *nonTextDescendants)
 {
   for (UIView *child in view.reactSubviews) {
-    if ([child isKindOfClass:[RCTText class]]) {
-      collectNonTextDescendants((RCTText *)child, nonTextDescendants);
+    if ([child isKindOfClass:[RCTTextView class]]) {
+      collectNonTextDescendants((RCTTextView *)child, nonTextDescendants);
     } else if (!CGRectEqualToRect(child.frame, CGRectZero)) {
       [nonTextDescendants addObject:child];
     }
   }
 }
 
-@implementation RCTText
+@implementation RCTTextView
 {
   NSTextStorage *_textStorage;
   CAShapeLayer *_highlightLayer;

Libraries/Text/RCTText.m Libraries/Text/Text/RCTTextView.m

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "RCTTextManager.h"
+#import "RCTTextViewManager.h"
 
 #import <React/RCTAccessibilityManager.h>
 #import <React/RCTAssert.h>
@@ -17,42 +17,42 @@
 #import <React/UIView+React.h>
 #import <yoga/Yoga.h>
 
-#import "RCTShadowRawText.h"
-#import "RCTShadowText.h"
-#import "RCTText.h"
+#import "RCTRawTextShadowView.h"
+#import "RCTTextShadowView.h"
 #import "RCTTextView.h"
+#import "RCTMultilineTextInputView.h"
 
-static void collectDirtyNonTextDescendants(RCTShadowText *shadowView, NSMutableArray *nonTextDescendants) {
+static void collectDirtyNonTextDescendants(RCTTextShadowView *shadowView, NSMutableArray *nonTextDescendants) {
   for (RCTShadowView *child in shadowView.reactSubviews) {
-    if ([child isKindOfClass:[RCTShadowText class]]) {
-      collectDirtyNonTextDescendants((RCTShadowText *)child, nonTextDescendants);
-    } else if ([child isKindOfClass:[RCTShadowRawText class]]) {
+    if ([child isKindOfClass:[RCTTextShadowView class]]) {
+      collectDirtyNonTextDescendants((RCTTextShadowView *)child, nonTextDescendants);
+    } else if ([child isKindOfClass:[RCTRawTextShadowView class]]) {
       // no-op
     } else if ([child isTextDirty]) {
       [nonTextDescendants addObject:child];
     }
   }
 }
 
-@interface RCTShadowText (Private)
+@interface RCTTextShadowView (Private)
 
 - (NSTextStorage *)buildTextStorageForWidth:(CGFloat)width widthMode:(YGMeasureMode)widthMode;
 
 @end
 
 
-@implementation RCTTextManager
+@implementation RCTTextViewManager
 
-RCT_EXPORT_MODULE()
+RCT_EXPORT_MODULE(RCTText)
 
 - (UIView *)view
 {
-  return [RCTText new];
+  return [RCTTextView new];
 }
 
 - (RCTShadowView *)shadowView
 {
-  return [RCTShadowText new];
+  return [RCTTextShadowView new];
 }
 
 #pragma mark - Shadow properties
@@ -101,13 +101,13 @@ - (RCTViewManagerUIBlock)uiBlockToAmendWithShadowViewRegistry:(NSDictionary<NSNu
       RCTShadowView *shadowView = queue[i];
       RCTAssert([shadowView isTextDirty], @"Don't process any nodes that don't have dirty text");
 
-      if ([shadowView isKindOfClass:[RCTShadowText class]]) {
-        ((RCTShadowText *)shadowView).fontSizeMultiplier = self.bridge.accessibilityManager.multiplier;
-        [(RCTShadowText *)shadowView recomputeText];
-        collectDirtyNonTextDescendants((RCTShadowText *)shadowView, queue);
-      } else if ([shadowView isKindOfClass:[RCTShadowRawText class]]) {
+      if ([shadowView isKindOfClass:[RCTTextShadowView class]]) {
+        ((RCTTextShadowView *)shadowView).fontSizeMultiplier = self.bridge.accessibilityManager.multiplier;
+        [(RCTTextShadowView *)shadowView recomputeText];
+        collectDirtyNonTextDescendants((RCTTextShadowView *)shadowView, queue);
+      } else if ([shadowView isKindOfClass:[RCTRawTextShadowView class]]) {
         RCTLogError(@"Raw text cannot be used outside of a <Text> tag. Not rendering string: '%@'",
-                    [(RCTShadowRawText *)shadowView text]);
+                    [(RCTRawTextShadowView *)shadowView text]);
       } else {
         for (RCTShadowView *child in [shadowView reactSubviews]) {
           if ([child isTextDirty]) {
@@ -123,13 +123,13 @@ - (RCTViewManagerUIBlock)uiBlockToAmendWithShadowViewRegistry:(NSDictionary<NSNu
   return nil;
 }
 
-- (RCTViewManagerUIBlock)uiBlockToAmendWithShadowView:(RCTShadowText *)shadowView
+- (RCTViewManagerUIBlock)uiBlockToAmendWithShadowView:(RCTTextShadowView *)shadowView
 {
   NSNumber *reactTag = shadowView.reactTag;
   UIEdgeInsets padding = shadowView.paddingAsInsets;
 
-  return ^(RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTText *> *viewRegistry) {
-    RCTText *text = viewRegistry[reactTag];
+  return ^(RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTTextView *> *viewRegistry) {
+    RCTTextView *text = viewRegistry[reactTag];
     text.contentInset = padding;
   };
 }

Libraries/Text/RCTTextViewManager.h Libraries/Text/Text/RCTTextViewManager.h

@@ -9,6 +9,6 @@
 
 #import <React/RCTShadowView.h>
 
-@interface RCTShadowTextView : RCTShadowView
+@interface RCTMultilineTextInputShadowView : RCTShadowView
 
 @end

Libraries/Text/RCTTextManager.m Libraries/Text/Text/RCTTextViewManager.m

@@ -7,9 +7,9 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "RCTShadowTextView.h"
+#import "RCTMultilineTextInputShadowView.h"
 
-@implementation RCTShadowTextView
+@implementation RCTMultilineTextInputShadowView
 
 - (BOOL)isYogaLeafNode
 {

Libraries/Text/RCTShadowTextView.h Libraries/Text/TextInput/Multiline/RCTMultilineTextInputShadowView.h

@@ -12,11 +12,11 @@
 #import <React/RCTView.h>
 #import <React/UIView+React.h>
 
-#import "RCTTextInput.h"
+#import "RCTBaseTextInputView.h"
 
 @class RCTBridge;
 
-@interface RCTTextView : RCTTextInput
+@interface RCTMultilineTextInputView : RCTBaseTextInputView
 
 @property (nonatomic, assign) UITextAutocorrectionType autocorrectionType;
 @property (nonatomic, assign) UITextSpellCheckingType spellCheckingType;

Libraries/Text/RCTShadowTextView.m Libraries/Text/TextInput/Multiline/RCTMultilineTextInputShadowView.m

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "RCTTextView.h"
+#import "RCTMultilineTextInputView.h"
 
 #import <React/RCTConvert.h>
 #import <React/RCTEventDispatcher.h>
@@ -16,19 +16,19 @@
 #import <React/RCTUtils.h>
 #import <React/UIView+React.h>
 
-#import "RCTShadowText.h"
-#import "RCTText.h"
+#import "RCTTextShadowView.h"
+#import "RCTTextView.h"
 #import "RCTTextSelection.h"
 #import "RCTUITextView.h"
 
-@interface RCTTextView () <RCTBackedTextInputDelegate>
+@interface RCTMultilineTextInputView () <RCTBackedTextInputDelegate>
 
 @end
 
-@implementation RCTTextView
+@implementation RCTMultilineTextInputView
 {
   RCTUITextView *_backedTextInput;
-  RCTText *_richTextView;
+  RCTTextView *_richTextView;
   NSAttributedString *_pendingAttributedText;
 
   NSString *_predictedText;
@@ -77,11 +77,11 @@ - (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)index
 {
   [super insertReactSubview:subview atIndex:index];
 
-  if ([subview isKindOfClass:[RCTText class]]) {
+  if ([subview isKindOfClass:[RCTTextView class]]) {
     if (_richTextView) {
       RCTLogError(@"Tried to insert a second <Text> into <TextInput> - there can only be one.");
     }
-    _richTextView = (RCTText *)subview;
+    _richTextView = (RCTTextView *)subview;
 
     // If this <TextInput> is in rich text editing mode, and the child <Text> node providing rich text
     // styling has a backgroundColor, then the attributedText produced by the child <Text> node will have an

Libraries/Text/RCTTextView.h Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.h

@@ -9,6 +9,6 @@
 
 #import <React/RCTViewManager.h>
 
-@interface RCTTextFieldManager : RCTViewManager
+@interface RCTMultilineTextInputViewManager : RCTViewManager
 
 @end

Libraries/Text/RCTTextView.m Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "RCTTextViewManager.h"
+#import "RCTMultilineTextInputViewManager.h"
 
 #import <React/RCTBridge.h>
 #import <React/RCTConvert.h>
@@ -16,21 +16,21 @@
 #import <React/RCTShadowView.h>
 
 #import "RCTConvert+Text.h"
-#import "RCTShadowTextView.h"
-#import "RCTTextView.h"
+#import "RCTMultilineTextInputShadowView.h"
+#import "RCTMultilineTextInputView.h"
 
-@implementation RCTTextViewManager
+@implementation RCTMultilineTextInputViewManager
 
 RCT_EXPORT_MODULE()
 
 - (RCTShadowView *)shadowView
 {
-  return [RCTShadowTextView new];
+  return [RCTMultilineTextInputShadowView new];
 }
 
 - (UIView *)view
 {
-  return [[RCTTextView alloc] initWithBridge:self.bridge];
+  return [[RCTMultilineTextInputView alloc] initWithBridge:self.bridge];
 }
 
 #pragma mark - Unified <TextInput> properties
@@ -80,8 +80,8 @@ - (RCTViewManagerUIBlock)uiBlockToAmendWithShadowView:(RCTShadowView *)shadowVie
   NSNumber *reactTag = shadowView.reactTag;
   UIEdgeInsets borderAsInsets = shadowView.borderAsInsets;
   UIEdgeInsets paddingAsInsets = shadowView.paddingAsInsets;
-  return ^(RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTTextInput *> *viewRegistry) {
-    RCTTextInput *view = viewRegistry[reactTag];
+  return ^(RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTBaseTextInputView *> *viewRegistry) {
+    RCTBaseTextInputView *view = viewRegistry[reactTag];
     view.reactBorderInsets = borderAsInsets;
     view.reactPaddingInsets = paddingAsInsets;
   };

Libraries/Text/RCTTextFieldManager.h Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.h

@@ -19,7 +19,7 @@
 @class RCTEventDispatcher;
 @class RCTTextSelection;
 
-@interface RCTTextInput : RCTView <RCTFontAttributesDelegate> {
+@interface RCTBaseTextInputView : RCTView <RCTFontAttributesDelegate> {
 @protected
   __weak RCTBridge *_bridge;
   RCTEventDispatcher *_eventDispatcher;

Libraries/Text/RCTTextViewManager.m Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "RCTTextInput.h"
+#import "RCTBaseTextInputView.h"
 
 #import <React/RCTAccessibilityManager.h>
 #import <React/RCTBridge.h>
@@ -19,7 +19,7 @@
 
 #import "RCTTextSelection.h"
 
-@implementation RCTTextInput {
+@implementation RCTBaseTextInputView {
   CGSize _previousContentSize;
   BOOL _hasInputAccesoryView;
 }
@@ -44,7 +44,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
 
 - (id<RCTBackedTextInputViewProtocol>)backedTextInputView
 {
-  RCTAssert(NO, @"-[RCTTextInput backedTextInputView] must be implemented in subclass.");
+  RCTAssert(NO, @"-[RCTBaseTextInputView backedTextInputView] must be implemented in subclass.");
   return nil;
 }
 

Libraries/Text/RCTUITextView.h Libraries/Text/TextInput/Multiline/RCTUITextView.h

@@ -9,6 +9,6 @@
 
 #import <React/RCTShadowView.h>
 
-@interface RCTShadowTextField : RCTShadowView
+@interface RCTSinglelineTextInputShadowView : RCTShadowView
 
 @end

Libraries/Text/RCTUITextView.m Libraries/Text/TextInput/Multiline/RCTUITextView.m

@@ -7,9 +7,9 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "RCTShadowTextField.h"
+#import "RCTSinglelineTextInputShadowView.h"
 
-@implementation RCTShadowTextField
+@implementation RCTSinglelineTextInputShadowView
 
 - (BOOL)isYogaLeafNode
 {

Libraries/Text/RCTBackedTextInputDelegate.h Libraries/Text/TextInput/RCTBackedTextInputDelegate.h

@@ -12,11 +12,11 @@
 #import <React/RCTComponent.h>
 #import <React/RCTView.h>
 
-#import "RCTTextInput.h"
+#import "RCTBaseTextInputView.h"
 
 @class RCTUITextField;
 
-@interface RCTTextField : RCTTextInput
+@interface RCTSinglelineTextInputView : RCTBaseTextInputView
 
 @property (nonatomic, assign) BOOL caretHidden;
 @property (nonatomic, strong) NSNumber *maxLength;

Libraries/Text/RCTBackedTextInputDelegateAdapter.h Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "RCTTextField.h"
+#import "RCTSinglelineTextInputView.h"
 
 #import <React/RCTBridge.h>
 #import <React/RCTConvert.h>
@@ -21,11 +21,11 @@
 #import "RCTTextSelection.h"
 #import "RCTUITextField.h"
 
-@interface RCTTextField () <RCTBackedTextInputDelegate>
+@interface RCTSinglelineTextInputView () <RCTBackedTextInputDelegate>
 
 @end
 
-@implementation RCTTextField
+@implementation RCTSinglelineTextInputView
 {
   RCTUITextField *_backedTextInput;
   BOOL _submitted;

Libraries/Text/RCTBackedTextInputDelegateAdapter.m Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m

@@ -9,6 +9,6 @@
 
 #import <React/RCTViewManager.h>
 
-@interface RCTTextManager : RCTViewManager
+@interface RCTSinglelineTextInputViewManager : RCTViewManager
 
 @end

Libraries/Text/RCTBackedTextInputViewProtocol.h Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h

@@ -7,30 +7,30 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "RCTTextFieldManager.h"
+#import "RCTSinglelineTextInputViewManager.h"
 
 #import <React/RCTBridge.h>
 #import <React/RCTFont.h>
 #import <React/RCTShadowView+Layout.h>
 #import <React/RCTShadowView.h>
 
 #import "RCTConvert+Text.h"
-#import "RCTShadowTextField.h"
-#import "RCTTextField.h"
+#import "RCTSinglelineTextInputShadowView.h"
+#import "RCTSinglelineTextInputView.h"
 #import "RCTUITextField.h"
 
-@implementation RCTTextFieldManager
+@implementation RCTSinglelineTextInputViewManager
 
 RCT_EXPORT_MODULE()
 
 - (RCTShadowView *)shadowView
 {
-  return [RCTShadowTextField new];
+  return [RCTSinglelineTextInputShadowView new];
 }
 
 - (UIView *)view
 {
-  return [[RCTTextField alloc] initWithBridge:self.bridge];
+  return [[RCTSinglelineTextInputView alloc] initWithBridge:self.bridge];
 }
 
 #pragma mark - Unified <TextInput> properties
@@ -74,8 +74,8 @@ - (RCTViewManagerUIBlock)uiBlockToAmendWithShadowView:(RCTShadowView *)shadowVie
   NSNumber *reactTag = shadowView.reactTag;
   UIEdgeInsets borderAsInsets = shadowView.borderAsInsets;
   UIEdgeInsets paddingAsInsets = shadowView.paddingAsInsets;
-  return ^(RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTTextInput *> *viewRegistry) {
-    RCTTextInput *view = viewRegistry[reactTag];
+  return ^(RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTBaseTextInputView *> *viewRegistry) {
+    RCTBaseTextInputView *view = viewRegistry[reactTag];
     view.reactBorderInsets = borderAsInsets;
     view.reactPaddingInsets = paddingAsInsets;
   };

Libraries/Text/RCTTextInput.h Libraries/Text/TextInput/RCTBaseTextInputView.h

@@ -1082,6 +1082,14 @@
 		59D031FA1F8353D3008361F0 /* RCTSafeAreaViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 59D031EB1F8353D3008361F0 /* RCTSafeAreaViewManager.h */; };
 		59D031FB1F8353D3008361F0 /* RCTSafeAreaViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 59D031EC1F8353D3008361F0 /* RCTSafeAreaViewManager.m */; };
 		59D031FC1F8353D3008361F0 /* RCTSafeAreaViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 59D031EC1F8353D3008361F0 /* RCTSafeAreaViewManager.m */; };
+		59E604A01FE9CCE300BD90C5 /* RCTScrollContentShadowView.h in Headers */ = {isa = PBXBuildFile; fileRef = 59E6049C1FE9CCE100BD90C5 /* RCTScrollContentShadowView.h */; };
+		59E604A11FE9CCE300BD90C5 /* RCTScrollContentShadowView.h in Headers */ = {isa = PBXBuildFile; fileRef = 59E6049C1FE9CCE100BD90C5 /* RCTScrollContentShadowView.h */; };
+		59E604A21FE9CCE300BD90C5 /* RCTScrollContentViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6049D1FE9CCE200BD90C5 /* RCTScrollContentViewManager.m */; };
+		59E604A31FE9CCE300BD90C5 /* RCTScrollContentViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6049D1FE9CCE200BD90C5 /* RCTScrollContentViewManager.m */; };
+		59E604A41FE9CCE300BD90C5 /* RCTScrollContentShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6049E1FE9CCE200BD90C5 /* RCTScrollContentShadowView.m */; };
+		59E604A51FE9CCE300BD90C5 /* RCTScrollContentShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6049E1FE9CCE200BD90C5 /* RCTScrollContentShadowView.m */; };
+		59E604A61FE9CCE300BD90C5 /* RCTScrollContentViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 59E6049F1FE9CCE200BD90C5 /* RCTScrollContentViewManager.h */; };
+		59E604A71FE9CCE300BD90C5 /* RCTScrollContentViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 59E6049F1FE9CCE200BD90C5 /* RCTScrollContentViewManager.h */; };
 		59EB6DBB1EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB6DB91EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.h */; };
 		59EB6DBC1EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB6DB91EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.h */; };
 		59EB6DBD1EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 59EB6DBA1EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.mm */; };
@@ -2192,6 +2200,10 @@
 		59D031EA1F8353D3008361F0 /* RCTSafeAreaViewLocalData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTSafeAreaViewLocalData.m; sourceTree = "<group>"; };
 		59D031EB1F8353D3008361F0 /* RCTSafeAreaViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTSafeAreaViewManager.h; sourceTree = "<group>"; };
 		59D031EC1F8353D3008361F0 /* RCTSafeAreaViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTSafeAreaViewManager.m; sourceTree = "<group>"; };
+		59E6049C1FE9CCE100BD90C5 /* RCTScrollContentShadowView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTScrollContentShadowView.h; sourceTree = "<group>"; };
+		59E6049D1FE9CCE200BD90C5 /* RCTScrollContentViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTScrollContentViewManager.m; sourceTree = "<group>"; };
+		59E6049E1FE9CCE200BD90C5 /* RCTScrollContentShadowView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTScrollContentShadowView.m; sourceTree = "<group>"; };
+		59E6049F1FE9CCE200BD90C5 /* RCTScrollContentViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTScrollContentViewManager.h; sourceTree = "<group>"; };
 		59EB6DB91EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTUIManagerObserverCoordinator.h; sourceTree = "<group>"; };
 		59EB6DBA1EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTUIManagerObserverCoordinator.mm; sourceTree = "<group>"; };
 		59EDBC9C1FDF4E0C003573DE /* RCTScrollableProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTScrollableProtocol.h; sourceTree = "<group>"; };
@@ -2805,8 +2817,12 @@
 			isa = PBXGroup;
 			children = (
 				59EDBC9C1FDF4E0C003573DE /* RCTScrollableProtocol.h */,
+				59E6049C1FE9CCE100BD90C5 /* RCTScrollContentShadowView.h */,
+				59E6049E1FE9CCE200BD90C5 /* RCTScrollContentShadowView.m */,
 				59EDBC9F1FDF4E0C003573DE /* RCTScrollContentView.h */,
 				59EDBCA01FDF4E0C003573DE /* RCTScrollContentView.m */,
+				59E6049F1FE9CCE200BD90C5 /* RCTScrollContentViewManager.h */,
+				59E6049D1FE9CCE200BD90C5 /* RCTScrollContentViewManager.m */,
 				59EDBCA31FDF4E0C003573DE /* RCTScrollView.h */,
 				59EDBCA41FDF4E0C003573DE /* RCTScrollView.m */,
 				59EDBCA51FDF4E0C003573DE /* RCTScrollViewManager.h */,
@@ -3210,6 +3226,7 @@
 				66CD94B21F1045E700CB3C7C /* RCTMaskedView.h in Headers */,
 				3D302F8D1DF828F800D6DDAE /* RCTSegmentedControlManager.h in Headers */,
 				3D302F8E1DF828F800D6DDAE /* RCTShadowView.h in Headers */,
+				59E604A11FE9CCE300BD90C5 /* RCTScrollContentShadowView.h in Headers */,
 				3D302F8F1DF828F800D6DDAE /* RCTSlider.h in Headers */,
 				3D302F901DF828F800D6DDAE /* RCTSliderManager.h in Headers */,
 				3D302F911DF828F800D6DDAE /* RCTSwitch.h in Headers */,
@@ -3219,6 +3236,7 @@
 				3D302F951DF828F800D6DDAE /* RCTTabBarItemManager.h in Headers */,
 				59EDBCAE1FDF4E0C003573DE /* RCTScrollContentView.h in Headers */,
 				3D302F961DF828F800D6DDAE /* RCTTabBarManager.h in Headers */,
+				59E604A71FE9CCE300BD90C5 /* RCTScrollContentViewManager.h in Headers */,
 				3D302F971DF828F800D6DDAE /* RCTTextDecorationLineType.h in Headers */,
 				3D302F981DF828F800D6DDAE /* RCTView.h in Headers */,
 				3D302F991DF828F800D6DDAE /* RCTViewControllerProtocol.h in Headers */,
@@ -3445,6 +3463,7 @@
 				3D80DA3F1DF820620028D040 /* RCTRootViewInternal.h in Headers */,
 				3D80DA401DF820620028D040 /* RCTTouchEvent.h in Headers */,
 				3D80DA411DF820620028D040 /* RCTTouchHandler.h in Headers */,
+				59E604A61FE9CCE300BD90C5 /* RCTScrollContentViewManager.h in Headers */,
 				13134C8C1E296B2A00B9F3CB /* RCTMessageThread.h in Headers */,
 				59EB6DBB1EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.h in Headers */,
 				3D80DA421DF820620028D040 /* RCTURLRequestDelegate.h in Headers */,
@@ -3475,6 +3494,7 @@
 				3D80DA5A1DF820620028D040 /* RCTUIManager.h in Headers */,
 				3D80DA5B1DF820620028D040 /* RCTFPSGraph.h in Headers */,
 				FEFAAC9F1FDB89B50057BBE0 /* RCTRedBoxExtraDataViewController.h in Headers */,
+				59E604A01FE9CCE300BD90C5 /* RCTScrollContentShadowView.h in Headers */,
 				3D80DA5D1DF820620028D040 /* RCTMacros.h in Headers */,
 				3D80DA5E1DF820620028D040 /* RCTProfile.h in Headers */,
 				3D80DA5F1DF820620028D040 /* RCTActivityIndicatorView.h in Headers */,
@@ -4108,6 +4128,7 @@
 				2D3B5EE31D9B09B700451313 /* RCTSegmentedControl.m in Sources */,
 				130443A41E3FEAC600D93A67 /* RCTFollyConvert.mm in Sources */,
 				3D7BFD201EA8E351008DFB7A /* RCTPackagerConnection.mm in Sources */,
+				59E604A51FE9CCE300BD90C5 /* RCTScrollContentShadowView.m in Sources */,
 				5960C1B81F0804A00066FD5B /* RCTLayoutAnimation.m in Sources */,
 				2D3B5EB71D9B091800451313 /* RCTRedBox.m in Sources */,
 				3D7AA9C61E548CDD001955CF /* NSDataBigString.mm in Sources */,
@@ -4142,6 +4163,7 @@
 				EBF21C001FC499A80052F4D5 /* InspectorInterfaces.cpp in Sources */,
 				597633371F4E021D005BE8A4 /* RCTShadowView+Internal.m in Sources */,
 				2D3B5EB11D9B090100451313 /* RCTAppState.m in Sources */,
+				59E604A31FE9CCE300BD90C5 /* RCTScrollContentViewManager.m in Sources */,
 				1384E20B1E806D5B00545659 /* RCTNativeModule.mm in Sources */,
 				2D3B5EC21D9B093B00451313 /* RCTProfile.m in Sources */,
 				2D3B5ECB1D9B096200451313 /* RCTConvert+CoreLocation.m in Sources */,
@@ -4374,6 +4396,7 @@
 				C60128AD1F3D1258009DF9FF /* RCTCxxConvert.m in Sources */,
 				83CBBA511A601E3B00E9B192 /* RCTAssert.m in Sources */,
 				59EB6DBD1EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.mm in Sources */,
+				59E604A21FE9CCE300BD90C5 /* RCTScrollContentViewManager.m in Sources */,
 				13AF20451AE707F9005F5298 /* RCTSlider.m in Sources */,
 				130443A21E3FEAA900D93A67 /* RCTFollyConvert.mm in Sources */,
 				58114A501AAE93D500E7D092 /* RCTAsyncLocalStorage.m in Sources */,
@@ -4402,6 +4425,7 @@
 				14F7A0EC1BDA3B3C003C6C10 /* RCTPerfMonitor.m in Sources */,
 				5960C1B71F0804A00066FD5B /* RCTLayoutAnimation.m in Sources */,
 				13134C9E1E296B2A00B9F3CB /* RCTCxxModule.mm in Sources */,
+				59E604A41FE9CCE300BD90C5 /* RCTScrollContentShadowView.m in Sources */,
 				1450FF881BCFF28A00208362 /* RCTProfileTrampoline-arm64.S in Sources */,
 				13E41EEB1C05CA0B00CD8DAC /* RCTProfileTrampoline-i386.S in Sources */,
 				3D37B5821D522B190042D5B5 /* RCTFont.mm in Sources */,

Libraries/Text/RCTTextInput.m Libraries/Text/TextInput/RCTBaseTextInputView.m

@@ -246,7 +246,7 @@ typedef void (^RCTApplierBlock)(NSDictionary<NSNumber *, UIView *> *viewRegistry
 
 /**
  * Returns whether or not this node acts as a leaf node in the eyes of Yoga.
- * For example `RCTShadowText` has children which it does not want Yoga
+ * For example `RCTTextShadowView` has children which it does not want Yoga
  * to lay out so in the eyes of Yoga it is a leaf node.
  * Defaults to `NO`. Can be overridden in subclasses.
  * Don't confuse this with `canHaveSubviews`.

Libraries/Text/RCTTextSelection.h Libraries/Text/TextInput/RCTTextSelection.h

@@ -298,7 +298,7 @@ - (void)collectUpdatedFrames:(NSMutableSet<RCTShadowView *> *)viewsWithNewFrame
                       hidden:(BOOL)hidden
             absolutePosition:(CGPoint)absolutePosition
 {
-  // This is not the core layout method. It is only used by RCTShadowText to layout
+  // This is not the core layout method. It is only used by RCTTextShadowView to layout
   // nested views.
 
   if (_hidden != hidden) {