not-react-native-macos 0.87.1-rc.8 → 0.87.1-rc.9

package/Libraries/Text/TextNativeComponent.js

@@ -48,6 +48,13 @@ const textViewConfig = {
     dataDetectorType: true,
     android_hyphenationFrequency: true,
     lineBreakStrategyIOS: true,
+    // [macOS] Text is a view too: ParagraphProps derives from ViewProps, which
+    // on macOS already carries these. Only the view config stood in the way --
+    // a prop missing from validAttributes never reaches C++ at all.
+    tooltip: true,
+    focusable: true,
+    enableFocusRing: true,
+    // macOS]
   },
   directEventTypes: {
     topTextLayout: {

package/Libraries/Text/TextProps.js

@@ -234,9 +234,22 @@ type TextBaseProps = Readonly<{
  *
  * @build-types emit-as-interface Uniwind compatibility
  */
+// [macOS] Text carries the same three view props react-native-macos gives it.
+// They work because ParagraphProps derives from ViewProps, which on macOS is
+// HostPlatformViewProps.
+export type TextPropsMacOS = Readonly<{
+  /** @platform macos */
+  tooltip?: ?string,
+  /** @platform macos */
+  focusable?: ?boolean,
+  /** @platform macos */
+  enableFocusRing?: ?boolean,
+}>;
+
 export type TextProps = Readonly<{
   ...TextPointerEventProps,
   ...TextPropsIOS,
+  ...TextPropsMacOS, // [macOS]
   ...TextPropsAndroid,
   ...TextBaseProps,
   ...AccessibilityProps,

package/macos/UIKitCompat/UIKit/UIText.m

@@ -81,6 +81,8 @@
 @implementation RCTUIKitCompatTextField {
   NSDictionary<NSAttributedStringKey, id> *_typingAttributes;
   NSMutableArray<NSArray *> *_controlEventTargets;
+  NSString *_placeholder;
+  BOOL _reportedEndEditing;
 }
 
 UIKIT_COMPAT_TEXT_INPUT_GEOMETRY
@@ -333,13 +335,23 @@ UIKIT_COMPAT_TEXT_INPUT_GEOMETRY
   return nil;
 }
 
+/**
+ * The plain and attributed placeholders are one value on NSTextField: setting
+ * `placeholderAttributedString` clears `placeholderString`, and the reverse.
+ * UIKit keeps both, and React Native relies on that -- it sets `placeholder`,
+ * builds `attributedPlaceholder` from it, and rebuilds that again whenever the
+ * text attributes change. Reading the plain one back through AppKit returns nil
+ * the second time round, so the placeholder is rebuilt as empty and silently
+ * disappears. Hold the string here instead.
+ */
 - (NSString *)placeholder
 {
-  return self.placeholderString;
+  return _placeholder ?: self.placeholderString;
 }
 
 - (void)setPlaceholder:(NSString *)placeholder
 {
+  _placeholder = [placeholder copy];
   self.placeholderString = placeholder;
 }
 
@@ -431,6 +443,7 @@ UIKIT_COMPAT_TEXT_INPUT_GEOMETRY
 - (void)textDidBeginEditing:(NSNotification *)notification
 {
   [super textDidBeginEditing:notification];
+  _reportedEndEditing = NO;
   [self uikitCompat_sendActionsForControlEvents:UIControlEventEditingDidBegin];
 
   id<UITextFieldDelegate> delegate = [self uikitCompat_uiDelegate];
@@ -458,10 +471,21 @@ UIKIT_COMPAT_TEXT_INPUT_GEOMETRY
   BOOL submitted = movement.integerValue == NSReturnTextMovement;
   id<UITextFieldDelegate> delegate = [self uikitCompat_uiDelegate];
 
+  // AppKit ends editing on Return and then re-establishes the field editor with
+  // the text selected, so this runs again on the next click -- a second blur
+  // with no focus in between. Report the end once per editing session.
+  if (_reportedEndEditing) {
+    return;
+  }
+  _reportedEndEditing = YES;
+
   // Return is a submit before it is an end-of-editing, and the order matters:
   // onSubmitEditing should carry the text, which onBlur may go on to clear.
+  // The answer says whether the field should also give up focus: that is
+  // `submitBehavior`, which distinguishes `submit` from `blurAndSubmit`.
+  BOOL shouldBlurOnSubmit = NO;
   if (submitted && [delegate respondsToSelector:@selector(textFieldShouldReturn:)]) {
-    [delegate textFieldShouldReturn:self];
+    shouldBlurOnSubmit = [delegate textFieldShouldReturn:self];
   }
 
   UIControlEvents events = UIControlEventEditingDidEnd;
@@ -473,6 +497,17 @@ UIKIT_COMPAT_TEXT_INPUT_GEOMETRY
   if ([delegate respondsToSelector:@selector(textFieldDidEndEditing:)]) {
     [delegate textFieldDidEndEditing:self];
   }
+
+  if (submitted && shouldBlurOnSubmit) {
+    // Asynchronously: AppKit is still unwinding this edit, and taking the
+    // responder away underneath it leaves a caret drawn in a field that no
+    // longer has focus.
+    dispatch_async(dispatch_get_main_queue(), ^{
+      if (self.currentEditor != nil) {
+        [self.window makeFirstResponder:nil];
+      }
+    });
+  }
 }
 
 - (id<UITextDropDelegate>)textDropDelegate

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "not-react-native-macos",
-  "version": "0.87.1-rc.8",
+  "version": "0.87.1-rc.9",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {