react-native-tvos 0.76.0-0rc1 → 0.76.0-0rc2

package/Libraries/Components/TextInput/RCTTextInputViewConfig.js

@@ -104,6 +104,7 @@ const RCTTextInputViewConfig = {
     textTransform: true,
     textAlign: true,
     fontFamily: true,
+    lineBreakModeIOS: true,
     lineHeight: true,
     isHighlighted: true,
     writingDirection: true,

package/Libraries/Core/ReactNativeVersion.js

@@ -17,7 +17,7 @@ const version: $ReadOnly<{
   major: 0,
   minor: 76,
   patch: 0,
-  prerelease: '0rc1',
+  prerelease: '0rc2',
 };
 
 module.exports = {version};

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(76),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"0rc1",
+                  RCTVersionPrerelease: @"0rc2",
                   };
   });
   return __rnVersion;

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

@@ -740,6 +740,29 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
   [self _handleFinishedScrolling:scrollView];
 }
 
+- (void)didMoveToWindow
+{
+  [super didMoveToWindow];
+
+  if (!self.window) {
+    // The view is being removed, ensure that the scroll end event is dispatched
+    [self _handleScrollEndIfNeeded];
+  }
+}
+
+- (void)_handleScrollEndIfNeeded
+{
+  if (_scrollView.isDecelerating || !_scrollView.isTracking) {
+    if (!_eventEmitter) {
+      return;
+    }
+    static_cast<const ScrollViewEventEmitter &>(*_eventEmitter).onMomentumScrollEnd([self _scrollViewMetrics]);
+
+    [self _updateStateWithContentOffset];
+    _isUserTriggeredScrolling = NO;
+  }
+}
+
 - (void)_handleFinishedScrolling:(UIScrollView *)scrollView
 {
   [self _forceDispatchNextScrollEvent];

package/React/Views/ScrollView/RCTScrollView.m

@@ -896,6 +896,26 @@ RCT_SCROLL_EVENT_HANDLER(scrollViewDidScrollToTop, onScrollToTop)
   RCT_FORWARD_SCROLL_EVENT(scrollViewDidEndZooming : scrollView withView : view atScale : scale);
 }
 
+- (void)didMoveToWindow
+{
+  [super didMoveToWindow];
+  if (self.window == nil) {
+    // Check if the ScrollView was in motion
+    if (_scrollView.isDecelerating || !_scrollView.isTracking) {
+      // Trigger the onMomentumScrollEnd event manually
+      RCT_SEND_SCROLL_EVENT(onMomentumScrollEnd, nil);
+      // We can't use the RCT_FORWARD_SCROLL_EVENT here beacuse the `_cmd` parameter passed
+      // to `respondsToSelector` is the current method - so it will be `didMoveToWindow` - and not
+      // `scrollViewDidEndDecelerating` that is passed.
+      for (NSObject<UIScrollViewDelegate> *scrollViewListener in _scrollListeners) {
+        if ([scrollViewListener respondsToSelector:@selector(scrollViewDidEndDecelerating:)]) {
+          [scrollViewListener scrollViewDidEndDecelerating:_scrollView];
+        }
+      }
+    }
+  }
+}
+
 - (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
 {
   // Fire a final scroll event

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.76.0-0rc1
+VERSION_NAME=0.76.0-0rc2
 react.internal.publishingGroup=io.github.react-native-tvos
 
 android.useAndroidX=true

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

@@ -18,5 +18,5 @@ public class ReactNativeVersion {
       "major", 0,
       "minor", 76,
       "patch", 0,
-      "prerelease", "0rc1");
+      "prerelease", "0rc2");
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java

@@ -7,6 +7,8 @@
 
 package com.facebook.react.views.view;
 
+import android.content.Context;
+import android.content.pm.PackageManager;
 import android.graphics.Rect;
 import android.util.Log;
 import android.view.View;
@@ -94,6 +96,14 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
   @ReactProp(name = "accessible")
   public void setAccessible(ReactViewGroup view, boolean accessible) {
     view.setFocusable(accessible);
+    // This is required to handle Android TV/ Fire TV Devices that are Touch Enabled as well as LeanBack
+    // https://developer.android.com/reference/android/view/View#requestFocus(int,%20android.graphics.Rect)
+    // ** A view will not actually take focus if it is not focusable (isFocusable() returns false), **
+    // ** or if it is focusable and it is not focusable in touch mode (isFocusableInTouchMode()) **
+    // ** while the device is in touch mode.  **
+    if (hasTouchScreen(view.getContext())) {
+      view.setFocusableInTouchMode(accessible);
+    }
   }
 
   @ReactProp(name = "hasTVPreferredFocus")
@@ -498,6 +508,14 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
     }
     root.setFocusDestinations(fd);
   }
