stuff

Author: Saadnajmi

packages/react-native/Libraries/Text/BaseText/RCTBaseTextViewManager.mm

@@ -60,6 +60,7 @@ - (RCTShadowView *)shadowView
 
 #if TARGET_OS_OSX // [macOS
 RCT_REMAP_SHADOW_PROPERTY(cursor, textAttributes.cursor, RCTCursor)
+RCT_REMAP_SHADOW_PROPERTY(href, textAttributes.href, NSString)
 #endif // macOS]
 
 @end

packages/react-native/Libraries/Text/RCTTextAttributes.h

@@ -61,6 +61,7 @@ extern NSString *const RCTTextAttributesTagAttributeName;
 
 #if TARGET_OS_OSX // [macOS
 @property (nonatomic, assign) RCTCursor cursor;
+@property (nonatomic, copy, nullable) NSString *href;
 #endif // macOS]
 
 #pragma mark - Inheritance

packages/react-native/Libraries/Text/RCTTextAttributes.mm

@@ -111,6 +111,7 @@ - (void)applyTextAttributes:(RCTTextAttributes *)textAttributes
       textAttributes->_textTransform != RCTTextTransformUndefined ? textAttributes->_textTransform : _textTransform;
 #if TARGET_OS_OSX // [macOS
   _cursor = textAttributes->_cursor != RCTCursorAuto ? textAttributes->_cursor : _cursor;
+  _href = textAttributes->_href ?: _href;
 #endif // macOS]
 }
 
@@ -237,6 +238,9 @@ - (NSParagraphStyle *)effectiveParagraphStyle
   if (_cursor != RCTCursorAuto) {
     attributes[NSCursorAttributeName] = NSCursorFromRCTCursor(_cursor);
   }
+  if (_href) {
+    attributes[NSLinkAttributeName] = [RCTConvert NSURL:_href];
+  }
 #endif // macOS]
 
   return [attributes copy];

packages/react-native/Libraries/Text/Text/RCTTextViewManager.mm

@@ -35,6 +35,8 @@ @implementation RCTTextViewManager {
 
 RCT_EXPORT_VIEW_PROPERTY(selectable, BOOL)
 
+RCT_EXPORT_OSX_VIEW_PROPERTY(focusable, BOOL)
+
 - (void)setBridge:(RCTBridge *)bridge
 {
   [super setBridge:bridge];

packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm

@@ -221,6 +221,13 @@ - (void)setAttributedText:(NSAttributedString *)attributedText
 
   textNeedsUpdate = ([self textOf:attributedTextCopy equals:backedTextInputViewTextCopy] == NO);
 
+#if TARGET_OS_OSX // [macOS
+  // If we are in a language that uses conversion (e.g. Japanese), ignore updates if we have unconverted text.
+  if ([self.backedTextInputView hasMarkedText]) {
+    textNeedsUpdate = NO;
+  }
+#endif // [macOS
+
   if ((eventLag == 0 || self.backedTextInputView.ghostTextChanging) && textNeedsUpdate) { // [macOS]
 #if !TARGET_OS_OSX // [macOS]
     UITextRange *selection = self.backedTextInputView.selectedTextRange;
@@ -229,6 +236,8 @@ - (void)setAttributedText:(NSAttributedString *)attributedText
 #endif // macOS]
     NSAttributedString *oldAttributedText = [self.backedTextInputView.attributedText copy];
     NSInteger oldTextLength = oldAttributedText.string.length;
+    NSInteger oldSelectionStart = selection.location; // [macOS]
+    NSInteger oldSelectionEnd = selection.location + selection.length; // [macOS]
 
     // Ghost text changes should not be part of the undo stack
     if (!self.backedTextInputView.ghostTextChanging) {
@@ -238,6 +247,7 @@ - (void)setAttributedText:(NSAttributedString *)attributedText
       [self.backedTextInputView.undoManager registerUndoWithTarget:self handler:^(RCTBaseTextInputView *strongSelf) {
         strongSelf.attributedText = oldAttributedTextWithoutGhostText;
         [strongSelf textInputDidChange];
+        [strongSelf setSelectionStart:oldSelectionStart selectionEnd:oldSelectionEnd]; // [macOS]
       }];
     }
 
@@ -315,7 +325,7 @@ - (void)setSelection:(RCTTextSelection *)selection
   NSInteger length = end - selection.start;
   NSRange selectedTextRange = NSMakeRange(start, length);
 #endif // macOS]
-  
+
   NSInteger eventLag = _nativeEventCount - _mostRecentEventCount;
   if (eventLag == 0 && !RCTTextSelectionEqual(previousSelectedTextRange, selectedTextRange)) { // [macOS]
     [backedTextInputView setSelectedTextRange:selectedTextRange notifyDelegate:NO];
@@ -341,7 +351,7 @@ - (void)setSelectionStart:(NSInteger)start selectionEnd:(NSInteger)end
 #else // [macOS
   NSInteger startPosition = MIN(start, end);
   NSInteger endPosition = MAX(start, end);
-  [self.backedTextInputView setSelectedTextRange:NSMakeRange(startPosition, endPosition - startPosition) notifyDelegate:NO];
+  [self.backedTextInputView setSelectedTextRange:NSMakeRange(startPosition, endPosition - startPosition) notifyDelegate:YES];
 #endif // macOS]
 }
 
@@ -605,7 +615,7 @@ - (void)submitOnKeyDownIfNeeded:(NSEvent *)event
       }
     }
   }
