cherrypick - Fix TextInput to submit value to onChange & onSubmitEdit…

…ing (#1811) (#1812) Co-authored-by: Shawn Dempsey <shawndempsey@fb.com>
microsoft · May 4, 2023 · f1ee4e4 · f1ee4e4
1 parent 406a2da
commit f1ee4e4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m
@@ -142,6 +142,8 @@ - (BOOL)shouldShowVerticalScrollbar
 
 - (void)textInputDidChange
 {
+  [super textInputDidChange];
+
   [_scrollView setHasVerticalScroller:[self shouldShowVerticalScrollbar]];
 }
 

diff --git a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m
@@ -198,7 +198,7 @@ - (BOOL)control:(NSControl *)control textView:(NSTextView *)fieldEditor doComman
   // enter/return
   if (commandSelector == @selector(insertNewline:) || commandSelector == @selector(insertNewlineIgnoringFieldEditor:)) {
     [self textFieldDidEndEditingOnExit];
-    if ([textInputDelegate textInputShouldReturn]) {
+    if ([textInputDelegate textInputShouldSubmitOnReturn]) {
       [[_backedTextInputView window] makeFirstResponder:nil];
     }
     commandHandled = YES;
@@ -434,7 +434,7 @@ - (BOOL)textView:(NSTextView *)textView doCommandBySelector:(SEL)commandSelector
   id<RCTBackedTextInputDelegate> textInputDelegate = [_backedTextInputView textInputDelegate];
   // enter/return
   if ((commandSelector == @selector(insertNewline:) || commandSelector == @selector(insertNewlineIgnoringFieldEditor:))) {
-    if (textInputDelegate.textInputShouldReturn) {
+    if ([textInputDelegate textInputShouldSubmitOnReturn]) {
       [_backedTextInputView.window makeFirstResponder:nil];
       commandHandled = YES;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -142,6 +142,8 @@ - (BOOL)shouldShowVerticalScrollbar @@
     - (void)textInputDidChange
     {
+      [super textInputDidChange];
       [_scrollView setHasVerticalScroller:[self shouldShowVerticalScrollbar]];
     }
@@ Expand Down @@