react-native-tvos 0.69.8-2 → 0.71.7-0rc0

package/Libraries/Text/TextInput/RCTBaseTextInputView.m

@@ -39,9 +39,9 @@
   return self;
 }
 
-RCT_NOT_IMPLEMENTED(- (instancetype)init)
-RCT_NOT_IMPLEMENTED(- (instancetype)initWithCoder:(NSCoder *)decoder)
-RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
+RCT_NOT_IMPLEMENTED(-(instancetype)init)
+RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)decoder)
+RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
 
 - (UIView<RCTBackedTextInputViewProtocol> *)backedTextInputView
 {
@@ -68,9 +68,9 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
 {
   id<RCTBackedTextInputViewProtocol> backedTextInputView = self.backedTextInputView;
 
-  NSDictionary<NSAttributedStringKey,id> *textAttributes = [[_textAttributes effectiveTextAttributes] mutableCopy];
+  NSDictionary<NSAttributedStringKey, id> *textAttributes = [[_textAttributes effectiveTextAttributes] mutableCopy];
   if ([textAttributes valueForKey:NSForegroundColorAttributeName] == nil) {
-      [textAttributes setValue:[UIColor blackColor] forKey:NSForegroundColorAttributeName];
+    [textAttributes setValue:[UIColor blackColor] forKey:NSForegroundColorAttributeName];
   }
 
   backedTextInputView.defaultTextAttributes = textAttributes;
@@ -97,30 +97,33 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
   return self.backedTextInputView.attributedText;
 }
 
-- (BOOL)textOf:(NSAttributedString*)newText equals:(NSAttributedString*)oldText{
+- (BOOL)textOf:(NSAttributedString *)newText equals:(NSAttributedString *)oldText
+{
   // When the dictation is running we can't update the attributed text on the backed up text view
   // because setting the attributed string will kill the dictation. This means that we can't impose
   // the settings on a dictation.
   // Similarly, when the user is in the middle of inputting some text in Japanese/Chinese, there will be styling on the
-  // text that we should disregard. See https://developer.apple.com/documentation/uikit/uitextinput/1614489-markedtextrange?language=objc
-  // for more info.
+  // text that we should disregard. See
+  // https://developer.apple.com/documentation/uikit/uitextinput/1614489-markedtextrange?language=objc for more info.
   // Also, updating the attributed text while inputting Korean language will break input mechanism.
-  // If the user added an emoji, the system adds a font attribute for the emoji and stores the original font in NSOriginalFont.
-  // Lastly, when entering a password, etc., there will be additional styling on the field as the native text view
-  // handles showing the last character for a split second.
+  // If the user added an emoji, the system adds a font attribute for the emoji and stores the original font in
+  // NSOriginalFont. Lastly, when entering a password, etc., there will be additional styling on the field as the native
+  // text view handles showing the last character for a split second.
   __block BOOL fontHasBeenUpdatedBySystem = false;
-  [oldText enumerateAttribute:@"NSOriginalFont" inRange:NSMakeRange(0, oldText.length) options:0 usingBlock:^(id value, NSRange range, BOOL *stop) {
-    if (value){
-      fontHasBeenUpdatedBySystem = true;
-    }
-  }];
+  [oldText enumerateAttribute:@"NSOriginalFont"
+                      inRange:NSMakeRange(0, oldText.length)
+                      options:0
+                   usingBlock:^(id value, NSRange range, BOOL *stop) {
+                     if (value) {
+                       fontHasBeenUpdatedBySystem = true;
+                     }
+                   }];
 
   BOOL shouldFallbackToBareTextComparison =
-    [self.backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"dictation"] ||
-    [self.backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"ko-KR"] ||
-    self.backedTextInputView.markedTextRange ||
-    self.backedTextInputView.isSecureTextEntry ||
-    fontHasBeenUpdatedBySystem;
+      [self.backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"dictation"] ||
+      [self.backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"ko-KR"] ||
+      self.backedTextInputView.markedTextRange || self.backedTextInputView.isSecureTextEntry ||
+      fontHasBeenUpdatedBySystem;
 
 #if TARGET_OS_TV
   shouldFallbackToBareTextComparison = YES;
@@ -157,21 +160,23 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
 
     if (selection.empty) {
       // Maintaining a cursor position relative to the end of the old text.
-      NSInteger offsetStart =
-      [self.backedTextInputView offsetFromPosition:self.backedTextInputView.beginningOfDocument
-                                        toPosition:selection.start];
+      NSInteger offsetStart = [self.backedTextInputView offsetFromPosition:self.backedTextInputView.beginningOfDocument
+                                                                toPosition:selection.start];
       NSInteger offsetFromEnd = oldTextLength - offsetStart;
       NSInteger newOffset = attributedText.string.length - offsetFromEnd;
       UITextPosition *position =
-      [self.backedTextInputView positionFromPosition:self.backedTextInputView.beginningOfDocument
-                                              offset:newOffset];
-      [self.backedTextInputView setSelectedTextRange:[self.backedTextInputView textRangeFromPosition:position toPosition:position]
+          [self.backedTextInputView positionFromPosition:self.backedTextInputView.beginningOfDocument offset:newOffset];
+      [self.backedTextInputView setSelectedTextRange:[self.backedTextInputView textRangeFromPosition:position
+                                                                                          toPosition:position]
                                       notifyDelegate:YES];
     }
 
     [self updateLocalData];
   } else if (eventLag > RCTTextUpdateLagWarningThreshold) {
-    RCTLog(@"Native TextInput(%@) is %lld events ahead of JS - try to make your JS faster.", self.backedTextInputView.attributedText.string, (long long)eventLag);
+    RCTLog(
+        @"Native TextInput(%@) is %lld events ahead of JS - try to make your JS faster.",
+        self.backedTextInputView.attributedText.string,
+        (long long)eventLag);
   }
 }
 
@@ -179,8 +184,11 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
 {
   id<RCTBackedTextInputViewProtocol> backedTextInputView = self.backedTextInputView;
   UITextRange *selectedTextRange = backedTextInputView.selectedTextRange;
-  return [[RCTTextSelection new] initWithStart:[backedTextInputView offsetFromPosition:backedTextInputView.beginningOfDocument toPosition:selectedTextRange.start]
-                                           end:[backedTextInputView offsetFromPosition:backedTextInputView.beginningOfDocument toPosition:selectedTextRange.end]];
+  return [[RCTTextSelection new]
+      initWithStart:[backedTextInputView offsetFromPosition:backedTextInputView.beginningOfDocument
+                                                 toPosition:selectedTextRange.start]
+                end:[backedTextInputView offsetFromPosition:backedTextInputView.beginningOfDocument
+                                                 toPosition:selectedTextRange.end]];
 }
 
 - (void)setSelection:(RCTTextSelection *)selection
@@ -192,25 +200,29 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
   id<RCTBackedTextInputViewProtocol> backedTextInputView = self.backedTextInputView;
 
   UITextRange *previousSelectedTextRange = backedTextInputView.selectedTextRange;
-  UITextPosition *start = [backedTextInputView positionFromPosition:backedTextInputView.beginningOfDocument offset:selection.start];
-  UITextPosition *end = [backedTextInputView positionFromPosition:backedTextInputView.beginningOfDocument offset:selection.end];
+  UITextPosition *start = [backedTextInputView positionFromPosition:backedTextInputView.beginningOfDocument
+                                                             offset:selection.start];
+  UITextPosition *end = [backedTextInputView positionFromPosition:backedTextInputView.beginningOfDocument
+                                                           offset:selection.end];
   UITextRange *selectedTextRange = [backedTextInputView textRangeFromPosition:start toPosition:end];
 
   NSInteger eventLag = _nativeEventCount - _mostRecentEventCount;
   if (eventLag == 0 && ![previousSelectedTextRange isEqual:selectedTextRange]) {
     [backedTextInputView setSelectedTextRange:selectedTextRange notifyDelegate:NO];
   } else if (eventLag > RCTTextUpdateLagWarningThreshold) {
-    RCTLog(@"Native TextInput(%@) is %lld events ahead of JS - try to make your JS faster.", backedTextInputView.attributedText.string, (long long)eventLag);
+    RCTLog(
+        @"Native TextInput(%@) is %lld events ahead of JS - try to make your JS faster.",
+        backedTextInputView.attributedText.string,
+        (long long)eventLag);
   }
 }
 
-- (void)setSelectionStart:(NSInteger)start
-             selectionEnd:(NSInteger)end
+- (void)setSelectionStart:(NSInteger)start selectionEnd:(NSInteger)end
 {
-  UITextPosition *startPosition = [self.backedTextInputView positionFromPosition:self.backedTextInputView.beginningOfDocument
-                                                                          offset:start];
-  UITextPosition *endPosition = [self.backedTextInputView positionFromPosition:self.backedTextInputView.beginningOfDocument
-                                                                        offset:end];
+  UITextPosition *startPosition =
+      [self.backedTextInputView positionFromPosition:self.backedTextInputView.beginningOfDocument offset:start];
+  UITextPosition *endPosition =
+      [self.backedTextInputView positionFromPosition:self.backedTextInputView.beginningOfDocument offset:end];
   if (startPosition && endPosition) {
     UITextRange *range = [self.backedTextInputView textRangeFromPosition:startPosition toPosition:endPosition];
     [self.backedTextInputView setSelectedTextRange:range notifyDelegate:NO];
@@ -219,66 +231,66 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
 
 - (void)setTextContentType:(NSString *)type
 {
-  #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED)
-    static dispatch_once_t onceToken;
-    static NSDictionary<NSString *, NSString *> *contentTypeMap;
-
-    dispatch_once(&onceToken, ^{
-      contentTypeMap = @{@"none": @"",
-                          @"URL": UITextContentTypeURL,
-                          @"addressCity": UITextContentTypeAddressCity,
-                          @"addressCityAndState":UITextContentTypeAddressCityAndState,
-                          @"addressState": UITextContentTypeAddressState,
-                          @"countryName": UITextContentTypeCountryName,
-                          @"creditCardNumber": UITextContentTypeCreditCardNumber,
-                          @"emailAddress": UITextContentTypeEmailAddress,
-                          @"familyName": UITextContentTypeFamilyName,
-                          @"fullStreetAddress": UITextContentTypeFullStreetAddress,
-                          @"givenName": UITextContentTypeGivenName,
-                          @"jobTitle": UITextContentTypeJobTitle,
-                          @"location": UITextContentTypeLocation,
-                          @"middleName": UITextContentTypeMiddleName,
-                          @"name": UITextContentTypeName,
-                          @"namePrefix": UITextContentTypeNamePrefix,
-                          @"nameSuffix": UITextContentTypeNameSuffix,
-                          @"nickname": UITextContentTypeNickname,
-                          @"organizationName": UITextContentTypeOrganizationName,
-                          @"postalCode": UITextContentTypePostalCode,
-                          @"streetAddressLine1": UITextContentTypeStreetAddressLine1,
-                          @"streetAddressLine2": UITextContentTypeStreetAddressLine2,
-                          @"sublocality": UITextContentTypeSublocality,
-                          @"telephoneNumber": UITextContentTypeTelephoneNumber,
-                          @"username": UITextContentTypeUsername,
-                          @"password": UITextContentTypePassword,
-                          };
-
-      #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 120000 /* __IPHONE_12_0 */
-        if (@available(iOS 12.0, tvOS 12.0, *)) {
-          NSDictionary<NSString *, NSString *> * iOS12extras = @{@"newPassword": UITextContentTypeNewPassword,
-                                                                  @"oneTimeCode": UITextContentTypeOneTimeCode};
-
-          NSMutableDictionary<NSString *, NSString *> * iOS12baseMap = [contentTypeMap mutableCopy];
-          [iOS12baseMap addEntriesFromDictionary:iOS12extras];
-
-          contentTypeMap = [iOS12baseMap copy];
-        }
-      #endif
-    });
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED)
+  static dispatch_once_t onceToken;
+  static NSDictionary<NSString *, NSString *> *contentTypeMap;
+
+  dispatch_once(&onceToken, ^{
+    contentTypeMap = @{
+      @"none" : @"",
+      @"URL" : UITextContentTypeURL,
+      @"addressCity" : UITextContentTypeAddressCity,
+      @"addressCityAndState" : UITextContentTypeAddressCityAndState,
+      @"addressState" : UITextContentTypeAddressState,
+      @"countryName" : UITextContentTypeCountryName,
+      @"creditCardNumber" : UITextContentTypeCreditCardNumber,
+      @"emailAddress" : UITextContentTypeEmailAddress,
+      @"familyName" : UITextContentTypeFamilyName,
+      @"fullStreetAddress" : UITextContentTypeFullStreetAddress,
+      @"givenName" : UITextContentTypeGivenName,
+      @"jobTitle" : UITextContentTypeJobTitle,
+      @"location" : UITextContentTypeLocation,
+      @"middleName" : UITextContentTypeMiddleName,
+      @"name" : UITextContentTypeName,
+      @"namePrefix" : UITextContentTypeNamePrefix,
+      @"nameSuffix" : UITextContentTypeNameSuffix,
+      @"nickname" : UITextContentTypeNickname,
+      @"organizationName" : UITextContentTypeOrganizationName,
+      @"postalCode" : UITextContentTypePostalCode,
+      @"streetAddressLine1" : UITextContentTypeStreetAddressLine1,
+      @"streetAddressLine2" : UITextContentTypeStreetAddressLine2,
+      @"sublocality" : UITextContentTypeSublocality,
+      @"telephoneNumber" : UITextContentTypeTelephoneNumber,
+      @"username" : UITextContentTypeUsername,
+      @"password" : UITextContentTypePassword,
+    };
+
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 120000 /* __IPHONE_12_0 */
+    if (@available(iOS 12.0, tvOS 12.0, *)) {
+      NSDictionary<NSString *, NSString *> *iOS12extras =
+          @{@"newPassword" : UITextContentTypeNewPassword, @"oneTimeCode" : UITextContentTypeOneTimeCode};
+
+      NSMutableDictionary<NSString *, NSString *> *iOS12baseMap = [contentTypeMap mutableCopy];
+      [iOS12baseMap addEntriesFromDictionary:iOS12extras];
+
+      contentTypeMap = [iOS12baseMap copy];
+    }
+#endif
+  });
 
-    // Setting textContentType to an empty string will disable any
-    // default behaviour, like the autofill bar for password inputs
-    self.backedTextInputView.textContentType = contentTypeMap[type] ?: type;
-  #endif
+  // Setting textContentType to an empty string will disable any
+  // default behaviour, like the autofill bar for password inputs
+  self.backedTextInputView.textContentType = contentTypeMap[type] ?: type;
+#endif
 }
 
-
 - (void)setPasswordRules:(NSString *)descriptor
 {
-  #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_12_0
-    if (@available(iOS 12.0, *)) {
-      self.backedTextInputView.passwordRules = [UITextInputPasswordRules passwordRulesWithDescriptor:descriptor];
-    }
-  #endif
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_12_0
+  if (@available(iOS 12.0, *)) {
+    self.backedTextInputView.passwordRules = [UITextInputPasswordRules passwordRulesWithDescriptor:descriptor];
+  }
+#endif
 }
 
 - (UIKeyboardType)keyboardType
@@ -291,7 +303,8 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
   UIView<RCTBackedTextInputViewProtocol> *textInputView = self.backedTextInputView;
   if (textInputView.keyboardType != keyboardType) {
     textInputView.keyboardType = keyboardType;
-    // Without the call to reloadInputViews, the keyboard will not change until the textview field (the first responder) loses and regains focus.
+    // Without the call to reloadInputViews, the keyboard will not change until the textview field (the first responder)
+    // loses and regains focus.
     if (textInputView.isFirstResponder) {
       [textInputView reloadInputViews];
     }
@@ -354,20 +367,28 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
                                eventCount:_nativeEventCount];
 }
 
-- (BOOL)textInputShouldReturn
+- (BOOL)textInputShouldSubmitOnReturn
 {
-  // We send `submit` event here, in `textInputShouldReturn`
-  // (not in `textInputDidReturn)`, because of semantic of the event:
-  // `onSubmitEditing` is called when "Submit" button
-  // (the blue key on onscreen keyboard) did pressed
-  // (no connection to any specific "submitting" process).
-  [_eventDispatcher sendTextEventWithType:RCTTextEventTypeSubmit
-                                 reactTag:self.reactTag
-                                     text:[self.backedTextInputView.attributedText.string copy]
-                                      key:nil
-                               eventCount:_nativeEventCount];
+  const BOOL shouldSubmit =
+      [_submitBehavior isEqualToString:@"blurAndSubmit"] || [_submitBehavior isEqualToString:@"submit"];
+  if (shouldSubmit) {
+    // We send `submit` event here, in `textInputShouldSubmit`
+    // (not in `textInputDidReturn)`, because of semantic of the event:
+    // `onSubmitEditing` is called when "Submit" button
+    // (the blue key on onscreen keyboard) did pressed
+    // (no connection to any specific "submitting" process).
+    [_eventDispatcher sendTextEventWithType:RCTTextEventTypeSubmit
+                                   reactTag:self.reactTag
+                                       text:[self.backedTextInputView.attributedText.string copy]
+                                        key:nil
+                                 eventCount:_nativeEventCount];
+  }
+  return shouldSubmit;
+}
 
-  return _blurOnSubmit;
+- (BOOL)textInputShouldReturn
+{
+  return [_submitBehavior isEqualToString:@"blurAndSubmit"];
 }
 
 - (void)textInputDidReturn
@@ -388,16 +409,18 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
   }
 
   if (_maxLength) {
-    NSInteger allowedLength = MAX(_maxLength.integerValue - (NSInteger)backedTextInputView.attributedText.string.length + (NSInteger)range.length, 0);
+    NSInteger allowedLength = MAX(
+        _maxLength.integerValue - (NSInteger)backedTextInputView.attributedText.string.length + (NSInteger)range.length,
+        0);
 
     if (text.length > allowedLength) {
       // If we typed/pasted more than one character, limit the text inputted.
       if (text.length > 1) {
         if (allowedLength > 0) {
-          //make sure unicode characters that are longer than 16 bits (such as emojis) are not cut off
-          NSRange cutOffCharacterRange = [text rangeOfComposedCharacterSequenceAtIndex: allowedLength - 1];
+          // make sure unicode characters that are longer than 16 bits (such as emojis) are not cut off
+          NSRange cutOffCharacterRange = [text rangeOfComposedCharacterSequenceAtIndex:allowedLength - 1];
           if (cutOffCharacterRange.location + cutOffCharacterRange.length > allowedLength) {
-            //the character at the length limit takes more than 16bits, truncation should end at the character before
+            // the character at the length limit takes more than 16bits, truncation should end at the character before
             allowedLength = cutOffCharacterRange.location;
           }
         }
@@ -406,7 +429,9 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
         NSMutableAttributedString *newAttributedText = [backedTextInputView.attributedText mutableCopy];
         // Apply text attributes if original input view doesn't have text.
         if (backedTextInputView.attributedText.length == 0) {
-          newAttributedText = [[NSMutableAttributedString alloc] initWithString:[self.textAttributes applyTextAttributesToText:limitedString] attributes:self.textAttributes.effectiveTextAttributes];
+          newAttributedText = [[NSMutableAttributedString alloc]
+              initWithString:[self.textAttributes applyTextAttributesToText:limitedString]
+                  attributes:self.textAttributes.effectiveTextAttributes];
         } else {
           [newAttributedText replaceCharactersInRange:range withString:limitedString];
         }
@@ -416,7 +441,8 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
         // Collapse selection at end of insert to match normal paste behavior.
         UITextPosition *insertEnd = [backedTextInputView positionFromPosition:backedTextInputView.beginningOfDocument
                                                                        offset:(range.location + allowedLength)];
-        [backedTextInputView setSelectedTextRange:[backedTextInputView textRangeFromPosition:insertEnd toPosition:insertEnd]
+        [backedTextInputView setSelectedTextRange:[backedTextInputView textRangeFromPosition:insertEnd
+                                                                                  toPosition:insertEnd]
                                    notifyDelegate:YES];
 
         [self textInputDidChange];
@@ -431,18 +457,18 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
   if (range.location + range.length > backedTextInputView.attributedText.string.length) {
     _predictedText = backedTextInputView.attributedText.string;
   } else {
-    _predictedText = [backedTextInputView.attributedText.string stringByReplacingCharactersInRange:range withString:text];
+    _predictedText = [backedTextInputView.attributedText.string stringByReplacingCharactersInRange:range
+                                                                                        withString:text];
   }
 
   if (_onTextInput) {
     _onTextInput(@{
-      @"text": text,
-      @"previousText": previousText,
-      @"range": @{
-        @"start": @(range.location),
-        @"end": @(range.location + range.length)
-      },
-      @"eventCount": @(_nativeEventCount),
+      // We copy the string here because if it's a mutable string it may get released before we stop using it on a
+      // different thread, causing a crash.
+      @"text" : [text copy],
+      @"previousText" : previousText,
+      @"range" : @{@"start" : @(range.location), @"end" : @(range.location + range.length)},
+      @"eventCount" : @(_nativeEventCount),
     });
   }
 
@@ -472,9 +498,9 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
 
   if (_onChange) {
     _onChange(@{
-       @"text": [self.attributedText.string copy],
-       @"target": self.reactTag,
-       @"eventCount": @(_nativeEventCount),
+      @"text" : [self.attributedText.string copy],
+      @"target" : self.reactTag,
+      @"eventCount" : @(_nativeEventCount),
     });
   }
 }
@@ -488,9 +514,9 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
   RCTTextSelection *selection = self.selection;
 
   _onSelectionChange(@{
-    @"selection": @{
-      @"start": @(selection.start),
-      @"end": @(selection.end),
+    @"selection" : @{
+      @"start" : @(selection.start),
+      @"end" : @(selection.end),
     },
   });
 }
@@ -499,8 +525,7 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
 {
   [self enforceTextAttributesIfNeeded];
 
-  [_bridge.uiManager setLocalData:[self.backedTextInputView.attributedText copy]
-                          forView:self];
+  [_bridge.uiManager setLocalData:[self.backedTextInputView.attributedText copy] forView:self];
 }
 
 #pragma mark - Layout (in UIKit terms, with all insets)
@@ -578,17 +603,19 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
 {
   #if !TARGET_OS_TV
   __weak RCTBaseTextInputView *weakSelf = self;
-  [_bridge.uiManager rootViewForReactTag:self.reactTag withCompletion:^(UIView *rootView) {
-    RCTBaseTextInputView *strongSelf = weakSelf;
-    if (rootView) {
-      UIView *accessoryView = [strongSelf->_bridge.uiManager viewForNativeID:nativeID
-                                                                 withRootTag:rootView.reactTag];
-      if (accessoryView && [accessoryView isKindOfClass:[RCTInputAccessoryView class]]) {
-        strongSelf.backedTextInputView.inputAccessoryView = ((RCTInputAccessoryView *)accessoryView).inputAccessoryView;
-        [strongSelf reloadInputViewsIfNecessary];
-      }
-    }
-  }];
+  [_bridge.uiManager rootViewForReactTag:self.reactTag
+                          withCompletion:^(UIView *rootView) {
+                            RCTBaseTextInputView *strongSelf = weakSelf;
+                            if (rootView) {
+                              UIView *accessoryView = [strongSelf->_bridge.uiManager viewForNativeID:nativeID
+                                                                                         withRootTag:rootView.reactTag];
+                              if (accessoryView && [accessoryView isKindOfClass:[RCTInputAccessoryView class]]) {
+                                strongSelf.backedTextInputView.inputAccessoryView =
+                                    ((RCTInputAccessoryView *)accessoryView).inputAccessoryView;
+                                [strongSelf reloadInputViewsIfNecessary];
+                              }
+                            }
+                          }];
   #endif /* !TARGET_OS_TV */
 }
 
@@ -601,12 +628,8 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
   // These keyboard types (all are number pads) don't have a "Done" button by default,
   // so we create an `inputAccessoryView` with this button for them.
   BOOL shouldHaveInputAccesoryView =
-      (
-       keyboardType == UIKeyboardTypeNumberPad ||
-       keyboardType == UIKeyboardTypePhonePad ||
-       keyboardType == UIKeyboardTypeDecimalPad ||
-       keyboardType == UIKeyboardTypeASCIICapableNumberPad
-      ) &&
+      (keyboardType == UIKeyboardTypeNumberPad || keyboardType == UIKeyboardTypePhonePad ||
+       keyboardType == UIKeyboardTypeDecimalPad || keyboardType == UIKeyboardTypeASCIICapableNumberPad) &&
       textInputView.returnKeyType == UIReturnKeyDone;
 
   if (_hasInputAccesoryView == shouldHaveInputAccesoryView) {
@@ -619,17 +642,14 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
     UIToolbar *toolbarView = [UIToolbar new];
     [toolbarView sizeToFit];
     UIBarButtonItem *flexibleSpace =
-      [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace
-                                                    target:nil
-                                                    action:nil];
+        [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil];
     UIBarButtonItem *doneButton =
-      [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone
-                                                    target:self
-                                                    action:@selector(handleInputAccessoryDoneButton)];
-    toolbarView.items = @[flexibleSpace, doneButton];
+        [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone
+                                                      target:self
+                                                      action:@selector(handleInputAccessoryDoneButton)];
+    toolbarView.items = @[ flexibleSpace, doneButton ];
     textInputView.inputAccessoryView = toolbarView;
-  }
-  else {
+  } else {
     textInputView.inputAccessoryView = nil;
   }
   [self reloadInputViewsIfNecessary];
@@ -646,6 +666,8 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
 
 - (void)handleInputAccessoryDoneButton
 {
+  // Ignore the value of whether we submitted; just make sure the submit event is called if necessary.
+  [self textInputShouldSubmitOnReturn];
   if ([self textInputShouldReturn]) {
     [self.backedTextInputView endEditing:YES];
   }

package/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m

@@ -13,8 +13,8 @@
 #import <React/RCTShadowView+Layout.h>
 #import <React/RCTShadowView.h>
 #import <React/RCTUIManager.h>
-#import <React/RCTUIManagerUtils.h>
 #import <React/RCTUIManagerObserverCoordinator.h>
+#import <React/RCTUIManagerUtils.h>
 
 #import <React/RCTBaseTextInputShadowView.h>
 #import <React/RCTBaseTextInputView.h>
@@ -24,8 +24,7 @@
 
 @end
 
-@implementation RCTBaseTextInputViewManager
-{
+@implementation RCTBaseTextInputViewManager {
   NSHashTable<RCTBaseTextInputShadowView *> *_shadowViews;
 }
 
@@ -49,7 +48,7 @@ RCT_REMAP_VIEW_PROPERTY(clearButtonMode, backedTextInputView.clearButtonMode, UI
 RCT_REMAP_VIEW_PROPERTY(scrollEnabled, backedTextInputView.scrollEnabled, BOOL)
 RCT_REMAP_VIEW_PROPERTY(secureTextEntry, backedTextInputView.secureTextEntry, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(autoFocus, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(blurOnSubmit, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(submitBehavior, NSString)
 RCT_EXPORT_VIEW_PROPERTY(clearTextOnFocus, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(keyboardType, UIKeyboardType)
 RCT_EXPORT_VIEW_PROPERTY(showSoftInputOnFocus, BOOL)
@@ -76,15 +75,16 @@ RCT_EXPORT_SHADOW_PROPERTY(onContentSizeChange, RCTBubblingEventBlock)
 RCT_CUSTOM_VIEW_PROPERTY(multiline, BOOL, UIView)
 {
   // No op.
-  // This View Manager doesn't use this prop but it must be exposed here via ViewConfig to enable Fabric component use it.
+  // This View Manager doesn't use this prop but it must be exposed here via ViewConfig to enable Fabric component use
+  // it.
 }
 
 - (RCTShadowView *)shadowView
 {
   RCTBaseTextInputShadowView *shadowView = [[RCTBaseTextInputShadowView alloc] initWithBridge:self.bridge];
-  shadowView.textAttributes.fontSizeMultiplier = [[[self.bridge
-                                                    moduleForName:@"AccessibilityManager"
-                                                    lazilyLoadIfNecessary:YES] valueForKey:@"multiplier"] floatValue];
+  shadowView.textAttributes.fontSizeMultiplier =
+      [[[self.bridge moduleForName:@"AccessibilityManager"
+             lazilyLoadIfNecessary:YES] valueForKey:@"multiplier"] floatValue];
   [_shadowViews addObject:shadowView];
   return shadowView;
 }
@@ -101,7 +101,7 @@ RCT_CUSTOM_VIEW_PROPERTY(multiline, BOOL, UIView)
                                            selector:@selector(handleDidUpdateMultiplierNotification)
                                                name:@"RCTAccessibilityManagerDidUpdateMultiplierNotification"
                                              object:[bridge moduleForName:@"AccessibilityManager"
-                                                    lazilyLoadIfNecessary:YES]];
+                                                        lazilyLoadIfNecessary:YES]];
 }
 
 RCT_EXPORT_METHOD(focus : (nonnull NSNumber *)viewTag)
@@ -120,11 +120,12 @@ RCT_EXPORT_METHOD(blur : (nonnull NSNumber *)viewTag)
   }];
 }
 
-RCT_EXPORT_METHOD(setTextAndSelection : (nonnull NSNumber *)viewTag
-                 mostRecentEventCount : (NSInteger)mostRecentEventCount
-                                value : (NSString *)value
-                                start : (NSInteger)start
-                                  end : (NSInteger)end)
+RCT_EXPORT_METHOD(setTextAndSelection
+                  : (nonnull NSNumber *)viewTag mostRecentEventCount
+                  : (NSInteger)mostRecentEventCount value
+                  : (NSString *)value start
+                  : (NSInteger)start end
+                  : (NSInteger)end)
 {
   [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
     RCTBaseTextInputView *view = (RCTBaseTextInputView *)viewRegistry[viewTag];
@@ -133,7 +134,8 @@ RCT_EXPORT_METHOD(setTextAndSelection : (nonnull NSNumber *)viewTag
       return;
     }
     RCTExecuteOnUIManagerQueue(^{
-      RCTBaseTextInputShadowView *shadowView = (RCTBaseTextInputShadowView *)[self.bridge.uiManager shadowViewForReactTag:viewTag];
+      RCTBaseTextInputShadowView *shadowView =
+          (RCTBaseTextInputShadowView *)[self.bridge.uiManager shadowViewForReactTag:viewTag];
       if (value) {
         [shadowView setText:value];
       }
@@ -158,8 +160,8 @@ RCT_EXPORT_METHOD(setTextAndSelection : (nonnull NSNumber *)viewTag
 
 - (void)handleDidUpdateMultiplierNotification
 {
-  CGFloat fontSizeMultiplier = [[[self.bridge moduleForName:@"AccessibilityManager"]
-                                 valueForKey:@"multiplier"] floatValue];
+  CGFloat fontSizeMultiplier =
+      [[[self.bridge moduleForName:@"AccessibilityManager"] valueForKey:@"multiplier"] floatValue];
 
   NSHashTable<RCTBaseTextInputShadowView *> *shadowViews = _shadowViews;
   RCTExecuteOnUIManagerQueue(^{

package/Libraries/Text/TextInput/RCTInputAccessoryShadowView.m

@@ -14,7 +14,7 @@
 - (void)insertReactSubview:(RCTShadowView *)subview atIndex:(NSInteger)atIndex
 {
   [super insertReactSubview:subview atIndex:atIndex];
-  subview.width = (YGValue) { RCTScreenSize().width, YGUnitPoint };
+  subview.width = (YGValue){RCTScreenSize().width, YGUnitPoint};
 }
 
 @end

package/Libraries/Text/TextInput/RCTInputAccessoryView.m

@@ -13,15 +13,14 @@
 
 #import <React/RCTInputAccessoryViewContent.h>
 
-@interface RCTInputAccessoryView()
+@interface RCTInputAccessoryView ()
 
 // Overriding `inputAccessoryView` to `readwrite`.
 @property (nonatomic, readwrite, retain) UIView *inputAccessoryView;
 
 @end
 
-@implementation RCTInputAccessoryView
-{
+@implementation RCTInputAccessoryView {
   BOOL _shouldBecomeFirstResponder;
 }