react-native-tvos 0.73.1-1 → 0.73.1-2

package/Libraries/Core/ReactNativeVersion.js

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

package/Libraries/Lists/VirtualizedList.js

@@ -41,11 +41,11 @@ import {
   VirtualizedListCellContextProvider,
   VirtualizedListContext,
   VirtualizedListContextProvider,
-} from './VirtualizedListContext.js';
+} from '@react-native/virtualized-lists/Lists/VirtualizedListContext';
 import {
   computeWindowedRenderLimits,
   keyExtractor as defaultKeyExtractor,
-} from './VirtualizeUtils';
+} from '@react-native/virtualized-lists/Lists/VirtualizeUtils';
 import invariant from 'invariant';
 import nullthrows from 'nullthrows';
 import * as React from 'react';

package/React/Base/RCTVersion.m

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

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

@@ -19,6 +19,9 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+#ifndef _RCT_VIEW_COMPONENT_VIEW_
+#define _RCT_VIEW_COMPONENT_VIEW_
+
 /**
  * UIView class for <View> component.
  */
@@ -90,4 +93,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+#endif // _RCT_VIEW_COMPONENT_VIEW_
+
 NS_ASSUME_NONNULL_END

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.73.1-1
+VERSION_NAME=0.73.1-2
 
 # react.internal.publishingGroup=com.facebook.react
 # For TV use this group

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

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

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java

@@ -204,6 +204,11 @@ import java.util.Map;
       mDefaultValue = defaultValue;
     }
 
