react-native-tvos 0.73.0-0rc2 → 0.73.0-0rc3

package/Libraries/AppDelegate/RCTAppDelegate.mm

@@ -23,7 +23,7 @@
 #import <React/RCTSurfaceHostingProxyRootView.h>
 #import <React/RCTSurfacePresenter.h>
 #import <ReactCommon/RCTContextContainerHandling.h>
-#if RCT_USE_HERMES
+#if USE_HERMES
 #import <ReactCommon/RCTHermesInstance.h>
 #else
 #import <ReactCommon/RCTJscInstance.h>
@@ -295,7 +295,7 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
 
 - (std::shared_ptr<facebook::react::JSEngineInstance>)createJSEngineInstance
 {
-#if RCT_USE_HERMES
+#if USE_HERMES
   return std::make_shared<facebook::react::RCTHermesInstance>(_reactNativeConfig, nullptr);
 #else
   return std::make_shared<facebook::react::RCTJscInstance>();

package/Libraries/Components/TabBarIOS/RCTTabBarItemNativeComponent.js

@@ -10,7 +10,7 @@
 
 'use strict';
 
-const requireNativeComponent = require('../../ReactNative/requireNativeComponent');
+const requireNativeComponent = require('../../ReactNative/requireNativeComponent').default;
 
 import type {ViewProps} from '../View/ViewPropTypes';
 import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';

package/Libraries/Components/TabBarIOS/RCTTabBarNativeComponent.js

@@ -10,7 +10,7 @@
 
 'use strict';
 
-const requireNativeComponent = require('../../ReactNative/requireNativeComponent');
+const requireNativeComponent = require('../../ReactNative/requireNativeComponent').default;
 
 import type {ViewProps} from '../View/ViewPropTypes';
 import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';

package/Libraries/Core/ReactNativeVersion.js

@@ -13,5 +13,5 @@ exports.version = {
   major: 0,
   minor: 73,
   patch: 0,
-  prerelease: '0rc2',
+  prerelease: '0rc3',
 };

package/React/Base/RCTVersion.m

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

package/React/DevSupport/RCTInspectorDevServerHelper.mm

@@ -15,6 +15,8 @@
 #import <React/RCTDefines.h>
 #import <React/RCTInspectorPackagerConnection.h>
 
+#import <CommonCrypto/CommonCrypto.h>
+
 static NSString *const kDebuggerMsgDisable = @"{ \"id\":1,\"method\":\"Debugger.disable\" }";
 
 static NSString *getServerHost(NSURL *bundleURL)
@@ -40,16 +42,65 @@ static NSString *getServerHost(NSURL *bundleURL)
   return [NSString stringWithFormat:@"%@:%@", host, port];
 }
 
+static NSString *getSHA256(NSString *string)
+{
+  const char *str = string.UTF8String;
+  unsigned char result[CC_SHA256_DIGEST_LENGTH];
+  CC_SHA256(str, (CC_LONG)strlen(str), result);
+
+  return [NSString stringWithFormat:@"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+                                    result[0],
+                                    result[1],
+                                    result[2],
+                                    result[3],
+                                    result[4],
+                                    result[5],
+                                    result[6],
+                                    result[7],
+                                    result[8],
+                                    result[9],
+                                    result[10],
+                                    result[11],
+                                    result[12],
+                                    result[13],
+                                    result[14],
+                                    result[15],
+                                    result[16],
+                                    result[17],
+                                    result[18],
+                                    result[19]];
+}
+
+// Returns an opaque ID which is stable for the current combination of device and app, stable across installs,
+// and unique across devices.
+static NSString *getInspectorDeviceId()
+{
+  // A bundle ID uniquely identifies a single app throughout the system. [Source: Apple docs]
+  NSString *bundleId = [[NSBundle mainBundle] bundleIdentifier];
+
+  // An alphanumeric string that uniquely identifies a device to the app's vendor. [Source: Apple docs]
+  NSString *identifierForVendor = [[UIDevice currentDevice] identifierForVendor].UUIDString;
+
+  NSString *rawDeviceId = [NSString stringWithFormat:@"apple-%@-%@", identifierForVendor, bundleId];
+
+  return getSHA256(rawDeviceId);
+}
+
 static NSURL *getInspectorDeviceUrl(NSURL *bundleURL)
 {
   NSString *escapedDeviceName = [[[UIDevice currentDevice] name]
       stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet];
   NSString *escapedAppName = [[[NSBundle mainBundle] bundleIdentifier]
       stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet];
-  return [NSURL URLWithString:[NSString stringWithFormat:@"http://%@/inspector/device?name=%@&app=%@",
+
+  NSString *escapedInspectorDeviceId = [getInspectorDeviceId()
+      stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet];
+
+  return [NSURL URLWithString:[NSString stringWithFormat:@"http://%@/inspector/device?name=%@&app=%@&device=%@",
                                                          getServerHost(bundleURL),
                                                          escapedDeviceName,
-                                                         escapedAppName]];
+                                                         escapedAppName,
+                                                         escapedInspectorDeviceId]];
 }
 
 @implementation RCTInspectorDevServerHelper
