react-native-tvos 0.85.3-2 → 0.85.3-3

package/Libraries/Core/ReactNativeVersion.js

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

package/Libraries/LogBox/UI/LogBoxButton.js

@@ -12,11 +12,9 @@ import type {EdgeInsetsProp} from '../../StyleSheet/EdgeInsetsPropType';
 import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
 import type {GestureResponderEvent} from '../../Types/CoreEventTypes';
 
-import TouchableHighlight from '../../Components/Touchable/TouchableHighlight';
-import TouchableWithoutFeedback from '../../Components/Touchable/TouchableWithoutFeedback';
+import Pressable from '../../Components/Pressable/Pressable';
 import View from '../../Components/View/View';
 import StyleSheet from '../../StyleSheet/StyleSheet';
-import Platform from '../../Utilities/Platform';
 import * as LogBoxStyle from './LogBoxStyle';
 import * as React from 'react';
 import {useState} from 'react';
@@ -30,9 +28,10 @@ component LogBoxButton(
   children?: React.Node,
   hitSlop?: ?EdgeInsetsProp,
   onPress?: ?(event: GestureResponderEvent) => void,
+  onFocusChange?: ?(focused: boolean) => void,
   style?: ViewStyleProp,
 ) {
-  const [pressed, setPressed] = useState(false);
+  const [focused, setFocused] = useState(false);
 
   let resolvedBackgroundColor = backgroundColor;
   if (!resolvedBackgroundColor) {
@@ -42,41 +41,54 @@ component LogBoxButton(
     };
   }
 
-  const content = (
-    <View
-      id={id}
-      style={StyleSheet.compose(
-        {
-          backgroundColor: pressed
-            ? resolvedBackgroundColor.pressed
-            : resolvedBackgroundColor.default,
-        },
-        style,
-      )}>
-      {children}
-    </View>
-  );
+  if (onPress == null) {
+    return (
+      <View
+        id={id}
+        style={StyleSheet.compose(
+          {backgroundColor: resolvedBackgroundColor.default},
+          style,
+        )}>
+        {children}
+      </View>
+    );
+  }
 
-  return onPress == null ? (
-    content
-  ) : Platform.isTV ? (
-    <TouchableHighlight
-      tvParallaxProperties={{enabled: false}}
-      hitSlop={hitSlop}
-      onPress={onPress}
-      onPressIn={() => setPressed(true)}
-      onPressOut={() => setPressed(false)}>
-      {content}
-    </TouchableHighlight>
-) : (
-    <TouchableWithoutFeedback
+  return (
+    <Pressable
+      id={id}
+      focusable={true}
       hitSlop={hitSlop}
       onPress={onPress}
-      onPressIn={() => setPressed(true)}
-      onPressOut={() => setPressed(false)}>
-      {content}
-    </TouchableWithoutFeedback>
+      onFocus={() => {
+        setFocused(true);
+        onFocusChange?.(true);
+      }}
+      onBlur={() => {
+        setFocused(false);
+        onFocusChange?.(false);
+      }}
+      style={({pressed}) =>
+        StyleSheet.compose(
+          {
+            backgroundColor: pressed
+              ? resolvedBackgroundColor.pressed
+              : resolvedBackgroundColor.default,
+          },
+          focused ? StyleSheet.compose(style, styles.focusRing) : style,
+        )
+      }>
+      {children}
+    </Pressable>
   );
 }
 
+const styles = StyleSheet.create({
+  focusRing: {
+    borderWidth: 2,
+    borderColor: LogBoxStyle.getTextColor(0.6),
+    borderRadius: 4,
+  },
+});
+
 export default LogBoxButton;

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(85),
                   RCTVersionPatch: @(3),
-                  RCTVersionPrerelease: @"2",
+                  RCTVersionPrerelease: @"3",
                   };
   });
   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/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.85.3-2
+VERSION_NAME=0.85.3-3
 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 85,
     "patch" to 3,
-    "prerelease" to "2"
+    "prerelease" to "3"
   )
 }

package/ReactCommon/cxxreact/ReactNativeVersion.h

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.85.3-2",
+  "version": "0.85.3-3",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -198,7 +198,7 @@
     "whatwg-fetch": "^3.0.0",
     "ws": "^7.5.10",
     "yargs": "^17.6.2",
-    "@react-native-tvos/virtualized-lists": "0.85.3-2"
+    "@react-native-tvos/virtualized-lists": "0.85.3-3"
   },
   "codegenConfig": {
     "libraries": [