not-react-native-macos 0.83.0-rc.1 → 0.87.1-rc.2

package/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm

@@ -14,20 +14,9 @@
 
 #import <React/RCTBackedTextInputViewProtocol.h>
 #import <React/RCTScrollViewComponentView.h>
-
-#if !TARGET_OS_OSX // [macOS]
 #import <React/RCTUITextField.h>
-#else // [macOS
-#include <React/RCTUITextField.h>
-#include <React/RCTUISecureTextField.h>
-#endif // macOS]
-
 #import <React/RCTUITextView.h>
 #import <React/RCTUtils.h>
-#if TARGET_OS_OSX // [macOS
-#import <React/RCTWrappedTextView.h>
-#import <React/RCTViewKeyboardEvent.h>
-#endif // macOS]
 
 #import "RCTConversions.h"
 #import "RCTTextInputNativeCommands.h"
@@ -36,38 +25,26 @@
 #import <limits>
 #import "RCTFabricComponentsPlugins.h"
 
-#if !TARGET_OS_OSX // [macOS]
 /** Native iOS text field bottom keyboard offset amount */
 static const CGFloat kSingleLineKeyboardBottomOffset = 15.0;
-#endif // [macOS]
-
-#if TARGET_OS_OSX // [macOS
-static NSString *kEscapeKeyCode = @"\x1B";
-#endif // macOS]
-
 
 using namespace facebook::react;
 
-#if !TARGET_OS_OSX // [macOS]
 @interface RCTTextInputComponentView () <
     RCTBackedTextInputDelegate,
-    RCTTextInputViewProtocol,
-    UIDropInteractionDelegate>
+    RCTTextInputViewProtocol
+#if !TARGET_OS_TV
+    ,
+    UIDropInteractionDelegate
+#endif
+    >
 @end
-#else // [macOS
-@interface RCTTextInputComponentView () <RCTBackedTextInputDelegate, RCTTextInputViewProtocol>
-@end
-#endif // macOS]
 
 static NSSet<NSNumber *> *returnKeyTypesSet;
 
 @implementation RCTTextInputComponentView {
   TextInputShadowNode::ConcreteState::Shared _state;
-#if !TARGET_OS_OSX // [macOS]
-  RCTUIView<RCTBackedTextInputViewProtocol> *_backedTextInputView;
-#else // [macOS
-  RCTPlatformView<RCTBackedTextInputViewProtocol> *_backedTextInputView;
-#endif // macOS]
+  UIView<RCTBackedTextInputViewProtocol> *_backedTextInputView;
   NSUInteger _mostRecentEventCount;
   NSAttributedString *_lastStringStateWasUpdatedWith;
 
@@ -113,11 +90,7 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
     const auto &defaultProps = TextInputShadowNode::defaultSharedProps();
     _props = defaultProps;
 
-#if !TARGET_OS_OSX // [macOS]
     _backedTextInputView = defaultProps->multiline ? [RCTUITextView new] : [RCTUITextField new];
-#else // [macOS
-    _backedTextInputView = defaultProps->multiline ? [[RCTWrappedTextView alloc] initWithFrame:self.bounds] : [RCTUITextField new];
-#endif // macOS]
     _backedTextInputView.textInputDelegate = self;
     _ignoreNextTextInputCall = NO;
     _comingFromJS = NO;
@@ -126,9 +99,7 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
     _previousContentSize = CGSizeZero;
 
     [self addSubview:_backedTextInputView];
-#if TARGET_OS_IOS // [macOS] [visionOS]
     [self initializeReturnKeyType];
-#endif // [macOS] [visionOS]
   }
 
   return self;
@@ -153,24 +124,16 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
   if (self.window && !_didMoveToWindow) {
     const auto &props = static_cast<const TextInputProps &>(*_props);
     if (props.autoFocus) {
-#if !TARGET_OS_OSX // [macOS]
       [_backedTextInputView becomeFirstResponder];
-#else // [macOS
-      NSWindow *window = [_backedTextInputView window];
-      [window makeFirstResponder:_backedTextInputView.responder];
-#endif // macOS]
       [self scrollCursorIntoView];
     }
     _didMoveToWindow = YES;
-#if TARGET_OS_IOS // [macOS] [visionOS]
     [self initializeReturnKeyType];
-#endif // [macOS] [visionOS]
   }
 
   [self _restoreTextSelection];
 }
 