@@ -70,8 +121,13 @@ static void sendEventToAllConnections(NSString *event)
   NSString *appId = [[[NSBundle mainBundle] bundleIdentifier]
       stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet];
 
-  NSURL *url = [NSURL
-      URLWithString:[NSString stringWithFormat:@"http://%@/open-debugger?appId=%@", getServerHost(bundleURL), appId]];
+  NSString *escapedInspectorDeviceId = [getInspectorDeviceId()
+      stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet];
+
+  NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"http://%@/open-debugger?appId=%@&device=%@",
+                                                               getServerHost(bundleURL),
+                                                               appId,
+                                                               escapedInspectorDeviceId]];
   NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
   [request setHTTPMethod:@"POST"];
 

package/React/Views/SafeAreaView/RCTSafeAreaView.m

@@ -57,7 +57,12 @@ static BOOL UIEdgeInsetsEqualToEdgeInsetsWithThreshold(UIEdgeInsets insets1, UIE
 
 - (void)setSafeAreaInsets:(UIEdgeInsets)safeAreaInsets
 {
-  if (UIEdgeInsetsEqualToEdgeInsetsWithThreshold(safeAreaInsets, _currentSafeAreaInsets, 1.0 / RCTScreenScale())) {
+  // Relayout with different padding may result in a close but slightly different result, amplified by Yoga rounding to
+  // physical pixel grid. To avoid infinite relayout, allow one physical pixel of difference, along with small amount of
+  // extra tolerance for FP error.
+  CGFloat tolerance = 1.0 / RCTScreenScale() + 0.01;
+
+  if (UIEdgeInsetsEqualToEdgeInsetsWithThreshold(safeAreaInsets, _currentSafeAreaInsets, tolerance)) {
     return;
   }
 

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.73.0-0rc2
+VERSION_NAME=0.73.0-0rc3
 
 # react.internal.publishingGroup=com.facebook.react
 # For TV use this group

package/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

@@ -1278,14 +1278,12 @@ public class ReactInstanceManager {
           uiManager.stopSurface(surfaceId);
         } else {
           FLog.w(ReactConstants.TAG, "Failed to stop surface, UIManager has already gone away");
-          reactRoot.getRootViewGroup().removeAllViews();
         }
       } else {
         ReactSoftExceptionLogger.logSoftException(
             TAG,
             new RuntimeException(
                 "detachRootViewFromInstance called with ReactRootView with invalid id"));
-        reactRoot.getRootViewGroup().removeAllViews();
       }
     } else {
       reactContext
@@ -1294,8 +1292,7 @@ public class ReactInstanceManager {
           .unmountApplicationComponentAtRootTag(reactRoot.getRootViewTag());
     }
 
-    // The view is no longer attached, so mark it as such by resetting its ID.
-    reactRoot.getRootViewGroup().setId(View.NO_ID);
+    clearReactRoot(reactRoot);
   }
 
   @ThreadConfined(UI)

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java

@@ -9,6 +9,7 @@ package com.facebook.react.devsupport;
 
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.provider.Settings;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
@@ -30,6 +31,9 @@ import com.facebook.react.packagerconnection.Responder;
 import com.facebook.react.util.RNLog;
 import java.io.File;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -244,13 +248,73 @@ public class DevServerHelper {
         mPackagerConnectionSettings.getDebugServerHost());
   }
 