+  
+  /**
+   * Utility function to help capture Android TV/ Fire TV Devices with Touch Support
+   */
+  private boolean hasTouchScreen(Context context) {
+    PackageManager pm = context.getPackageManager();
+    return pm.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN);
+  }
 
   @ReactProp(name = "autoFocus")
   public void setAutoFocusTV(ReactViewGroup view, boolean autoFocus) {

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -18,7 +18,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 76;
   int32_t Patch = 0;
-  std::string_view Prerelease = "0rc1";
+  std::string_view Prerelease = "0rc2";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/cli.js

@@ -109,7 +109,7 @@ function warnWithDeprecationSchedule() {
 ${chalk.yellow('⚠️')} The \`init\` command is deprecated.
 The behavior will be changed on ${chalk.white.bold(CLI_DEPRECATION_DATE.toLocaleDateString())} ${emphasis(`(${daysRemaining} day${daysRemaining > 1 ? 's' : ''})`)}.
 
-- Switch to ${chalk.dim('npx @react-native-community/cli init')} for the identical behavior.
+- Switch to ${chalk.grey.bold('npx @react-native-community/cli init')} for the identical behavior.
 - Refer to the documentation for information about alternative tools: ${chalk.dim('https://reactnative.dev/docs/getting-started')}`);
 }
 
@@ -117,11 +117,10 @@ function warnWithDeprecated() {
   if (!isInitCommand) {
     return;
   }
-
   console.warn(`
 🚨️ The \`init\` command is deprecated.
 
-- Switch to ${chalk.dim('npx @react-native-community/cli init')} for the identical behavior.
+- Switch to ${chalk.grey.bold('npx @react-native-community/cli init')} for the identical behavior.
 - Refer to the documentation for information about alternative tools: ${chalk.dim('https://reactnative.dev/docs/getting-started')}`);
 }
 