-#if !TARGET_OS_OSX // [macOS]
 // TODO: replace with registerForTraitChanges once iOS 17.0 is the lowest supported version
 - (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection
 {
@@ -184,11 +147,9 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
         RCTNSTextAttributesFromTextAttributes(newTextInputProps.getEffectiveTextAttributes(RCTFontSizeMultiplier()));
   }
 }
-#endif // [macOS]
 
 - (void)reactUpdateResponderOffsetForScrollView:(RCTScrollViewComponentView *)scrollView
 {
-#if !TARGET_OS_OSX // [macOS]
   if (![self isDescendantOfView:scrollView.scrollView] || !_backedTextInputView.isFirstResponder) {
     // View is outside scroll view or it's not a first responder.
     scrollView.firstResponderViewOutsideScrollView = _backedTextInputView;
@@ -210,7 +171,6 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
     }
   }
   scrollView.firstResponderFocus = [self convertRect:focusRect toView:nil];
-#endif // [macOS]
 }
 
 #pragma mark - RCTViewComponentView overrides
@@ -237,25 +197,15 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
     [self _setMultiline:newTextInputProps.multiline];
   }
 
-
-#if !TARGET_OS_OSX // [macOS]
   if (newTextInputProps.traits.autocapitalizationType != oldTextInputProps.traits.autocapitalizationType) {
     _backedTextInputView.autocapitalizationType =
         RCTUITextAutocapitalizationTypeFromAutocapitalizationType(newTextInputProps.traits.autocapitalizationType);
   }
-#endif // [macOS]
 
-#if !TARGET_OS_OSX // [macOS]
   if (newTextInputProps.traits.autoCorrect != oldTextInputProps.traits.autoCorrect) {
     _backedTextInputView.autocorrectionType =
         RCTUITextAutocorrectionTypeFromOptionalBool(newTextInputProps.traits.autoCorrect);
   }
-#else // [macOS
-  if (newTextInputProps.traits.autoCorrect != oldTextInputProps.traits.autoCorrect && newTextInputProps.traits.autoCorrect.has_value()) {
-    _backedTextInputView.automaticSpellingCorrectionEnabled =
-        newTextInputProps.traits.autoCorrect.value();
-  }
-#endif // macOS]
 
   if (newTextInputProps.traits.contextMenuHidden != oldTextInputProps.traits.contextMenuHidden) {
     _backedTextInputView.contextMenuHidden = newTextInputProps.traits.contextMenuHidden;
@@ -265,15 +215,14 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
     _backedTextInputView.editable = newTextInputProps.traits.editable;
   }
 
-#if !TARGET_OS_OSX // [macOS]
+#if !TARGET_OS_TV
   if (newTextInputProps.multiline &&
       newTextInputProps.traits.dataDetectorTypes != oldTextInputProps.traits.dataDetectorTypes) {
     _backedTextInputView.dataDetectorTypes =
         RCTUITextViewDataDetectorTypesFromStringVector(newTextInputProps.traits.dataDetectorTypes);
   }
-#endif // [macOS]
+#endif
 
-#if !TARGET_OS_OSX // [macOS]
   if (newTextInputProps.traits.enablesReturnKeyAutomatically !=
       oldTextInputProps.traits.enablesReturnKeyAutomatically) {
     _backedTextInputView.enablesReturnKeyAutomatically = newTextInputProps.traits.enablesReturnKeyAutomatically;
@@ -283,51 +232,29 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
     _backedTextInputView.keyboardAppearance =
         RCTUIKeyboardAppearanceFromKeyboardAppearance(newTextInputProps.traits.keyboardAppearance);
   }
-#endif // [macOS]
 
-#if !TARGET_OS_OSX // [macOS]
   if (newTextInputProps.traits.spellCheck != oldTextInputProps.traits.spellCheck) {
     _backedTextInputView.spellCheckingType =
         RCTUITextSpellCheckingTypeFromOptionalBool(newTextInputProps.traits.spellCheck);
   }