+  private static String getSHA256(String string) {
+    MessageDigest digest = null;
+    try {
+      digest = MessageDigest.getInstance("SHA-256");
+    } catch (NoSuchAlgorithmException e) {
+      throw new AssertionError("Could not get standard SHA-256 algorithm", e);
+    }
+    digest.reset();
+    byte[] result;
+    try {
+      result = digest.digest(string.getBytes("UTF-8"));
+    } catch (UnsupportedEncodingException e) {
+      throw new AssertionError("This environment doesn't support UTF-8 encoding", e);
+    }
+    return String.format(
+        "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+        result[0],
+        result[1],
+        result[2],
+        result[3],
+        result[4],
+        result[5],
+        result[6],
+        result[7],
+        result[8],
+        result[9],
+        result[10],
+        result[11],
+        result[12],
+        result[13],
+        result[14],
+        result[15],
+        result[16],
+        result[17],
+        result[18],
+        result[19]);
+  }
+
+  // Returns an opaque ID which is stable for the current combination of device and app, stable
+  // across installs, and unique across devices.
+  private String getInspectorDeviceId() {
+    // Every Android app has a unique application ID that looks like a Java or Kotlin package name,
+    // such as com.example.myapp. This ID uniquely identifies your app on the device and in the
+    // Google Play Store.
+    // [Source: Android docs]
+    String packageName = mPackageName;
+
+    // A 64-bit number expressed as a hexadecimal string, which is either:
+    // * unique to each combination of app-signing key, user, and device (API level >= 26), or
+    // * randomly generated when the user first sets up the device and should remain constant for
+    // the lifetime of the user's device (API level < 26).
+    // [Source: Android docs]
+    String androidId = Settings.Secure.ANDROID_ID;
+
+    String rawDeviceId = String.format(Locale.US, "android-%s-%s", packageName, androidId);
+
+    return getSHA256(rawDeviceId);
+  }
+
   private String getInspectorDeviceUrl() {
     return String.format(
         Locale.US,
-        "http://%s/inspector/device?name=%s&app=%s",
+        "http://%s/inspector/device?name=%s&app=%s&device=%s",
         mPackagerConnectionSettings.getInspectorServerHost(),
-        AndroidInfoHelpers.getFriendlyDeviceName(),
-        mPackageName);
+        Uri.encode(AndroidInfoHelpers.getFriendlyDeviceName()),
+        Uri.encode(mPackageName),
+        Uri.encode(getInspectorDeviceId()));
   }
 
   public void downloadBundleFromURL(
@@ -425,9 +489,10 @@ public class DevServerHelper {
     String requestUrl =
         String.format(
             Locale.US,
-            "http://%s/open-debugger?appId=%s",
+            "http://%s/open-debugger?appId=%s&device=%s",
             mPackagerConnectionSettings.getInspectorServerHost(),
-            Uri.encode(mPackageName));
+            Uri.encode(mPackageName),
+            Uri.encode(getInspectorDeviceId()));
     Request request =
         new Request.Builder().url(requestUrl).method("POST", RequestBody.create(null, "")).build();
 

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

@@ -40,6 +40,7 @@ public class ReactAndroidHWInputDeviceHelper {
           .put(KeyEvent.KEYCODE_MEDIA_PREVIOUS, "previous")
           .put(KeyEvent.KEYCODE_MEDIA_REWIND, "rewind")
           .put(KeyEvent.KEYCODE_MEDIA_FAST_FORWARD, "fastForward")
+          .put(KeyEvent.KEYCODE_MEDIA_RECORD, "record")
           .put(KeyEvent.KEYCODE_MEDIA_STOP, "stop")
           .put(KeyEvent.KEYCODE_MEDIA_NEXT, "next")
           .put(KeyEvent.KEYCODE_MEDIA_PREVIOUS, "previous")
@@ -48,6 +49,7 @@ public class ReactAndroidHWInputDeviceHelper {
           .put(KeyEvent.KEYCODE_DPAD_DOWN, "down")
           .put(KeyEvent.KEYCODE_DPAD_LEFT, "left")
           .put(KeyEvent.KEYCODE_INFO, "info")
+          .put(KeyEvent.KEYCODE_CAPTIONS, "captions")
           .put(KeyEvent.KEYCODE_MENU, "menu")
           .put(KeyEvent.KEYCODE_0, "0")
           .put(KeyEvent.KEYCODE_1, "1")

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

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

package/ReactAndroid/src/main/jni/react/fabric/Binding.h

@@ -34,7 +34,11 @@ class ReactNativeConfig;
 class Scheduler;
 class SurfaceHandlerBinding;
 
-class Binding : public jni::HybridClass<Binding>,
+struct JBinding : public jni::JavaClass<JBinding> {
+  constexpr static auto kJavaDescriptor = "Lcom/facebook/react/fabric/Binding;";
+};
+
+class Binding : public jni::HybridClass<Binding, JBinding>,
                 public SchedulerDelegate,
                 public LayoutAnimationStatusDelegate {
  public:

package/ReactAndroid/src/main/jni/react/fabric/JFabricUIManager.cpp

@@ -13,8 +13,9 @@ namespace facebook::react {
 
 Binding* JFabricUIManager::getBinding() {
   static const auto bindingField =
-      javaClassStatic()->getField<Binding::javaobject>("mBinding");
+      javaClassStatic()->getField<JBinding::javaobject>("mBinding");
 
-  return getFieldValue(bindingField)->cthis();
+  return jni::static_ref_cast<Binding::javaobject>(getFieldValue(bindingField))
+      ->cthis();
 }
 } // namespace facebook::react

package/ReactCommon/cxxreact/ReactNativeVersion.h

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

package/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec

@@ -56,7 +56,6 @@ Pod::Spec.new do |s|
 
   s.dependency "RCT-Folly/Fabric"
   s.dependency "React-Core/Default"
-  s.dependency "React-RCTImage"
   s.dependency "glog"
 
   add_dependency(s, "React-Fabric")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.73.0-0rc2",
+  "version": "0.73.0-0rc3",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -98,9 +98,9 @@
     "@react-native-community/cli-platform-android": "12.1.1",
     "@react-native-community/cli-platform-ios": "12.1.1",
     "@react-native/assets-registry": "^0.73.1",
-    "@react-native/community-cli-plugin": "^0.73.9",
-    "@react-native/codegen": "^0.73.1",
-    "@react-native/gradle-plugin": "^0.73.3",
+    "@react-native/community-cli-plugin": "^0.73.10",
+    "@react-native/codegen": "^0.73.2",
+    "@react-native/gradle-plugin": "^0.73.4",
     "@react-native/js-polyfills": "^0.73.1",
     "@react-native/normalize-colors": "^0.73.2",
     "@react-native/virtualized-lists": "^0.73.3",
@@ -150,6 +150,6 @@
     ]
   },
   "devDependencies": {
-    "react-native-core": "npm:react-native@0.73.0-rc.5"
+    "react-native-core": "npm:react-native@0.73.0-rc.6"
   }
 }

package/scripts/cocoapods/codegen.rb

@@ -11,23 +11,12 @@
 # - dir_manager: a class that implements the `Dir` interface. Defaults to `Dir`, the Dependency can be injected for testing purposes.
 # @throws an error if it could not find the codegen folder.
 def build_codegen!(react_native_path, relative_installation_root, dir_manager: Dir)
-    codegen_repo_path = "#{basePath(react_native_path, relative_installation_root)}/../react-native-codegen";
-    codegen_npm_path = "#{basePath(react_native_path, relative_installation_root)}/../@react-native/codegen";
-    codegen_cli_path = ""
+  codegen_repo_path = "#{basePath(react_native_path, relative_installation_root)}/../react-native-codegen"
+  return unless dir_manager.exist?(codegen_repo_path) && !dir_manager.exist?("#{codegen_repo_path}/lib")
 
-    if dir_manager.exist?(codegen_repo_path)
-      codegen_cli_path = codegen_repo_path
-    elsif dir_manager.exist?(codegen_npm_path)
-      codegen_cli_path = codegen_npm_path
-    else
-      raise "[codegen] Could not find react-native-codegen."
-    end
-
-    if !dir_manager.exist?("#{codegen_cli_path}/lib")
-      Pod::UI.puts "[Codegen] building #{codegen_cli_path}."
-      system("#{codegen_cli_path}/scripts/oss/build.sh")
-    end
-  end
+  Pod::UI.puts "[Codegen] building #{codegen_repo_path}"
+  system("#{codegen_repo_path}/scripts/oss/build.sh")
+end
 
 # It generates an empty `ThirdPartyProvider`, required by Fabric to load the components
 #

package/scripts/cocoapods/codegen_utils.rb

@@ -144,6 +144,7 @@ class CodegenUtils
             'React-graphics': [],
             'React-rendererdebug': [],
             'React-Fabric': [],
+            'React-FabricImage': [],
             'React-debug': [],
             'React-utils': [],
           });

package/template/android/build.gradle

@@ -1,5 +1,3 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     ext {
         buildToolsVersion = "34.0.0"
@@ -19,3 +17,5 @@ buildscript {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
     }
 }
+
+apply plugin: "com.facebook.react.rootproject"

package/template/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "expo": "^49.0.7",
     "react": "18.2.0",
-    "react-native": "npm:react-native-tvos@0.73.0-0rc2"
+    "react-native": "npm:react-native-tvos@0.73.0-0rc3"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",