react-native-tvos 0.86.0-0rc3 → 0.86.0-2

package/Libraries/Core/ReactNativeVersion.js

@@ -29,7 +29,7 @@ export default class ReactNativeVersion {
   static major: number = 0;
   static minor: number = 86;
   static patch: number = 0;
-  static prerelease: string | null = '0rc3';
+  static prerelease: string | null = '2';
 
   static getVersionString(): string {
     return `${this.major}.${this.minor}.${this.patch}${this.prerelease != null ? `-${this.prerelease}` : ''}`;

package/Libraries/LogBox/UI/LogBoxButton.js

@@ -60,8 +60,6 @@ component LogBoxButton(
       focusable={true}
       hitSlop={hitSlop}
       onPress={onPress}
-      onPressIn={() => setPressed(true)}
-      onPressOut={() => setPressed(false)}>
       onFocus={() => {
         setFocused(true);
         onFocusChange?.(true);

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(86),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"0rc3",
+                  RCTVersionPrerelease: @"2",
                   };
   });
   return __rnVersion;

package/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm

@@ -1274,8 +1274,20 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
     CGPoint targetContentOffset = isHorizontalSnap
         ? CGPointMake(targetOffset, scrollView.contentOffset.y)
         : CGPointMake(scrollView.contentOffset.x, targetOffset);
+    // Where the focused item should snap to. We don't scroll to it here: this view's
+    // scrollViewWillEndDragging:withVelocity:targetContentOffset: override sets
+    // *targetContentOffset = preferredContentOffset. On tvOS the focus engine routes its
+    // focus-driven scroll through that delegate, so the item snaps to this offset via the
+    // engine's own scroll, even when it's already on screen. An explicit setContentOffset here
+    // would just scroll a second time.
+    // https://developer.apple.com/documentation/uikit/uiscrollviewdelegate/scrollviewwillenddragging(_:withvelocity:targetcontentoffset:)
+    // https://developer.apple.com/forums/thread/22103?answerId=73300022#73300022
     self.preferredContentOffset = targetContentOffset;
-    [_scrollView setContentOffset:targetContentOffset animated:scrollProps.scrollAnimationEnabled];
+    if (!scrollProps.scrollAnimationEnabled) {
+        // Animations off: RCTEnhancedScrollView.didUpdateFocusInContext blocks the engine's
+        // scroll, so the delegate never fires — set the offset directly.
+        scrollView.contentOffset = targetContentOffset;
+    }
 }
 
 - (void)didUpdateFocusInContext:(UIFocusUpdateContext *)context

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

@@ -771,12 +771,23 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
 
 - (void)_setAttributedString:(NSAttributedString *)attributedString
 {
+#if TARGET_OS_TV
+  // Attribute-free string prevents the tvOS keyboard from inheriting the component's small font.
+  if ([attributedString.string isEqualToString:_backedTextInputView.attributedText.string]) {
+    return;
+  }
+#else
   if ([self _textOf:attributedString equals:_backedTextInputView.attributedText]) {
     return;
   }
+#endif
   UITextRange *selectedRange = _backedTextInputView.selectedTextRange;
   NSInteger oldTextLength = _backedTextInputView.attributedText.string.length;
+#if TARGET_OS_TV
+  _backedTextInputView.attributedText = [[NSAttributedString alloc] initWithString:attributedString.string];
+#else
   _backedTextInputView.attributedText = attributedString;
+#endif
   // 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).

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

@@ -630,11 +630,10 @@ static BOOL RCTLayerTransformCollapsesAxis(CALayer *layer)
       // [self isTVFocusGuide] is false when autofocus and destinations are not used, so we cannot use that.
       // Generally speaking, it would happen for any non-collapsable `View`.
     } else if (context.previouslyFocusedView == self) {
-      [self disableDirectionalFocusGuides];
       [coordinator addCoordinatedAnimations:^(void){
           [self removeParallaxMotionEffects];
           if (self->_eventEmitter) self->_eventEmitter->onBlur();
-      } completion:^(void){}];
+      } completion:^(void){[self disableDirectionalFocusGuides];}];
       [self resignFirstResponder];
     }
 }

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.86.0-0rc3
+VERSION_NAME=0.86.0-2
 react.internal.publishingGroup=io.github.react-native-tvos
 react.internal.hermesPublishingGroup=com.facebook.hermes
 

package/ReactAndroid/src/main/java/com/facebook/react/modules/core/ReactAndroidHWInputDeviceHelper.java

@@ -63,6 +63,7 @@ public class ReactAndroidHWInputDeviceHelper {
           .put(KeyEvent.KEYCODE_9, "9")
           .put(KeyEvent.KEYCODE_CHANNEL_DOWN, "channelDown")
           .put(KeyEvent.KEYCODE_CHANNEL_UP, "channelUp")
+          .put(KeyEvent.KEYCODE_DEL, "delete")
           .put(KeyEvent.KEYCODE_BOOKMARK, "bookmark")
           .put(KeyEvent.KEYCODE_AVR_INPUT, "avrInput")
           .put(KeyEvent.KEYCODE_AVR_POWER, "avrPower")

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.kt

@@ -15,6 +15,6 @@ public object ReactNativeVersion {
     "major" to 0,
     "minor" to 86,
     "patch" to 0,
-    "prerelease" to "0rc3"
+    "prerelease" to "2"
   )
 }

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -22,7 +22,7 @@ struct ReactNativeVersionType {
   int32_t Major = 0;
   int32_t Minor = 86;
   int32_t Patch = 0;
-  std::string_view Prerelease = "0rc3";
+  std::string_view Prerelease = "2";
 };
 
 constexpr ReactNativeVersionType ReactNativeVersion;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.86.0-0rc3",
+  "version": "0.86.0-2",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -154,7 +154,7 @@
     "featureflags-check": "node ./scripts/featureflags/index.js --verify-unchanged"
   },
   "peerDependencies": {
-    "@react-native/jest-preset": "0.86.0-rc.3",
+    "@react-native/jest-preset": "0.86.0",
     "@types/react": "^19.1.1",
     "react": "^19.2.3"
   },
@@ -167,12 +167,12 @@
     }
   },
   "dependencies": {
-    "@react-native/assets-registry": "0.86.0-rc.3",
-    "@react-native/codegen": "0.86.0-rc.3",
-    "@react-native/community-cli-plugin": "0.86.0-rc.3",
-    "@react-native/gradle-plugin": "0.86.0-rc.3",
-    "@react-native/js-polyfills": "0.86.0-rc.3",
-    "@react-native/normalize-colors": "0.86.0-rc.3",
+    "@react-native/assets-registry": "0.86.0",
+    "@react-native/codegen": "0.86.0",
+    "@react-native/community-cli-plugin": "0.86.0",
+    "@react-native/gradle-plugin": "0.86.0",
+    "@react-native/js-polyfills": "0.86.0",
+    "@react-native/normalize-colors": "0.86.0",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -198,7 +198,7 @@
     "whatwg-fetch": "^3.0.0",
     "ws": "^7.5.10",
     "yargs": "^17.6.2",
-    "@react-native-tvos/virtualized-lists": "0.86.0-0rc3"
+    "@react-native-tvos/virtualized-lists": "0.86.0-2"
   },
   "codegenConfig": {
     "libraries": [