@@ -174,7 +173,7 @@ async function main() {
 
   const isDeprecated =
     CLI_DEPRECATION_DATE.getTime() <= new Date().getTime() ||
-    currentVersion.startsWith('0.76');
+    currentVersion.startsWith('0.77');
 
   /**
    * This command is now deprecated. We will continue to proxy commands to @react-native-community/cli, but it
@@ -191,8 +190,13 @@ async function main() {
       warnWithDeprecated();
       // We only exit if the user calls `init` and it's deprecated. All other cases should proxy to to @react-native-community/cli.
       // Be careful with this as it can break a lot of users.
+      console.warn(`${chalk.green('Exiting...')}`);
       process.exit(1);
-    } else if (currentVersion.startsWith('0.75')) {
+    } else if (
+      currentVersion.startsWith('0.75') ||
+      currentVersion.startsWith('0.76')
+    ) {
+      // We check deprecation schedule only for 0.75 and 0.76 and 0.77 is expected to land in Jan 2025.
       warnWithDeprecationSchedule();
     }
     warnWhenRunningInit();

package/jest-preset.js

@@ -15,7 +15,11 @@ module.exports = {
     platforms: ['android', 'ios', 'native'],
   },
   transform: {
-    '^.+\\.(js|ts|tsx)$': 'babel-jest',
+    '^.+\\.(js)$': [
+      'babel-jest',
+      {plugins: ['babel-plugin-syntax-hermes-parser']},
+    ],
+    '^.+\\.(ts|tsx)$': 'babel-jest',
     '^.+\\.(bmp|gif|jpg|jpeg|mp4|png|psd|svg|webp)$': require.resolve(
       './jest/assetFileTransformer.js',
     ),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.76.0-0rc1",
+  "version": "0.76.0-0rc2",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -110,16 +110,18 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.6.3",
-    "@react-native/assets-registry": "0.76.0-rc.1",
-    "@react-native/codegen": "0.76.0-rc.1",
-    "@react-native/community-cli-plugin": "0.76.0-rc.1",
-    "@react-native/gradle-plugin": "0.76.0-rc.1",
-    "@react-native/js-polyfills": "0.76.0-rc.1",
-    "@react-native/normalize-colors": "0.76.0-rc.1",
-    "@react-native-tvos/virtualized-lists": "0.76.0-0rc1",
+    "@react-native/assets-registry": "0.76.0-rc.2",
+    "@react-native/codegen": "0.76.0-rc.2",
+    "@react-native/community-cli-plugin": "0.76.0-rc.2",
+    "@react-native/gradle-plugin": "0.76.0-rc.2",
+    "@react-native/js-polyfills": "0.76.0-rc.2",
+    "@react-native/normalize-colors": "0.76.0-rc.2",
+    "@react-native-tvos/virtualized-lists": "0.76.0-0rc2",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
+    "babel-jest": "^29.7.0",
+    "babel-plugin-syntax-hermes-parser": "^0.23.1",
     "base64-js": "^1.5.1",
     "chalk": "^4.0.0",
     "commander": "^12.0.0",

package/scripts/cocoapods/utils.rb

@@ -700,10 +700,18 @@ class ReactNativePodsUtils
             map[field] = "$(inherited)" + flag
         else
             unless map[field].include?(flag)
-                map[field] = map[field] + flag
+                if map[field].instance_of? String
+                    map[field] = map[field] + flag
+                elsif map[field].instance_of? Array
+                    map[field].push(flag)
+                end
             end
             unless map[field].include?("$(inherited)")
-                map[field] = "$(inherited) " + map[field]
+                if map[field].instance_of? String
+                    map[field] = "$(inherited) " + map[field]
+                elsif map[field].instance_of? Array
+                    map[field].unshift("$(inherited)")
+                end
             end
         end
     end

package/scripts/react-native-xcode.sh

@@ -92,6 +92,8 @@ fi
 
 [ -z "$CLI_PATH" ] && CLI_PATH="$REACT_NATIVE_DIR/scripts/bundle.js"
 
+[ -z "$BUNDLE_COMMAND" ] && BUNDLE_COMMAND="bundle"
+
 [ -z "$COMPOSE_SOURCEMAP_PATH" ] && COMPOSE_SOURCEMAP_PATH="$REACT_NATIVE_DIR/scripts/compose-source-maps.js"
 
 if [[ -z "$BUNDLE_CONFIG" ]]; then

package/sdks/hermes-engine/hermes-engine.podspec

@@ -8,7 +8,7 @@ require_relative "./hermes-utils.rb"
 
 react_native_path = File.dirname(Pod::Executable.execute_command('node', ['-p',
   'require.resolve(
-  "react-native-tvos",
+  "react-native",
     {paths: [process.argv[1]]},
   )', __dir__]).strip
 )

package/sdks/hermes-engine/utils/build-ios-framework.sh

@@ -52,10 +52,24 @@ function build_framework {
   fi
 }
 
+# Allows RNTV CI to optionally build Vision OS framework
+function set_include_vision {
+    if [[ "$INCLUDE_VISION_OS" == "0" || "$INCLUDE_VISION_OS" == "false" || "$INCLUDE_VISION_OS" == "FALSE" ]]; then
+        include_vision=0
+    else
+        include_vision=1
+    fi
+}
+
 # group the frameworks together to create a universal framework
 function build_universal_framework {
     if [ ! -d destroot/Library/Frameworks/universal/hermes.xcframework ]; then
-        create_universal_framework "iphoneos" "iphonesimulator" "catalyst" "xros" "xrsimulator" "appletvos" "appletvsimulator"
+        set_include_vision
+        if [[ $include_vision == 1 ]]; then
+            create_universal_framework "iphoneos" "iphonesimulator" "catalyst" "xros" "xrsimulator" "appletvos" "appletvsimulator"
+        else
+            create_universal_framework "iphoneos" "iphonesimulator" "catalyst" "appletvos" "appletvsimulator"
+        fi
     else
         echo "Skipping; Clean \"destroot\" to rebuild".
     fi
@@ -65,14 +79,17 @@ function build_universal_framework {
 # this is used to preserve backward compatibility
 function create_framework {
     if [ ! -d destroot/Library/Frameworks/universal/hermes.xcframework ]; then
+        set_include_vision
+
         build_framework "iphoneos"
         build_framework "iphonesimulator"
         build_framework "appletvos"
         build_framework "appletvsimulator"
         build_framework "catalyst"
-        build_framework "xros"
-        build_framework "xrsimulator"
-
+        if [[ $include_vision == 1 ]]; then
+            build_framework "xros"
+            build_framework "xrsimulator"
+        fi
         build_universal_framework
     else
         echo "Skipping; Clean \"destroot\" to rebuild".