react-native-tvos 0.76.0-0rc4 → 0.76.0-0rc5

package/Libraries/Core/ReactNativeVersion.js

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

package/React/Base/RCTVersion.m

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

package/ReactAndroid/api/ReactAndroid.api

@@ -3798,13 +3798,13 @@ public abstract class com/facebook/react/packagerconnection/NotificationOnlyHand
 	public final fun onRequest (Ljava/lang/Object;Lcom/facebook/react/packagerconnection/Responder;)V
 }
 
-public final class com/facebook/react/packagerconnection/PackagerConnectionSettings {
+public class com/facebook/react/packagerconnection/PackagerConnectionSettings {
 	public fun <init> (Landroid/content/Context;)V
 	public final fun getAdditionalOptionsForPackager ()Ljava/util/Map;
-	public final fun getDebugServerHost ()Ljava/lang/String;
+	public fun getDebugServerHost ()Ljava/lang/String;
 	public final fun getPackageName ()Ljava/lang/String;
 	public final fun setAdditionalOptionForPackager (Ljava/lang/String;Ljava/lang/String;)V
-	public final fun setDebugServerHost (Ljava/lang/String;)V
+	public fun setDebugServerHost (Ljava/lang/String;)V
 }
 
 public final class com/facebook/react/packagerconnection/ReconnectingWebSocket : okhttp3/WebSocketListener {

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.76.0-0rc4
+VERSION_NAME=0.76.0-0rc5
 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", "0rc4");
+      "prerelease", "0rc5");
 }

package/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.kt

@@ -15,13 +15,13 @@ import android.preference.PreferenceManager
 import com.facebook.common.logging.FLog
 import com.facebook.react.modules.systeminfo.AndroidInfoHelpers
 