-#else // [macOS
-  if (newTextInputProps.traits.spellCheck != oldTextInputProps.traits.spellCheck && newTextInputProps.traits.spellCheck.has_value()) {
-    _backedTextInputView.continuousSpellCheckingEnabled =
-        newTextInputProps.traits.spellCheck.value();
-  }
-#endif // macOS]
-
-#if TARGET_OS_OSX // [macOS
-  if (newTextInputProps.traits.grammarCheck != oldTextInputProps.traits.grammarCheck && newTextInputProps.traits.grammarCheck.has_value()) {
-    _backedTextInputView.grammarCheckingEnabled =
-        newTextInputProps.traits.grammarCheck.value();
-  }
-#endif // macOS]
 
   if (newTextInputProps.traits.caretHidden != oldTextInputProps.traits.caretHidden) {
     _backedTextInputView.caretHidden = newTextInputProps.traits.caretHidden;
   }
 
-#if !TARGET_OS_OSX // [macOS]
   if (newTextInputProps.traits.clearButtonMode != oldTextInputProps.traits.clearButtonMode) {
     _backedTextInputView.clearButtonMode =
         RCTUITextFieldViewModeFromTextInputAccessoryVisibilityMode(newTextInputProps.traits.clearButtonMode);
   }
-#endif // [macOS]
 
   if (newTextInputProps.traits.scrollEnabled != oldTextInputProps.traits.scrollEnabled) {
     _backedTextInputView.scrollEnabled = newTextInputProps.traits.scrollEnabled;
   }
 
   if (newTextInputProps.traits.secureTextEntry != oldTextInputProps.traits.secureTextEntry) {
-#if !TARGET_OS_OSX // [macOS]
     _backedTextInputView.secureTextEntry = newTextInputProps.traits.secureTextEntry;
-#else // [macOS
-    [self _setSecureTextEntry:newTextInputProps.traits.secureTextEntry];
-#endif // macOS]
   }
 
-#if !TARGET_OS_OSX // [macOS]
   if (newTextInputProps.traits.keyboardType != oldTextInputProps.traits.keyboardType) {
     _backedTextInputView.keyboardType = RCTUIKeyboardTypeFromKeyboardType(newTextInputProps.traits.keyboardType);
   }
@@ -352,7 +279,6 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
   if (newTextInputProps.traits.showSoftInputOnFocus != oldTextInputProps.traits.showSoftInputOnFocus) {
     [self _setShowSoftInputOnFocus:newTextInputProps.traits.showSoftInputOnFocus];
   }
-#endif // [macOS]
 
   // Traits `blurOnSubmit`, `clearTextOnFocus`, and `selectTextOnFocus` were omitted intentionally here
   // because they are being checked on-demand.
@@ -374,11 +300,9 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
     _backedTextInputView.defaultTextAttributes = defaultAttributes;
   }
 
-#if !TARGET_OS_OSX // [macOS]
   if (newTextInputProps.selectionColor != oldTextInputProps.selectionColor) {
     _backedTextInputView.tintColor = RCTUIColorFromSharedColor(newTextInputProps.selectionColor);
   }
-#endif // [macOS]
 
   if (newTextInputProps.inputAccessoryViewID != oldTextInputProps.inputAccessoryViewID) {
     _backedTextInputView.inputAccessoryViewID = RCTNSStringFromString(newTextInputProps.inputAccessoryViewID);
@@ -406,18 +330,9 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
     }
   }
 
-#if TARGET_OS_OSX // [macOS
-  if (newTextInputProps.traits.pastedTypes!= oldTextInputProps.traits.pastedTypes) {
-    NSArray<NSPasteboardType> *types = RCTPasteboardTypeArrayFromProps(newTextInputProps.traits.pastedTypes);
-    [_backedTextInputView setReadablePasteBoardTypes:types];
-  }
-#endif // macOS]
-
   [super updateProps:props oldProps:oldProps];
 
-#if TARGET_OS_IOS // [macOS] [visionOS]
   [self setDefaultInputAccessoryView];
-#endif // [macOS] [visionOS]
 }
 
 - (void)updateState:(const State::Shared &)state oldState:(const State::Shared &)oldState
