react-native-tvos 0.87.1-0 → 0.88.0-0rc2

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

@@ -25,6 +25,7 @@ void RCTCopyBackedTextInput(
   toTextInput.attributedText = RCTSanitizeAttributedString(fromTextInput.attributedText);
   toTextInput.placeholder = fromTextInput.placeholder;
   toTextInput.placeholderColor = fromTextInput.placeholderColor;
+  toTextInput.tintColor = fromTextInput.tintColor;
   toTextInput.textContainerInset = fromTextInput.textContainerInset;
   toTextInput.inputAccessoryView = fromTextInput.inputAccessoryView;
   toTextInput.textInputDelegate = fromTextInput.textInputDelegate;

package/React/Fabric/Mounting/ComponentViews/UnimplementedComponent/RCTUnimplementedNativeComponentView.mm

@@ -11,6 +11,8 @@
 #import <react/renderer/components/FBReactNativeSpec/EventEmitters.h>
 #import <react/renderer/components/FBReactNativeSpec/Props.h>
 
+#import <React/RCTLog.h>
+
 using namespace facebook::react;
 
 @implementation RCTUnimplementedNativeComponentView {
@@ -24,12 +26,14 @@ using namespace facebook::react;
 
     CGRect bounds = self.bounds;
     _label = [[UILabel alloc] initWithFrame:bounds];
+#if RCT_DEV
     _label.backgroundColor = [UIColor colorWithRed:1.0 green:0.0 blue:0.0 alpha:0.3];
+    _label.textColor = [UIColor whiteColor];
+#endif
     _label.layoutMargins = UIEdgeInsetsMake(12, 12, 12, 12);
     _label.lineBreakMode = NSLineBreakByWordWrapping;
     _label.numberOfLines = 0;
     _label.textAlignment = NSTextAlignmentCenter;
-    _label.textColor = [UIColor whiteColor];
 
     self.contentView = _label;
   }
@@ -50,7 +54,20 @@ using namespace facebook::react;
   const auto &newViewProps = static_cast<const UnimplementedNativeViewProps &>(*props);
 
   if (oldViewProps.name != newViewProps.name) {
-    _label.text = [NSString stringWithFormat:@"'%s' is not Fabric compatible yet.", newViewProps.name.c_str()];
+    const std::string &name = newViewProps.name;
+#if RCT_DEV
+    _label.text = [NSString stringWithFormat:@"'%s' is not Fabric compatible yet.", name.c_str()];
+#endif
+    // Skip the empty initial prop-default pass — only log once the real component
+    // name has been propagated.
+    if (!name.empty()) {
+      // Log in all builds so missing components are reported in production.
+      RCTLogError(
+          @"UnimplementedNativeView: '%s' is not Fabric compatible yet. "
+           "Ensure the iOS library has migrated this component to Fabric and registered "
+           "a plugin entry for it.",
+          name.c_str());
+    }
   }
 
   [super updateProps:props oldProps:oldProps];

package/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.mm

@@ -15,6 +15,7 @@
 #import <react/renderer/components/unimplementedview/UnimplementedViewShadowNode.h>
 
 #import <React/RCTConversions.h>
+#import <React/RCTLog.h>
 
 #import "RCTFabricComponentsPlugins.h"
 
@@ -30,11 +31,13 @@ using namespace facebook::react;
     _props = UnimplementedViewShadowNode::defaultSharedProps();
 
     _label = [[UILabel alloc] initWithFrame:self.bounds];
+#if RCT_DEV
     _label.backgroundColor = [UIColor colorWithRed:1.0 green:0.0 blue:0.0 alpha:0.3];
+    _label.textColor = [UIColor whiteColor];
+#endif
     _label.lineBreakMode = NSLineBreakByCharWrapping;
     _label.numberOfLines = 0;
     _label.textAlignment = NSTextAlignmentCenter;
-    _label.textColor = [UIColor whiteColor];
     _label.allowsDefaultTighteningForTruncation = YES;
     _label.adjustsFontSizeToFitWidth = YES;
 
@@ -57,8 +60,19 @@ using namespace facebook::react;
   const auto &newUnimplementedViewProps = static_cast<const UnimplementedViewProps &>(*props);
 
   if (oldUnimplementedViewProps.getComponentName() != newUnimplementedViewProps.getComponentName()) {
-    _label.text =
-        [NSString stringWithFormat:@"Unimplemented component: <%s>", newUnimplementedViewProps.getComponentName()];
+    const char *componentName = newUnimplementedViewProps.getComponentName();
+#if RCT_DEV
+    _label.text = [NSString stringWithFormat:@"Unimplemented component: <%s>", componentName];
+#endif
+    // Skip the empty initial prop-default pass — only log once the real component
+    // name has been propagated.
+    if (componentName != nullptr && *componentName != '\0') {
+      // Log in all builds so missing components are reported in production.
+      RCTLogError(
+          @"UnimplementedView: native component '%s' is not registered. "
+           "Ensure the iOS library defines a plugin entry for this component.",
+          componentName);
+    }
   }
 
   [super updateProps:props oldProps:oldProps];

package/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h

@@ -96,6 +96,11 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask NS_REQUIRES_SUPER;
 - (void)prepareForRecycle NS_REQUIRES_SUPER;
 - (UIView *)betterHitTest:(CGPoint)point withEvent:(UIEvent *)event;
+#if TARGET_OS_TV
+- (UIView *)viewToFocus;
+- (void)focus;
+- (void)blur;
+#endif
 
 /*
  * This is the label that would be coopted by another element

package/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm

@@ -12,6 +12,8 @@
 #import <QuartzCore/QuartzCore.h>
 #import <objc/runtime.h>
 #import <ranges>
+#import <string_view>
+#import <unordered_set>
 
 #import <RCTSwiftUIWrapper/RCTSwiftUIContainerViewWrapper.h>
 #import <React/RCTAssert.h>
@@ -21,6 +23,7 @@
 #import <React/RCTConversions.h>
 #import <React/RCTLinearGradient.h>
 #import <React/RCTLocalizedString.h>
+#import <React/RCTLog.h>
 #import <React/RCTRadialGradient.h>
 #import <react/featureflags/ReactNativeFeatureFlags.h>
 #import <React/RCTDefines.h>
@@ -57,6 +60,70 @@ using namespace facebook::react;
 
 const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
 
+#if !TARGET_OS_TV
+// iOS Full Keyboard Access only focuses a view when it is an accessibility
+// element that also exposes an interactive trait. Views that surface their
+// interactivity through a grouping accessibility element (rather than the
+// underlying control) are otherwise skipped by the focus engine, leaving
+// keyboard-only users unable to reach them.
+//
+// The trait mask alone is not sufficient, because it is a lossy projection of
+// the role: `checkbox`, `radio`, `combobox`, `menuitem`, `spinbutton`, `tab`
+// and friends deliberately carry no interactive trait, since VoiceOver conveys
+// them through `accessibilityValue` instead. The role is therefore consulted
+// as well, otherwise those controls stay unreachable by keyboard.
+static BOOL RCTViewIsInteractiveAccessibilityElement(UIView *view, const ViewProps &props)
+{
+  if (!view.isAccessibilityElement) {
+    return NO;
+  }
+
+  UIAccessibilityTraits interactiveTraits = UIAccessibilityTraitButton | UIAccessibilityTraitLink |
+      UIAccessibilityTraitSearchField | UIAccessibilityTraitKeyboardKey | UIAccessibilityTraitAdjustable;
+  if ((view.accessibilityTraits & interactiveTraits) != 0) {
+    return YES;
+  }
+
+  // `role` wins over the legacy `accessibilityRole` when both are set, matching
+  // how the traits themselves are resolved.
+  if (props.role != Role::None) {
+    static const std::unordered_set<Role> interactiveRoles{
+        Role::Button,
+        Role::Checkbox,
+        Role::Combobox,
+        Role::Link,
+        Role::Menuitem,
+        Role::Option,
+        Role::Radio,
+        Role::Searchbox,
+        Role::Slider,
+        Role::Spinbutton,
+        Role::Switch,
+        Role::Tab,
+        Role::Treeitem};
+    return interactiveRoles.contains(props.role);
+  }
+
+  static const std::unordered_set<std::string_view> interactiveAccessibilityRoles{
+      "adjustable",
+      "button",
+      "checkbox",
+      "combobox",
+      "dropdownlist",
+      "imagebutton",
+      "keyboardkey",
+      "link",
+      "menuitem",
+      "radio",
+      "search",
+      "spinbutton",
+      "switch",
+      "tab",
+      "togglebutton"};
+  return interactiveAccessibilityRoles.contains(props.accessibilityRole);
+}
+#endif
+
 @implementation RCTViewComponentView {
   UIColor *_backgroundColor;
   CALayer *_backgroundColorLayer;
@@ -486,10 +553,14 @@ static BOOL RCTLayerTransformCollapsesAxis(CALayer *layer)
 
 - (BOOL)canBecomeFocused
 {
+#if !TARGET_OS_TV
+  return RCTViewIsInteractiveAccessibilityElement(self) || _props->isTVSelectable;
+#else
   if ([self isTVFocusGuide]) {
     return NO;
   }
   return _props->isTVSelectable;
+#endif
 }
 
 // Directional focus destinations are looked up in the containing root view when
@@ -755,15 +826,18 @@ static BOOL RCTLayerTransformCollapsesAxis(CALayer *layer)
         childComponentView,
         @(index),
         @([childComponentView.superview tag]));
+#ifndef NS_BLOCK_ASSERTIONS
+    NSArray<UIView *> *containerSubviews = self.currentContainerView.subviews;
+    BOOL isIndexInBounds = index >= 0 && (NSUInteger)index < containerSubviews.count;
     RCTAssert(
-        (self.currentContainerView.subviews.count > index) &&
-            [self.currentContainerView.subviews objectAtIndex:index] == childComponentView,
+        isIndexInBounds && [containerSubviews objectAtIndex:index] == childComponentView,
         @"Attempt to unmount a view which has a different index. (parent: %@, child: %@, index: %@, actual index: %@, tag at index: %@)",
         self,
         childComponentView,
         @(index),
-        @([self.currentContainerView.subviews indexOfObject:childComponentView]),
-        @([[self.currentContainerView.subviews objectAtIndex:index] tag]));
+        @([containerSubviews indexOfObject:childComponentView]),
+        isIndexInBounds ? @([[containerSubviews objectAtIndex:index] tag]) : @"out of bounds");
+#endif
   }
 
   [childComponentView removeFromSuperview];
@@ -1041,18 +1115,6 @@ static BOOL RCTLayerTransformCollapsesAxis(CALayer *layer)
         RCTUIAccessibilityTraitsFromAccessibilityTraits(newViewProps.accessibilityTraits);
   }
 
-  // `accessibilityState`
-  if (oldViewProps.accessibilityState != newViewProps.accessibilityState) {
-    self.accessibilityTraits &= ~(UIAccessibilityTraitNotEnabled | UIAccessibilityTraitSelected);
-    const auto accessibilityState = newViewProps.accessibilityState.value_or(AccessibilityState{});
-    if (accessibilityState.selected) {
-      self.accessibilityTraits |= UIAccessibilityTraitSelected;
-    }
-    if (accessibilityState.disabled) {
-      self.accessibilityTraits |= UIAccessibilityTraitNotEnabled;
-    }
-  }
-
   // `accessibilityIgnoresInvertColors`
   if (oldViewProps.accessibilityIgnoresInvertColors != newViewProps.accessibilityIgnoresInvertColors) {
     self.accessibilityIgnoresInvertColors = newViewProps.accessibilityIgnoresInvertColors;
@@ -1405,7 +1467,7 @@ static BOOL RCTLayerTransformCollapsesAxis(CALayer *layer)
   _isJSResponder = NO;
   _removeClippedSubviews = NO;
   _reactSubviews = [NSMutableArray new];
-  _layoutMetrics = {};
+  _layoutMetrics = EmptyLayoutMetrics;
 }
 
 - (void)setPropKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN:(NSSet<NSString *> *_Nullable)props
@@ -1692,6 +1754,13 @@ static RCTBorderStyle RCTBorderStyleFromOutlineStyle(OutlineStyle outlineStyle)
     } else {
       // Can't accurately calculate box shadow, so fall back to pixel-based shadow.
       layer.shadowPath = nil;
+
+      RCTLogAdvice(
+          @"View #%ld of type %@ has a shadow set but cannot calculate "
+           "shadow efficiently. Consider setting a solid background color to "
+           "fix this or applying the shadow to a more specific component.",
+          (long)self.tag,
+          [self class]);
     }
   } else {
     layer.shadowPath = nil;
@@ -1809,7 +1878,10 @@ static RCTBorderStyle RCTBorderStyleFromOutlineStyle(OutlineStyle outlineStyle)
     _outlineLayer.frame = CGRectInset(
         layer.bounds, -_props->outlineOffset - _props->outlineWidth, -_props->outlineOffset - _props->outlineWidth);
 
-    if (areBorderRadiiCircular(borderMetrics.borderRadii) && borderMetrics.borderRadii.topLeft.horizontal == 0) {
+    // Core Animation can only draw solid contours, so dotted and dashed outlines
+    // have to be drawn with Core Graphics, the same way non-solid borders are.
+    if (_props->outlineStyle == OutlineStyle::Solid && areBorderRadiiCircular(borderMetrics.borderRadii) &&
+        borderMetrics.borderRadii.topLeft.horizontal == 0) {
       UIColor *outlineColor = RCTUIColorFromSharedColor(_props->outlineColor);
       _outlineLayer.borderWidth = _props->outlineWidth;
       _outlineLayer.borderColor = outlineColor.CGColor;
@@ -2436,9 +2508,15 @@ static NSString *RCTRecursiveAccessibilityLabel(UIView *view)
 #endif
 }
 
+- (UIView *)viewToFocus
+{
+  return self;
+}
+
 - (void)focus
 {
-  [self becomeFirstResponder];
+  UIView *viewToFocus = [self viewToFocus];
+  [viewToFocus becomeFirstResponder];
 
 #if TARGET_OS_TV
   RCTSurfaceHostingProxyRootView *rootView = [self containingRootView];
@@ -2446,7 +2524,7 @@ static NSString *RCTRecursiveAccessibilityLabel(UIView *view)
     return;
   }
 
-  rootView.reactPreferredFocusedView = self;
+  rootView.reactPreferredFocusedView = viewToFocus;
   [rootView setNeedsFocusUpdate];
   [rootView updateFocusIfNeeded];
 #endif

package/React/Fabric/RCTConversions.h

@@ -34,7 +34,8 @@ inline NSString *RCTNSStringFromString(
     const std::string &string,
     const NSStringEncoding &encoding = NSUTF8StringEncoding)
 {
-  return [NSString stringWithCString:string.c_str() encoding:encoding] ?: @"";
+  NSString *result = [[NSString alloc] initWithBytes:string.data() length:string.size() encoding:encoding];
+  return result != nil ? result : @"";
 }
 
 inline NSString *_Nullable RCTNSStringFromStringNilIfEmpty(
@@ -46,7 +47,14 @@ inline NSString *_Nullable RCTNSStringFromStringNilIfEmpty(
 
 inline std::string RCTStringFromNSString(NSString *string)
 {
-  return std::string{string.UTF8String ?: ""};
+  if (string == nil) {
+    return "";
+  }
+  NSData *data = [string dataUsingEncoding:NSUTF8StringEncoding];
+  if (data == nil) {
+    return "";
+  }
+  return std::string{static_cast<const char *>(data.bytes), data.length};
 }
 
 inline UIColor *_Nullable RCTUIColorFromSharedColor(const facebook::react::SharedColor &sharedColor)

package/React/Fabric/RCTSurfaceTouchHandler.mm

@@ -8,6 +8,7 @@
 #import "RCTSurfaceTouchHandler.h"
 
 #import <React/RCTIdentifierPool.h>
+#import <React/RCTLog.h>
 #import <React/RCTUtils.h>
 #import <React/RCTViewComponentView.h>
 
@@ -206,8 +207,8 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithTarget : (id)target action : (SEL)act
 {
   for (UITouch *touch in touches) {
     auto iterator = _activeTouches.find(touch);
-    RCTAssert(iterator != _activeTouches.end(), @"Inconsistency between local and UIKit touch registries");
     if (iterator == _activeTouches.end()) {
+      RCTLogWarn(@"Inconsistency between local and UIKit touch registries");
       continue;
     }
 
@@ -219,8 +220,8 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithTarget : (id)target action : (SEL)act
 {
   for (UITouch *touch in touches) {
     auto iterator = _activeTouches.find(touch);
-    RCTAssert(iterator != _activeTouches.end(), @"Inconsistency between local and UIKit touch registries");
     if (iterator == _activeTouches.end()) {
+      RCTLogWarn(@"Inconsistency between local and UIKit touch registries");
       continue;
     }
     auto &activeTouch = iterator->second;
@@ -236,8 +237,8 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithTarget : (id)target action : (SEL)act
 
   for (UITouch *touch in touches) {
     auto iterator = _activeTouches.find(touch);
-    RCTAssert(iterator != _activeTouches.end(), @"Inconsistency between local and UIKit touch registries");
     if (iterator == _activeTouches.end()) {
+      RCTLogWarn(@"Inconsistency between local and UIKit touch registries");
       continue;
     }
     activeTouches.push_back(iterator->second);

package/React/Profiler/RCTProfile.m

@@ -407,9 +407,7 @@ void RCTProfileUnhookModules(RCTBridge *bridge)
           };
       RCTProfileControlsWindow.hidden = YES;
       dispatch_async(dispatch_get_main_queue(), ^{
-        [[[[RCTSharedApplication() delegate] window] rootViewController] presentViewController:activityViewController
-                                                                                      animated:YES
-                                                                                    completion:nil];
+        [[RCTKeyWindow() rootViewController] presentViewController:activityViewController animated:YES completion:nil];
       });
 #else
       RCTProfileControlsWindow.hidden = NO;

package/React/React-RCTFBReactNativeSpec.podspec

@@ -68,6 +68,7 @@ Pod::Spec.new do |s|
     add_dependency(ss, "React-debug")
     add_dependency(ss, "React-rendererdebug")
     add_dependency(ss, "React-utils")
+    add_dependency(ss, "React-cxxstableapi")
     add_dependency(ss, "React-graphics", :additional_framework_paths => ["react/renderer/graphics/platform/ios"])
     add_dependency(ss, "React-Fabric", :additional_framework_paths => [
       "react/renderer/components/view/platform/cxx",
@@ -92,4 +93,6 @@ fi
       EOS
     }
   ]
+
+  mark_as_react_native_build(s)
 end

package/React/React-RCTFabric.podspec

@@ -104,6 +104,7 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-networking", :framework_name => 'React_networking')
   add_dependency(s, "React-renderercss")
   add_dependency(s, "React-RCTFBReactNativeSpec")
+  add_dependency(s, "React-cxxstableapi")
 
   depend_on_js_engine(s)
   add_rn_third_party_dependencies(s)
@@ -113,4 +114,6 @@ Pod::Spec.new do |s|
     test_spec.source_files = podspec_sources("Tests/**/*.{mm}", "")
     test_spec.framework = "XCTest"
   end
+
+  mark_as_react_native_build(s)
 end

package/React/Runtime/React-RCTRuntime.podspec

@@ -69,4 +69,6 @@ Pod::Spec.new do |s|
   depend_on_js_engine(s)
   add_rn_third_party_dependencies(s)
   add_rncore_dependency(s)
+
+  mark_as_react_native_build(s)
 end

package/React/Tests/Mounting/RCTScrollViewComponentViewTests.mm

@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <React/RCTScrollViewComponentView.h>
+#import <XCTest/XCTest.h>
+#import <react/renderer/components/scrollview/ScrollViewProps.h>
+#import <react/renderer/components/scrollview/ScrollViewShadowNode.h>
+
+using facebook::react::Props;
+using facebook::react::ScrollViewProps;
+using facebook::react::ScrollViewShadowNode;
+
+#if TARGET_OS_IOS
+
+static Props::Shared makeScrollViewProps(bool automaticallyAdjustKeyboardInsets)
+{
+  auto props = std::make_shared<ScrollViewProps>();
+  props->automaticallyAdjustKeyboardInsets = automaticallyAdjustKeyboardInsets;
+  return props;
+}
+
+@interface RCTScrollViewComponentView (Tests)
+- (void)_keyboardWillChangeFrame:(NSNotification *)notification;
+@end
+
+@interface RCTScrollViewComponentViewTests : XCTestCase
+@end
+
+@implementation RCTScrollViewComponentViewTests
+
+- (void)testAutomaticallyAdjustKeyboardInsetsAcrossRecycling
+{
+  RCTScrollViewComponentView *view = [[RCTScrollViewComponentView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
+  auto props = makeScrollViewProps(true);
+  [view updateProps:props oldProps:ScrollViewShadowNode::defaultSharedProps()];
+
+  NSNotification *notification = [NSNotification
+      notificationWithName:UIKeyboardWillChangeFrameNotification
+                    object:nil
+                  userInfo:@{
+                    UIKeyboardAnimationDurationUserInfoKey : @0,
+                    UIKeyboardAnimationCurveUserInfoKey : @(UIViewAnimationCurveLinear),
+                    UIKeyboardFrameBeginUserInfoKey : [NSValue valueWithCGRect:CGRectMake(0, 100, 100, 50)],
+                    UIKeyboardFrameEndUserInfoKey : [NSValue valueWithCGRect:CGRectMake(0, 50, 100, 50)],
+                  }];
+
+  [view _keyboardWillChangeFrame:notification];
+  XCTAssertEqual(view.scrollView.contentInset.bottom, 50);
+
+  [view prepareForRecycle];
+  UIEdgeInsets insetsAfterRecycle = view.scrollView.contentInset;
+  [view _keyboardWillChangeFrame:notification];
+  XCTAssertTrue(UIEdgeInsetsEqualToEdgeInsets(view.scrollView.contentInset, insetsAfterRecycle));
+
+  [view updateProps:props oldProps:nullptr];
+  [view _keyboardWillChangeFrame:notification];
+  XCTAssertEqual(view.scrollView.contentInset.bottom, 50);
+}
+
+@end
+
+#endif