-public class PackagerConnectionSettings(private val appContext: Context) {
+public open class PackagerConnectionSettings(private val appContext: Context) {
   private val preferences: SharedPreferences =
       PreferenceManager.getDefaultSharedPreferences(appContext)
   public val packageName: String = appContext.packageName
   private val _additionalOptionsForPackager: MutableMap<String, String> = mutableMapOf()
 
-  public var debugServerHost: String
+  public open var debugServerHost: String
     get() {
       // Check host setting first. If empty try to detect emulator type and use default
       // hostname for those

package/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt

@@ -27,6 +27,7 @@ import android.view.WindowManager
 import android.view.accessibility.AccessibilityEvent
 import android.widget.FrameLayout
 import androidx.annotation.UiThread
+import com.facebook.common.logging.FLog
 import com.facebook.react.R
 import com.facebook.react.bridge.GuardedRunnable
 import com.facebook.react.bridge.LifecycleEventListener
@@ -34,6 +35,7 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
+import com.facebook.react.common.ReactConstants
 import com.facebook.react.common.annotations.VisibleForTesting
 import com.facebook.react.config.ReactFeatureFlags
 import com.facebook.react.modules.core.ReactAndroidHWInputDeviceHelper
@@ -313,29 +315,37 @@ public class ReactModalHostView(context: ThemedReactContext) :
     val dialogWindow =
         checkNotNull(dialog.window) { "dialog must have window when we call updateProperties" }
     val currentActivity = getCurrentActivity()
-    if (currentActivity == null || currentActivity.isFinishing) {
+    if (currentActivity == null || currentActivity.isFinishing || currentActivity.isDestroyed) {
       // If the activity has disappeared, then we shouldn't update the window associated to the
       // Dialog.
       return
     }
-    val activityWindow = currentActivity.window
-    if (activityWindow != null) {
-      val activityWindowFlags = activityWindow.attributes.flags
-      if ((activityWindowFlags and WindowManager.LayoutParams.FLAG_FULLSCREEN) != 0) {
-        dialogWindow.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
-      } else {
-        dialogWindow.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+    try {
+      val activityWindow = currentActivity.window
+      if (activityWindow != null) {
+        val activityWindowFlags = activityWindow.attributes.flags
+        if ((activityWindowFlags and WindowManager.LayoutParams.FLAG_FULLSCREEN) != 0) {
+          dialogWindow.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+        } else {
+          dialogWindow.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+        }
       }
-    }
 
-    dialogWindow.setStatusBarTranslucency(statusBarTranslucent)
+      dialogWindow.setStatusBarTranslucency(statusBarTranslucent)
 
-    if (transparent) {
-      dialogWindow.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
-    } else {
-      dialogWindow.setDimAmount(0.5f)
-      dialogWindow.setFlags(
-          WindowManager.LayoutParams.FLAG_DIM_BEHIND, WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+      if (transparent) {
+        dialogWindow.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+      } else {
+        dialogWindow.setDimAmount(0.5f)
+        dialogWindow.setFlags(
+            WindowManager.LayoutParams.FLAG_DIM_BEHIND, WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+      }
+    } catch (e: IllegalArgumentException) {
+      // This is to prevent a crash from the following error, without a clear repro steps:
+      // java.lang.IllegalArgumentException: View=DecorView@c94931b[XxxActivity] not attached to
+      // window manager
+      FLog.e(
+          ReactConstants.TAG, "ReactModalHostView: error while setting window flags: ", e.message)
     }
   }
 

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 = "0rc4";
+  std::string_view Prerelease = "0rc5";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.76.0-0rc4",
+  "version": "0.76.0-0rc5",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -110,13 +110,13 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.6.3",
-    "@react-native/assets-registry": "0.76.0-rc.4",
-    "@react-native/codegen": "0.76.0-rc.4",
-    "@react-native/community-cli-plugin": "0.76.0-rc.4",
-    "@react-native/gradle-plugin": "0.76.0-rc.4",
-    "@react-native/js-polyfills": "0.76.0-rc.4",
-    "@react-native/normalize-colors": "0.76.0-rc.4",
-    "@react-native-tvos/virtualized-lists": "0.76.0-0rc4",
+    "@react-native/assets-registry": "0.76.0-rc.5",
+    "@react-native/codegen": "0.76.0-rc.5",
+    "@react-native/community-cli-plugin": "0.76.0-rc.5",
+    "@react-native/gradle-plugin": "0.76.0-rc.5",
+    "@react-native/js-polyfills": "0.76.0-rc.5",
+    "@react-native/normalize-colors": "0.76.0-rc.5",
+    "@react-native-tvos/virtualized-lists": "0.76.0-0rc5",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -132,8 +132,8 @@
     "jest-environment-node": "^29.6.3",
     "jsc-android": "^250231.0.0",
     "memoize-one": "^5.0.0",
-    "metro-runtime": "^0.81.0-alpha.2",
-    "metro-source-map": "^0.81.0-alpha.2",
+    "metro-runtime": "^0.81.0",
+    "metro-source-map": "^0.81.0",
     "mkdirp": "^0.5.1",
     "nullthrows": "^1.1.1",
     "pretty-format": "^29.7.0",

package/scripts/cocoapods/new_architecture.rb

@@ -12,19 +12,33 @@ class NewArchitectureHelper
     @@NewArchWarningEmitted = false # Used not to spam warnings to the user.
 
     def self.set_clang_cxx_language_standard_if_needed(installer)
+        cxxBuildsettingsName = "CLANG_CXX_LANGUAGE_STANDARD"
         projects = installer.aggregate_targets
             .map{ |t| t.user_project }
             .uniq{ |p| p.path }
 
         projects.each do |project|
-            Pod::UI.puts("Setting CLANG_CXX_LANGUAGE_STANDARD to #{ Helpers::Constants::cxx_language_standard } on #{ project.path }")
+            Pod::UI.puts("Setting #{cxxBuildsettingsName} to #{ Helpers::Constants::cxx_language_standard } on #{ project.path }")
 
             project.build_configurations.each do |config|
-                config.build_settings["CLANG_CXX_LANGUAGE_STANDARD"] = Helpers::Constants::cxx_language_standard
+                config.build_settings[cxxBuildsettingsName] = Helpers::Constants::cxx_language_standard
             end
 
             project.save()
         end
+
+        installer.target_installation_results.pod_target_installation_results.each do |pod_name, target_installation_result|
+            target_installation_result.native_target.build_configurations.each do |config|
+                config.build_settings[cxxBuildsettingsName] = Helpers::Constants::cxx_language_standard
+            end
+        end
+
+        # Override targets that would set spec.xcconfig to define c++ version
+        installer.aggregate_targets.each do |aggregate_target|
+            aggregate_target.xcconfigs.each do |config_name, config_file|
+                config_file.attributes[cxxBuildsettingsName] = Helpers::Constants::cxx_language_standard
+            end
+        end
     end
 
     def self.computeFlags(is_new_arch_enabled)