@@ -448,9 +363,6 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
 {
   [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
 
-#if TARGET_OS_OSX // [macOS
-  _backedTextInputView.pointScaleFactor = layoutMetrics.pointScaleFactor;
-#endif // macOS]
   _backedTextInputView.frame =
       UIEdgeInsetsInsetRect(self.bounds, RCTUIEdgeInsetsFromEdgeInsets(layoutMetrics.borderWidth));
   _backedTextInputView.textContainerInset =
@@ -472,11 +384,9 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
   _lastStringStateWasUpdatedWith = nil;
   _ignoreNextTextInputCall = NO;
   _didMoveToWindow = NO;
-#if !TARGET_OS_OSX && !TARGET_OS_VISION // [macOS] [visionOS]
   _backedTextInputView.inputAccessoryViewID = nil;
   _backedTextInputView.inputAccessoryView = nil;
   _hasInputAccessoryView = false;
-#endif // [macOS] [visionOS]
   [_backedTextInputView resignFirstResponder];
 }
 
@@ -615,156 +525,12 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
   }
 }
 
-#if TARGET_OS_OSX // [macOS
-- (void)setEnableFocusRing:(BOOL)enableFocusRing {
-  [super setEnableFocusRing:enableFocusRing];
-  if ([_backedTextInputView respondsToSelector:@selector(setEnableFocusRing:)]) {
-    [_backedTextInputView setEnableFocusRing:enableFocusRing];
-  }
-}
-
-- (void)automaticSpellingCorrectionDidChange:(BOOL)enabled {
-  if (_eventEmitter) {
-    std::static_pointer_cast<TextInputEventEmitter const>(_eventEmitter)->onAutoCorrectChange({.autoCorrectEnabled = static_cast<bool>(enabled)});
-  }
-}
-
-- (void)continuousSpellCheckingDidChange:(BOOL)enabled
-{
-  if (_eventEmitter) {
-    std::static_pointer_cast<TextInputEventEmitter const>(_eventEmitter)->onSpellCheckChange({.spellCheckEnabled = static_cast<bool>(enabled)});
-  }
-}
-
-- (void)grammarCheckingDidChange:(BOOL)enabled
-{
-  if (_eventEmitter) {
-    std::static_pointer_cast<TextInputEventEmitter const>(_eventEmitter)->onGrammarCheckChange({.grammarCheckEnabled = static_cast<bool>(enabled)});
-  }
-}
-
-- (void)submitOnKeyDownIfNeeded:(nonnull NSEvent *)event
-{
-  BOOL shouldSubmit = NO;
-  NSDictionary *keyEvent = [RCTViewKeyboardEvent bodyFromEvent:event];
-  auto const &props = *std::static_pointer_cast<TextInputProps const>(_props);
-  if (props.traits.submitKeyEvents.empty()) {
-    shouldSubmit = [keyEvent[@"key"] isEqualToString:@"Enter"]
-      && ![keyEvent[@"altKey"] boolValue]
-      && ![keyEvent[@"shiftKey"] boolValue]
-      && ![keyEvent[@"ctrlKey"] boolValue]
-      && ![keyEvent[@"metaKey"] boolValue]
-      && ![keyEvent[@"functionKey"] boolValue]; // Default clearTextOnSubmit key
-  } else {
-    NSString *keyValue = keyEvent[@"key"];
-    const char *keyCString = [keyValue UTF8String];
-    if (keyCString != nullptr) {
-      std::string_view key(keyCString);
-      const bool altKey = [keyEvent[@"altKey"] boolValue];
-      const bool shiftKey = [keyEvent[@"shiftKey"] boolValue];
-      const bool ctrlKey = [keyEvent[@"ctrlKey"] boolValue];
-      const bool metaKey = [keyEvent[@"metaKey"] boolValue];
-      const bool functionKey = [keyEvent[@"functionKey"] boolValue];
-
-      shouldSubmit = std::any_of(
-        props.traits.submitKeyEvents.begin(),
-        props.traits.submitKeyEvents.end(),
-        [&](auto const &submitKeyEvent) {
-          return submitKeyEvent.key == key && submitKeyEvent.altKey == altKey &&
-            submitKeyEvent.shiftKey == shiftKey && submitKeyEvent.ctrlKey == ctrlKey &&
-            submitKeyEvent.metaKey == metaKey && submitKeyEvent.functionKey == functionKey;
-      });
-    }
-  }
-
-  if (shouldSubmit) {
-    if (_eventEmitter) {
-      auto const &textInputEventEmitter = *std::static_pointer_cast<TextInputEventEmitter const>(_eventEmitter);
-      textInputEventEmitter.onSubmitEditing([self _textInputMetrics]);
-    }
-
-    if (props.traits.clearTextOnSubmit) {
-      _backedTextInputView.attributedText = nil;
-      [self textInputDidChange];
-    }
-  }
-}
-
-- (void)textInputDidCancel
-{
-  if (_eventEmitter) {
-    auto const &textInputEventEmitter = *std::static_pointer_cast<TextInputEventEmitter const>(_eventEmitter);
-    textInputEventEmitter.onKeyPress({
-      .text = RCTStringFromNSString(kEscapeKeyCode),
-      .eventCount = static_cast<int>(_mostRecentEventCount),
-    });
-  }
-
-  [self textInputDidEndEditing];
-}
-
-- (NSDragOperation)textInputDraggingEntered:(nonnull id<NSDraggingInfo>)draggingInfo {
-  if ([draggingInfo.draggingPasteboard availableTypeFromArray:self.registeredDraggedTypes]) {
-    return [self draggingEntered:draggingInfo];
-  }
-  return NSDragOperationNone;
-}
-
-- (void)textInputDraggingExited:(nonnull id<NSDraggingInfo>)draggingInfo {
-  if ([draggingInfo.draggingPasteboard availableTypeFromArray:self.registeredDraggedTypes]) {
-    [self draggingExited:draggingInfo];
-  }
-}
-
-- (BOOL)textInputShouldHandleDragOperation:(nonnull id<NSDraggingInfo>)draggingInfo {
-  if ([draggingInfo.draggingPasteboard availableTypeFromArray:self.registeredDraggedTypes]) {
-    [self performDragOperation:draggingInfo];
-    return NO;
-  }
-
-  return YES;
-}
-
-- (BOOL)textInputShouldHandleDeleteBackward:(nonnull id<RCTBackedTextInputViewProtocol>)sender {
-  return YES;
-}
-
-- (BOOL)textInputShouldHandleDeleteForward:(nonnull id<RCTBackedTextInputViewProtocol>)sender {
-  return YES;
-}
-
-- (BOOL)textInputShouldHandleKeyEvent:(nonnull NSEvent *)event {
-  return ![self handleKeyboardEvent:event];
-}
-
-- (BOOL)textInputShouldHandlePaste:(nonnull id<RCTBackedTextInputViewProtocol>)sender {
-  NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
-  NSPasteboardType fileType = [pasteboard availableTypeFromArray:@[NSFilenamesPboardType, NSPasteboardTypePNG, NSPasteboardTypeTIFF]];
-  NSArray<NSPasteboardType>* pastedTypes = ((RCTUITextView*) _backedTextInputView).readablePasteboardTypes;
-
-  // If there's a fileType that is of interest, notify JS. Also blocks notifying JS if it's a text paste
-  if (_eventEmitter && fileType != nil && [pastedTypes containsObject:fileType]) {
-    auto const &textInputEventEmitter = *std::static_pointer_cast<TextInputEventEmitter const>(_eventEmitter);
-  DataTransfer dataTransfer = [self dataTransferForPasteboard:pasteboard];
-  textInputEventEmitter.onPaste({.dataTransfer = std::move(dataTransfer)});
-  }
-
-  // Only allow pasting text.
-  return fileType == nil;
-}
-
-#endif // macOS]
-
 #pragma mark - RCTBackedTextInputDelegate (UIScrollViewDelegate)
 