-  
+
   if (shouldSubmit) {
     if (_onSubmitEditing) {
       _onSubmitEditing(@{});
@@ -706,7 +716,7 @@ - (NSString *)textInputShouldChangeText:(NSString *)text inRange:(NSRange)range
         [backedTextInputView setSelectedTextRange:NSMakeRange(range.location + allowedLength, 0)
                                    notifyDelegate:YES];
 #endif // macOS]
-        
+
         [self textInputDidChange];
       }
 
@@ -761,17 +771,20 @@ - (void)textInputDidChangeSelection
 {
   self.ghostText = nil; // [macOS]
 
-  if (!_onSelectionChange || self.backedTextInputView.ghostTextChanging) { // [macOS]
-    return;
-  }
+  // Run this async to match iOS order of events where we get the onChange first and then onSelectionChange.
+  dispatch_async(dispatch_get_main_queue(), ^{ // [macOS]
+    if (!_onSelectionChange || self.backedTextInputView.ghostTextChanging) {
+      return;
+    }
 
-  RCTTextSelection *selection = self.selection;
+    RCTTextSelection *selection = self.selection;
 
-  _onSelectionChange(@{
-    @"selection" : @{
-      @"start" : @(selection.start),
-      @"end" : @(selection.end),
-    },
+    _onSelectionChange(@{
+      @"selection": @{
+        @"start": @(selection.start),
+        @"end": @(selection.end),
+      },
+    });
   });
 }
 
@@ -834,7 +847,7 @@ - (BOOL)textInputShouldHandlePaste:(__unused id)sender
   NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
   NSPasteboardType fileType = [pasteboard availableTypeFromArray:@[NSFilenamesPboardType, NSPasteboardTypePNG, NSPasteboardTypeTIFF]];
   NSArray<NSPasteboardType>* pastedTypes = ((RCTUITextView*) self.backedTextInputView).readablePasteboardTypes;
-      
+
   // If there's a fileType that is of interest, notify JS. Also blocks notifying JS if it's a text paste
   if (_onPaste && fileType != nil && [pastedTypes containsObject:fileType]) {
     _onPaste([self dataTransferInfoFromPasteboard:pasteboard]);

packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm

@@ -161,6 +161,10 @@ - (void)setBridge:(RCTBridge *)bridge
     if (eventLag != 0) {
       return;
     }
+    if (!value) { // [macOS]
+      [view setSelectionStart:start selectionEnd:end];
+      return;
+    }
     RCTExecuteOnUIManagerQueue(^{
       RCTBaseTextInputShadowView *shadowView =
           (RCTBaseTextInputShadowView *)[self.bridge.uiManager shadowViewForReactTag:viewTag];

packages/react-native/Libraries/Text/TextNativeComponent.js

@@ -48,7 +48,9 @@ const textViewConfig = {
     dataDetectorType: true,
     android_hyphenationFrequency: true,
     lineBreakStrategyIOS: true,
+    focusable: true, // [macOS]
     tooltip: true, // [macOS]
+    href: true, // [macOS]
   },
   directEventTypes: {
     topTextLayout: {

packages/react-native/React/Base/RCTRootView.m

@@ -204,6 +204,13 @@ - (BOOL)canBecomeFirstResponder
 #endif // macOS]
 }
 
+#if TARGET_OS_OSX // [macOS
+- (void)viewDidEndLiveResize {
+  [super viewDidEndLiveResize];
+  [self setNeedsLayout];
+}
+#endif // macOS]
+
 - (void)setLoadingView:(RCTUIView *)loadingView // [macOS]
 {
   _loadingView = loadingView;