+    public ColorPropSetter(ReactPropGroup prop, Method setter, int index, int defaultValue) {
+      super(prop, "mixed", setter, index);
+      mDefaultValue = defaultValue;
+    }
+
     @Override
     protected Object getValueOrDefault(Object value, Context context) {
       if (value == null) {
@@ -331,6 +336,10 @@ import java.util.Map;
       super(prop, "mixed", setter);
     }
 
+    public BoxedColorPropSetter(ReactPropGroup prop, Method setter, int index) {
+      super(prop, "mixed", setter, index);
+    }
+
     @Override
     protected @Nullable Object getValueOrDefault(Object value, Context context) {
       if (value != null) {
@@ -468,7 +477,11 @@ import java.util.Map;
       }
     } else if (propTypeClass == int.class) {
       for (int i = 0; i < names.length; i++) {
-        props.put(names[i], new IntPropSetter(annotation, method, i, annotation.defaultInt()));
+        if ("Color".equals(annotation.customType())) {
+          props.put(names[i], new ColorPropSetter(annotation, method, i, annotation.defaultInt()));
+        } else {
+          props.put(names[i], new IntPropSetter(annotation, method, i, annotation.defaultInt()));
+        }
       }
     } else if (propTypeClass == float.class) {
       for (int i = 0; i < names.length; i++) {
@@ -481,7 +494,11 @@ import java.util.Map;
       }
     } else if (propTypeClass == Integer.class) {
       for (int i = 0; i < names.length; i++) {
-        props.put(names[i], new BoxedIntPropSetter(annotation, method, i));
+        if ("Color".equals(annotation.customType())) {
+          props.put(names[i], new BoxedColorPropSetter(annotation, method, i));
+        } else {
+          props.put(names[i], new BoxedIntPropSetter(annotation, method, i));
+        }
       }
     } else {
       throw new RuntimeException(

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

@@ -89,6 +89,8 @@ public class ReactModalHostView extends ViewGroup implements LifecycleEventListe
   private boolean mPropertyRequiresNewDialog;
   private @Nullable DialogInterface.OnShowListener mOnShowListener;
   private @Nullable OnRequestCloseListener mOnRequestCloseListener;
+  private final ReactAndroidHWInputDeviceHelper mAndroidHWInputDeviceHelper =
+    new ReactAndroidHWInputDeviceHelper();
 
   public ReactModalHostView(ThemedReactContext context) {
     super(context);
@@ -300,6 +302,9 @@ public class ReactModalHostView extends ViewGroup implements LifecycleEventListe
         new DialogInterface.OnKeyListener() {
           @Override
           public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
+            // Modal needs to send the key event to its own TV event handler
+            // https://github.com/react-native-tvos/react-native-tvos/issues/609
+            mAndroidHWInputDeviceHelper.handleKeyEvent(event, mHostView.mReactContext);
             if (event.getAction() == KeyEvent.ACTION_UP) {
               // We need to stop the BACK button and ESCAPE key from closing the dialog by default
               // so we capture that event and instead inform JS so that it can make the decision as

package/ReactCommon/cxxreact/ReactNativeVersion.h

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.73.1-1",
+  "version": "0.73.1-2",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -97,13 +97,13 @@
     "@react-native-community/cli": "12.3.0",
     "@react-native-community/cli-platform-android": "12.3.0",
     "@react-native-community/cli-platform-ios": "12.3.0",
-    "@react-native/assets-registry": "^0.73.1",
+    "@react-native/assets-registry": "0.73.1",
     "@react-native/community-cli-plugin": "0.73.11",
-    "@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.4",
+    "@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.4",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",

package/scripts/react-native-xcode.sh

@@ -15,7 +15,7 @@ DEST=$CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH
 # Enables iOS devices to get the IP address of the machine running Metro
 if [[ ! "$SKIP_BUNDLING_METRO_IP" && "$CONFIGURATION" = *Debug* && ! "$PLATFORM_NAME" == *simulator ]]; then
   for num in 0 1 2 3 4 5 6 7 8; do
-    IP=$(ipconfig getifaddr en${num})
+    IP=$(ipconfig getifaddr en${num} || echo "")
     if [ ! -z "$IP" ]; then
       break
     fi

package/template/android/app/src/main/java/com/helloworld/MainApplication.kt

@@ -15,11 +15,11 @@ class MainApplication : Application(), ReactApplication {
 
   override val reactNativeHost: ReactNativeHost =
       object : DefaultReactNativeHost(this) {
-        override fun getPackages(): List<ReactPackage> {
-          // Packages that cannot be autolinked yet can be added manually here, for example:
-          // packages.add(new MyReactNativePackage());
-          return PackageList(this).packages
-        }
+        override fun getPackages(): List<ReactPackage> =
+            PackageList(this).packages.apply {
+              // Packages that cannot be autolinked yet can be added manually here, for example:
+              // add(MyReactNativePackage())
+            }
 
         override fun getJSMainModuleName(): String = "index"
 

package/template/package.json

@@ -13,16 +13,16 @@
   "dependencies": {
     "expo": "^50.0.0-preview.4",
     "react": "18.2.0",
-    "react-native": "npm:react-native-tvos@0.73.1-1"
+    "react-native": "npm:react-native-tvos@0.73.1-2"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@babel/preset-env": "^7.20.0",
     "@babel/runtime": "^7.20.0",
-    "@react-native/babel-preset": "^0.73.18",
-    "@react-native/eslint-config": "^0.73.1",
-    "@react-native/metro-config": "^0.73.2",
-    "@react-native/typescript-config": "^0.73.1",
+    "@react-native/babel-preset": "0.73.18",
+    "@react-native/eslint-config": "0.73.1",
+    "@react-native/metro-config": "0.73.2",
+    "@react-native/typescript-config": "0.73.1",
     "@types/react": "^18.2.6",
     "@types/react-test-renderer": "^18.0.0",
     "babel-jest": "^29.6.3",

package/ReactAndroid/src/main/res/devsupport/values-cb/strings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: cb_IQ -->
-<resources exclude-from-buck-resource-map="true">
-</resources>

package/ReactAndroid/src/main/res/devsupport/values-fb/strings.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: fb_HA -->
-<resources exclude-from-buck-resource-map="true">
-    <string name="catalyst_dev_menu_header" gender="unknown">[React Native Dev Menu (%1$s)#f560753940a8856cdc2de8717c0295df:1]</string>
-    <string name="catalyst_dev_menu_sub_header" gender="unknown">[Running %1$s#c566f94d6bbe163799a3235b4b55f9d1:1]</string>
-</resources>

package/ReactAndroid/src/main/res/devsupport/values-fb-rLS/strings.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: fb_LS -->
-<resources exclude-from-buck-resource-map="true">
-    <string name="catalyst_dev_menu_header" gender="unknown">React Native Dev Menu (%1$s)\@\@\@\@\@\@\@\@\@\@\@\@\@\@\@\@\@\@\@\@\@\@\@\@\@\@\@\@\@\@</string>
-    <string name="catalyst_dev_menu_sub_header" gender="unknown">Running %1$s\@\@\@\@\@\@\@\@\@\@\@\@\@\@\@\@\@\@</string>
-</resources>

package/ReactAndroid/src/main/res/views/uimanager/values-cb/strings.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: cb_IQ -->
-<resources exclude-from-buck-resource-map="true">
-    <string name="link_description" gender="unknown">بەستەر</string>
-    <string name="image_description" gender="unknown">وێنە</string>
-    <string name="imagebutton_description" gender="unknown">دوگمە، وێنە</string>
-    <string name="combobox_description" gender="unknown">خشتەی دیاریکردن</string>
-    <string name="menu_description" gender="unknown">پێڕست</string>
-    <string name="state_on_description" gender="unknown">کارا</string>
-    <string name="state_off_description" gender="unknown">کوژاندنەوە</string>
-</resources>

package/ReactAndroid/src/main/res/views/uimanager/values-fb/strings.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: fb_HA -->
-<resources exclude-from-buck-resource-map="true">
-    <string name="link_description" gender="unknown">[Link#a31d26668a679e44a0843994a6744274:1]</string>
-    <string name="image_description" gender="unknown">[Image#d8aa55c15c7118a635092b092bcf1d33:1]</string>
-    <string name="imagebutton_description" gender="unknown">[Button, Image#2b5b423bf3daff8f8b188f5d5733ec14:1]</string>
-    <string name="header_description" gender="unknown">[Heading#03d19d231fd31bc5dae409f337e4fea3:1]</string>
-    <string name="alert_description" gender="unknown">[Alert#f230077c00a8397fcc7138dfd8b37405:1]</string>
-    <string name="combobox_description" gender="unknown">[Combo Box#c399e5a30d2d764efcced424465cacc4:1]</string>
-    <string name="menu_description" gender="unknown">[Menu#a2c49a9b7c94c31d6f53f5f59329a558:1]</string>
-    <string name="menubar_description" gender="unknown">[Menu Bar#9ede63b4972815fe4810781f1f15770c:1]</string>
-    <string name="menuitem_description" gender="unknown">[Menu Item#ba3a1d642e7bfae7a60f57181ff5a91f:1]</string>
-    <string name="progressbar_description" gender="unknown">[Progress Bar#fc1ee5dacc16eb35a88ca3aff9355683:1]</string>
-    <string name="radiogroup_description" gender="unknown">[Radio Group#382586bc34074311334bc929c63f69e4:1]</string>
-    <string name="scrollbar_description" gender="unknown">[Scroll Bar#8c5cb8c1bbbac0ed64bb63c240b9a415:1]</string>
-    <string name="spinbutton_description" gender="unknown">[Spin Button#8af18737c08f4adab8e7103876d29955:1]</string>
-    <string name="rn_tab_description" gender="unknown">[Tab#60c56bd22945b4d1532f474bfc568a66:1]</string>
-    <string name="tablist_description" gender="unknown">[Tab List#8daaf7f9316191f0e35f3ba31ed11aec:1]</string>
-    <string name="timer_description" gender="unknown">[Timer#2f3aa4d3a05064a96945540d06072632:1]</string>
-    <string name="toolbar_description" gender="unknown">[Tool Bar#13851684ac57a6612b478471e4894082:1]</string>
-    <string name="summary_description" gender="unknown">[Summary#12f17d5316cde76d270ad4534e1d9f35:1]</string>
-    <string name="state_busy_description" gender="unknown">[busy#c38a44fbc4bbf985a9e846c05e60b947:1]</string>
-    <string name="state_expanded_description" gender="unknown">[expanded#45ee23081f04143c5be90131a7b0e3c5:1]</string>
-    <string name="state_collapsed_description" gender="unknown">[collapsed#850739bd3f1cb1a9b82c3a6f68399233:1]</string>
-    <string name="state_unselected_description" gender="unknown">[unselected#815cb61a1bc6c57ed0a65707d8c0c2d2:1]</string>
-    <string name="state_on_description" gender="unknown">[on#86ddae449e2a1cb3b1fc5fed82bfc660:1]</string>
-    <string name="state_off_description" gender="unknown">[off#f1ca5b210c9adef0fe7f14fe85ba521d:1]</string>
-    <string name="state_mixed_description" gender="unknown">[mixed#30d19e1c3c088ba70e30538143bad3a8:1]</string>
-</resources>

package/ReactAndroid/src/main/res/views/uimanager/values-fb-rLS/strings.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: fb_LS -->
-<resources exclude-from-buck-resource-map="true">
-    <string name="image_description" gender="unknown">Image \@\@\@</string>
-    <string name="imagebutton_description" gender="unknown">Button, Image\@\@\@\@\@\@</string>
-    <string name="header_description" gender="unknown">Heading \@\@\@ \@\@\@</string>
-    <string name="combobox_description" gender="unknown">Combo Box \@\@\@</string>
-    <string name="menu_description" gender="unknown">Menu \@\@\@</string>
-    <string name="menubar_description" gender="unknown">Menu Bar \@\@\@</string>
-    <string name="menuitem_description" gender="unknown">Menu Item\@\@\@\@\@\@</string>
-    <string name="progressbar_description" gender="unknown">Progress Bar\@\@\@\@\@\@</string>
-    <string name="radiogroup_description" gender="unknown">Radio Group\@\@\@\@\@\@\@\@\@</string>
-    <string name="scrollbar_description" gender="unknown">Scroll Bar\@\@\@\@\@\@\@\@\@</string>
-    <string name="spinbutton_description" gender="unknown">Spin Button \@\@\@ \@\@\@</string>
-    <string name="tablist_description" gender="unknown">Tab List\@\@\@</string>
-    <string name="timer_description" gender="unknown">Timer \@\@\@</string>
-    <string name="toolbar_description" gender="unknown">Tool Bar\@\@\@\@\@\@</string>
-    <string name="summary_description" gender="unknown">Summary\@\@\@\@\@\@</string>
-    <string name="state_expanded_description" gender="unknown">expanded \@\@\@ \@\@\@</string>
-    <string name="state_collapsed_description" gender="unknown">collapsed \@\@\@ \@\@\@ \@\@\@</string>
-    <string name="state_unselected_description" gender="unknown">unselected\@\@\@</string>
-    <string name="state_off_description" gender="unknown">off \@\@\@</string>
-    <string name="state_mixed_description" gender="unknown">mixed\@\@\@</string>
-</resources>