-- (void)scrollViewDidScroll:(RCTUIScrollView *)scrollView // [macOS]
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView
 {
   if (_eventEmitter) {
-#if !TARGET_OS_OSX // [macOS]
     static_cast<const TextInputEventEmitter &>(*_eventEmitter).onScroll([self _textInputMetrics]);
-#else // [macOS
-    static_cast<const TextInputEventEmitter &>(*_eventEmitter).onScroll([self _textInputMetricsWithScrollView:scrollView]);
-#endif // macOS]
   }
 }
 
@@ -777,12 +543,7 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
 
 - (void)focus
 {
-#if !TARGET_OS_OSX // [macOS]
   [_backedTextInputView becomeFirstResponder];
-#else // [macOS
-  NSWindow *window = [_backedTextInputView window];
-  [window makeFirstResponder:_backedTextInputView];
-#endif // macOS]
 
   const auto &props = static_cast<const TextInputProps &>(*_props);
 
@@ -801,14 +562,7 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
 
 - (void)blur
 {
-#if !TARGET_OS_OSX // [macOS]
   [_backedTextInputView resignFirstResponder];
-#else // [macOS
-  NSWindow *window = [_backedTextInputView window];
-  if ([window firstResponder] == _backedTextInputView.responder) {
-    [window makeFirstResponder:nil];
-  }
-#endif // macOS]
 }
 
 - (void)setTextAndSelection:(NSInteger)eventCount
@@ -827,7 +581,6 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
     [self _updateState];
   }
 
