Merge branch 'main' into 75-merge

Saadnajmi · Aug 19, 2024 · 9e63026 · 9e63026
2 parents 990e603 + a44c574
commit 9e63026
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm
@@ -37,6 +37,9 @@ @implementation RCTBaseTextInputView {
   BOOL _hasInputAccessoryView;
   // [macOS] remove explicit _predictedText ivar declaration
   BOOL _didMoveToWindow;
+#if TARGET_OS_OSX // [macOS avoids duplicating effects of textInputDid(Begin|End)Editing calls
+  BOOL _isCurrentlyEditing;
+#endif // macOS]
 }
 
 #if !TARGET_OS_OSX // [macOS]
@@ -72,6 +75,9 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   if (self = [super initWithEventDispatcher:bridge.eventDispatcher]) { // [macOS]
     _bridge = bridge;
     _eventDispatcher = bridge.eventDispatcher;
+ #if TARGET_OS_OSX // [macOS
+    _isCurrentlyEditing = NO;
+#endif // macOS]
 #if !TARGET_OS_OSX // [macOS] TODO - Implement for macOS and visionOS?
     [self initializeReturnKeyType];
 #endif // macOS]
@@ -450,6 +456,13 @@ - (BOOL)textInputShouldBeginEditing
 
 - (void)textInputDidBeginEditing
 {
+#if TARGET_OS_OSX // [macOS consolidate duplicate callbacks
+  if (_isCurrentlyEditing) {
+    return;
+  }
+  _isCurrentlyEditing = YES;
+#endif // macOS]
+
   if (_clearTextOnFocus) {
     self.backedTextInputView.attributedText = [NSAttributedString new];
   }
@@ -478,6 +491,13 @@ - (BOOL)textInputShouldEndEditing
 
 - (void)textInputDidEndEditing
 {
+#if TARGET_OS_OSX // [macOS consolidate duplicate callbacks
+  if (!_isCurrentlyEditing) {
+    return;
+  }
+  _isCurrentlyEditing = NO;
+#endif // macOS]
+
   self.ghostText = nil; // [macOS]
 
   [_eventDispatcher sendTextEventWithType:RCTTextEventTypeEnd

diff --git a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm
@@ -93,6 +93,9 @@ @implementation RCTUITextField {
 #endif
   RCTBackedTextFieldDelegateAdapter *_textInputDelegateAdapter;
   NSDictionary<NSAttributedStringKey, id> *_defaultTextAttributes;
+#if TARGET_OS_OSX // [macOS
+  BOOL _isUpdatingPlaceholderText;
+#endif // macOS]
 }
 
 #if TARGET_OS_OSX // [macOS
@@ -116,6 +119,9 @@ - (instancetype)initWithFrame:(CGRect)frame
 
     _textInputDelegateAdapter = [[RCTBackedTextFieldDelegateAdapter alloc] initWithTextField:self];
     _scrollEnabled = YES;
+#if TARGET_OS_OSX // [macOS
+    _isUpdatingPlaceholderText = NO;
+#endif // macOS]
   }
 
   return self;
@@ -361,8 +367,11 @@ - (void)_updatePlaceholder
   self.attributedPlaceholder = [[NSAttributedString alloc] initWithString:self.placeholder ?: @""
                                                                attributes:[self _placeholderTextAttributes]];
 #else // [macOS
+  // Set _isUpdatingPlaceholderText to manually suppress RCTUITextFieldDelegate's textFieldEndEditing
+  _isUpdatingPlaceholderText = YES;
   self.placeholderAttributedString = [[NSAttributedString alloc] initWithString:self.placeholder ?: @""
 																	 attributes:[self _placeholderTextAttributes]];
+  _isUpdatingPlaceholderText = NO;
 #endif // macOS]
 }
 
@@ -498,10 +507,17 @@ - (void)textDidChange:(NSNotification *)notification
     [delegate textFieldDidChange:self];
   }
 }
-  
+
 - (void)textDidEndEditing:(NSNotification *)notification
 {
-  [super textDidEndEditing:notification];    
+  [super textDidEndEditing:notification];
+
+  // On macOS, setting placeholderAttributedString causes AppKit to call textDidEndEditing.
+  // We don't want this to propagate or else we get unexpected onBlur/onEndEditing events.
+  if (_isUpdatingPlaceholderText) {
+    return;
+  }
+
   id<RCTUITextFieldDelegate> delegate = self.delegate;
   if ([delegate respondsToSelector:@selector(textFieldEndEditing:)]) {
     [delegate textFieldEndEditing:self];