-#if !TARGET_OS_OSX // [macOS]
   UITextPosition *startPosition = [_backedTextInputView positionFromPosition:_backedTextInputView.beginningOfDocument
                                                                       offset:start];
   UITextPosition *endPosition = [_backedTextInputView positionFromPosition:_backedTextInputView.beginningOfDocument
@@ -841,17 +594,11 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
                                                         toPosition:range.end];
     [_backedTextInputView scrollRangeToVisible:NSMakeRange(offsetEnd, 0)];
   }
-#else // [macOS
-  NSInteger startPosition = MIN(start, end);
-  NSInteger endPosition = MAX(start, end);
-  [_backedTextInputView setSelectedTextRange:NSMakeRange(startPosition, endPosition - startPosition) notifyDelegate:YES];
-#endif // macOS]
   _comingFromJS = NO;
 }
 
 #pragma mark - Default input accessory view
 
-#if TARGET_OS_IOS // [macOS] [visionOS] Input Accessory Views are only a concept on iOS
 - (NSString *)returnKeyTypeToString:(UIReturnKeyType)returnKeyType
 {
   switch (returnKeyType) {
@@ -924,6 +671,7 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
 
   _hasInputAccessoryView = shouldHaveInputAccessoryView;
 
+#if !TARGET_OS_TV
   if (shouldHaveInputAccessoryView) {
     NSString *buttonLabel = inputAccessoryViewButtonLabel != nil ? inputAccessoryViewButtonLabel
                                                                  : [self returnKeyTypeToString:returnKeyType];
@@ -941,6 +689,7 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
   } else {
     _backedTextInputView.inputAccessoryView = nil;
   }
+#endif
 
   if (_backedTextInputView.isFirstResponder) {
     [_backedTextInputView reloadInputViews];
@@ -955,7 +704,6 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
     [_backedTextInputView endEditing:YES];
   }
 }
-#endif // [macOS] [visionOS]
 
 #pragma mark - Other
 
@@ -964,38 +712,15 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
   return {
       .text = RCTStringFromNSString(_backedTextInputView.attributedText.string),
       .selectionRange = [self _selectionRange],
-      .eventCount = static_cast<int>(_mostRecentEventCount),
-#if !TARGET_OS_OSX // [macOS]
+      .contentSize = RCTSizeFromCGSize(_backedTextInputView.contentSize),
       .contentOffset = RCTPointFromCGPoint(_backedTextInputView.contentOffset),
       .contentInset = RCTEdgeInsetsFromUIEdgeInsets(_backedTextInputView.contentInset),
-#else // [macOS
-      .contentOffset = {.x = 0, .y = 0},
-      .contentInset = EdgeInsets{},
-#endif // macOS]
-      .contentSize = RCTSizeFromCGSize(_backedTextInputView.contentSize),
+      .eventCount = static_cast<int>(_mostRecentEventCount),
       .layoutMeasurement = RCTSizeFromCGSize(_backedTextInputView.bounds.size),
-      .zoomScale = 1,
+      .zoomScale = _backedTextInputView.zoomScale,
   };
 }
 
-#if TARGET_OS_OSX // [macOS
-- (TextInputEventEmitter::Metrics)_textInputMetricsWithScrollView:(RCTUIScrollView *)scrollView
-{
-  TextInputEventEmitter::Metrics metrics = [self _textInputMetrics];
-
-  if (scrollView) {
-    metrics.contentOffset = RCTPointFromCGPoint(scrollView.contentOffset);
-    metrics.contentInset = RCTEdgeInsetsFromUIEdgeInsets(scrollView.contentInset);
-    metrics.contentSize = RCTSizeFromCGSize(scrollView.contentSize);
-    metrics.layoutMeasurement = RCTSizeFromCGSize(scrollView.bounds.size);
-    metrics.zoomScale = scrollView.zoomScale ?: 1;
-  }
-
-  return metrics;
-}
-#endif // macOS]
-
-
 - (void)_updateState
 {
   if (!_state) {
@@ -1012,17 +737,12 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
 
 - (AttributedString::Range)_selectionRange
 {
-#if !TARGET_OS_OSX // [macOS]
   UITextRange *selectedTextRange = _backedTextInputView.selectedTextRange;
   NSInteger start = [_backedTextInputView offsetFromPosition:_backedTextInputView.beginningOfDocument
                                                   toPosition:selectedTextRange.start];
   NSInteger end = [_backedTextInputView offsetFromPosition:_backedTextInputView.beginningOfDocument
                                                 toPosition:selectedTextRange.end];
   return AttributedString::Range{.location = (int)start, .length = (int)(end - start)};
-#else // [macOS
-  NSRange selectedTextRange = [_backedTextInputView selectedTextRange];
-  return AttributedString::Range{(int)selectedTextRange.location, (int)selectedTextRange.length};
-#endif // macOS]
 }
 
 - (void)_restoreTextSelection
@@ -1036,7 +756,6 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
   if (!selection.has_value()) {
     return;
   }
-#if !TARGET_OS_OSX // [macOS]
   auto start = [_backedTextInputView positionFromPosition:_backedTextInputView.beginningOfDocument
                                                    offset:selection->start];
   auto end = [_backedTextInputView positionFromPosition:_backedTextInputView.beginningOfDocument offset:selection->end];
@@ -1045,29 +764,16 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
     return;
   }
   [_backedTextInputView setSelectedTextRange:range notifyDelegate:YES];
-#endif // [macOS]
 }
 
 - (void)_setAttributedString:(NSAttributedString *)attributedString
 {
-#if TARGET_OS_OSX // [macOS
-  // When the text view displays temporary content (e.g. completions, accents), do not update the attributed string.
-  if (_backedTextInputView.hasMarkedText) {
-    return;
-  }
-#endif // macOS]
-
   if ([self _textOf:attributedString equals:_backedTextInputView.attributedText]) {
     return;
   }
-#if !TARGET_OS_OSX // [macOS]
   UITextRange *selectedRange = _backedTextInputView.selectedTextRange;
-#else
-  NSRange selectedRange = [_backedTextInputView selectedTextRange];
-#endif // macOS]
   NSInteger oldTextLength = _backedTextInputView.attributedText.string.length;
   _backedTextInputView.attributedText = attributedString;
-#if !TARGET_OS_OSX // [macOS]
   // Updating the UITextView attributedText, for example changing the lineHeight, the color or adding
   // a new paragraph with \n, causes the cursor to move to the end of the Text and scroll.
   // This is fixed by restoring the cursor position and scrolling to that position (iOS issue 652653).
@@ -1087,16 +793,6 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
   [self _restoreTextSelectionAndIgnoreCaretChange:YES];
   [self _updateTypingAttributes];
   _lastStringStateWasUpdatedWith = attributedString;
-#else // [macOS
-  if (selectedRange.length == 0) {
-    // Maintaining a cursor position relative to the end of the old text.
-    NSInteger start = selectedRange.location;
-    NSInteger offsetFromEnd = oldTextLength - start;
-    NSInteger newOffset = _backedTextInputView.attributedText.length - offsetFromEnd;
-    [_backedTextInputView setSelectedTextRange:NSMakeRange(newOffset, 0)
-                                      notifyDelegate:YES];
-  }
-#endif // macOS]
 }
 
 // Ensure that newly typed text will inherit any custom attributes. We follow the logic of RN Android, where attributes
@@ -1105,7 +801,6 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
 // https://github.com/facebook/react-native/blob/3102a58df38d96f3dacef0530e4dbb399037fcd2/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/SetSpanOperation.kt#L30
 - (void)_updateTypingAttributes
 {
-#if !TARGET_OS_OSX // [macOS
   if (_backedTextInputView.attributedText.length > 0 && _backedTextInputView.selectedTextRange != nil) {
     NSUInteger offsetStart = [_backedTextInputView offsetFromPosition:_backedTextInputView.beginningOfDocument
                                                            toPosition:_backedTextInputView.selectedTextRange.start];
@@ -1114,40 +809,28 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
     _backedTextInputView.typingAttributes = [_backedTextInputView.attributedText attributesAtIndex:samplePoint
                                                                                     effectiveRange:NULL];
   }
-#else // [macOS
-  // TODO
-#endif // macOS]
 }
 
 - (void)scrollCursorIntoView
 {
-#if !TARGET_OS_OSX // [macOS
   UITextRange *selectedRange = _backedTextInputView.selectedTextRange;
   if (selectedRange.empty) {
     NSInteger offsetStart = [_backedTextInputView offsetFromPosition:_backedTextInputView.beginningOfDocument
                                                           toPosition:selectedRange.start];
     [_backedTextInputView scrollRangeToVisible:NSMakeRange(offsetStart, 0)];
   }
-#else // [macOS
-  // TODO
-#endif // macOS]
 }
 
 - (void)_setMultiline:(BOOL)multiline
 {
   [_backedTextInputView removeFromSuperview];
-#if !TARGET_OS_OSX // [macOS]
-  RCTUIView<RCTBackedTextInputViewProtocol> *backedTextInputView = multiline ? [RCTUITextView new] : [RCTUITextField new];
-#else // [macOS
-  RCTPlatformView<RCTBackedTextInputViewProtocol> *backedTextInputView = multiline ? [RCTWrappedTextView new] : [RCTUITextField new];
-#endif // macOS]
+  UIView<RCTBackedTextInputViewProtocol> *backedTextInputView = multiline ? [RCTUITextView new] : [RCTUITextField new];
   backedTextInputView.frame = _backedTextInputView.frame;
   RCTCopyBackedTextInput(_backedTextInputView, backedTextInputView);
   _backedTextInputView = backedTextInputView;
   [self addSubview:_backedTextInputView];
 }
 
-#if !TARGET_OS_OSX // [macOS]
 - (void)_setShowSoftInputOnFocus:(BOOL)showSoftInputOnFocus
 {
   if (showSoftInputOnFocus) {
@@ -1161,31 +844,9 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
     }
   } else {
     // Hides keyboard, but keeps blinking cursor.
-    _backedTextInputView.inputView = [UIView new];
-  }
-}
-#endif // macOS]
-
-#if TARGET_OS_OSX // [macOS
-- (void)_setSecureTextEntry:(BOOL)secureTextEntry
-{
-  [_backedTextInputView removeFromSuperview];
-  RCTPlatformView<RCTBackedTextInputViewProtocol> *backedTextInputView = secureTextEntry ? [RCTUISecureTextField new] : [RCTUITextField new];
-  backedTextInputView.frame = _backedTextInputView.frame;
-  RCTCopyBackedTextInput(_backedTextInputView, backedTextInputView);
-
-  // Copy the text field specific properties if we came from a single line input before the switch
-  if ([_backedTextInputView isKindOfClass:[RCTUITextField class]]) {
-    RCTUITextField *previousTextField = (RCTUITextField *)_backedTextInputView;
-    RCTUITextField *newTextField = (RCTUITextField *)backedTextInputView;
-    newTextField.textAlignment = previousTextField.textAlignment;
-    newTextField.text = previousTextField.text;
+    _backedTextInputView.inputView = [RCTUIView new];  // [macOS] needs a flipped, layer-backed view
   }
-
-  _backedTextInputView = backedTextInputView;
-  [self addSubview:_backedTextInputView];
 }
-#endif // macOS]
 
 - (BOOL)_textOf:(NSAttributedString *)newText equals:(NSAttributedString *)oldText
 {
@@ -1210,18 +871,9 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
                    }];
 
   BOOL shouldFallbackToBareTextComparison =
-#if !TARGET_OS_OSX // [macOS]
-  [_backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"dictation"] ||
-  [_backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"ko-KR"] ||
-  _backedTextInputView.markedTextRange ||
-  _backedTextInputView.isSecureTextEntry ||
-#else // [macOS
-  // There are multiple Korean input sources (2-Set, 3-Set, etc). Check substring instead instead
-  [[[_backedTextInputView inputContext] selectedKeyboardInputSource] containsString:@"com.apple.inputmethod.Korean"] ||
-  [_backedTextInputView hasMarkedText] ||
-  [_backedTextInputView isKindOfClass:[NSSecureTextField class]] ||
-#endif // macOS]
-  fontHasBeenUpdatedBySystem;
+      [_backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"dictation"] ||
+      [_backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"ko-KR"] ||
+      _backedTextInputView.markedTextRange || _backedTextInputView.isSecureTextEntry || fontHasBeenUpdatedBySystem;
 
   if (shouldFallbackToBareTextComparison) {
     return [newText.string isEqualToString:oldText.string];