react-native-tvos 0.73.2-0 → 0.73.4-0

package/Libraries/Lists/VirtualizedListContext.js

@@ -10,9 +10,9 @@
 
 'use strict';
 
-import {typeof VirtualizedListContextResetter as VirtualizedListContextResetterType} from '@react-native/virtualized-lists';
+import {typeof VirtualizedListContextResetter as VirtualizedListContextResetterType} from '@react-native-tvos/virtualized-lists';
 
 const VirtualizedListContextResetter: VirtualizedListContextResetterType =
-  require('@react-native/virtualized-lists').VirtualizedListContextResetter;
+  require('@react-native-tvos/virtualized-lists').VirtualizedListContextResetter;
 
 module.exports = {VirtualizedListContextResetter};

package/Libraries/Lists/VirtualizedSectionList.js

@@ -10,13 +10,13 @@
 
 'use strict';
 
-import {typeof VirtualizedSectionList as VirtualizedSectionListType} from '@react-native/virtualized-lists';
+import {typeof VirtualizedSectionList as VirtualizedSectionListType} from '@react-native-tvos/virtualized-lists';
 
 const VirtualizedSectionList: VirtualizedSectionListType =
-  require('@react-native/virtualized-lists').VirtualizedSectionList;
+  require('@react-native-tvos/virtualized-lists').VirtualizedSectionList;
 
 export type {
   SectionBase,
   ScrollToLocationParamsType,
-} from '@react-native/virtualized-lists';
+} from '@react-native-tvos/virtualized-lists';
 module.exports = VirtualizedSectionList;

package/Libraries/Modal/Modal.js

@@ -17,7 +17,7 @@ import {type EventSubscription} from '../vendor/emitter/EventEmitter';
 import ModalInjection from './ModalInjection';
 import NativeModalManager from './NativeModalManager';
 import RCTModalHostView from './RCTModalHostViewNativeComponent';
-import {VirtualizedListContextResetter} from '@react-native/virtualized-lists';
+import {VirtualizedListContextResetter} from '@react-native-tvos/virtualized-lists';
 
 const ScrollView = require('../Components/ScrollView/ScrollView');
 const View = require('../Components/View/View');

package/Libraries/Utilities/ReactNativeTestTools.js

@@ -16,7 +16,7 @@ const Switch = require('../Components/Switch/Switch').default;
 const TextInput = require('../Components/TextInput/TextInput');
 const View = require('../Components/View/View');
 const Text = require('../Text/Text');
-const {VirtualizedList} = require('@react-native/virtualized-lists');
+const {VirtualizedList} = require('@react-native-tvos/virtualized-lists');
 const React = require('react');
 const ShallowRenderer = require('react-shallow-renderer');
 const ReactTestRenderer = require('react-test-renderer');

package/React/Base/RCTVersion.m

@@ -23,7 +23,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
     __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(73),
-                  RCTVersionPatch: @(2),
+                  RCTVersionPatch: @(4),
                   RCTVersionPrerelease: @"0",
                   };
   });

package/React/CoreModules/RCTDeviceInfo.mm

@@ -80,11 +80,44 @@ RCT_EXPORT_MODULE()
                                              object:nil];
 
 #endif
+
+  // TODO T175901725 - Registering the RCTDeviceInfo module to the notification is a short-term fix to unblock 0.73
+  // The actual behavior should be that the module is properly registered in the TurboModule/Bridge infrastructure
+  // and the infrastructure imperatively invoke the `invalidate` method, rather than listening to a notification.
+  // This is a temporary workaround until we can investigate the issue better as there might be other modules in a
+  // similar situation.
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(invalidate)
+                                               name:RCTBridgeWillInvalidateModulesNotification
+                                             object:nil];
 }
 
 - (void)invalidate
 {
   _invalidated = YES;
+  [self _cleanupObservers];
+}
+
+- (void)_cleanupObservers
+{
+  [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                  name:RCTAccessibilityManagerDidUpdateMultiplierNotification
+                                                object:[_moduleRegistry moduleForName:"AccessibilityManager"]];
+#if !TARGET_OS_TV
+  [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                  name:UIApplicationDidChangeStatusBarOrientationNotification
+                                                object:nil];
+#endif
+  [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidBecomeActiveNotification object:nil];
+
+  [[NSNotificationCenter defaultCenter] removeObserver:self name:RCTUserInterfaceStyleDidChangeNotification object:nil];
+
+  [[NSNotificationCenter defaultCenter] removeObserver:self name:RCTWindowFrameDidChangeNotification object:nil];
+
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(invalidate)
+                                               name:RCTBridgeWillInvalidateModulesNotification
+                                             object:nil];
 }
 
 static BOOL RCTIsIPhoneNotched()

package/React/CoreModules/RCTRedBox.mm

@@ -302,6 +302,23 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
   return lineInfo;
 }
 
+- (void)tableView:(UITableView *)tableView didUpdateFocusInContext:(UITableViewFocusUpdateContext *)context withAnimationCoordinator:(UIFocusAnimationCoordinator *)coordinator
+{
+    UITableViewCell *previouslyFocusedItem = (UITableViewCell *)context.previouslyFocusedItem;
+    if ([previouslyFocusedItem isKindOfClass:[UITableViewCell class]]) {
+        [coordinator addCoordinatedUnfocusingAnimations:^(id<UIFocusAnimationContext>  _Nonnull animationContext) {
+            previouslyFocusedItem.textLabel.textColor = [UIColor whiteColor];
+        } completion:nil];
+    }
+
+    UITableViewCell *nextFocusedItem = (UITableViewCell *)context.nextFocusedItem;
+    if ([nextFocusedItem isKindOfClass:[UITableViewCell class]]) {
+        [coordinator addCoordinatedFocusingAnimations:^(id<UIFocusAnimationContext>  _Nonnull animationContext) {
+            nextFocusedItem.textLabel.textColor = [UIColor blackColor];
+        } completion:nil];
+    }
+}
+
 #pragma mark - TableView
 
 - (NSInteger)numberOfSectionsInTableView:(__unused UITableView *)tableView

package/React/Modules/RCTUIManager.m

@@ -179,14 +179,20 @@ RCT_EXPORT_MODULE()
       _componentDataByName[componentData.name] = componentData;
     }
   }
-
+  // Preload the a11yManager as the RCTUIManager needs it to listen for notification
+  // By eagerly preloading it in the setBridge method, we make sure that the manager is
+  // properly initialized in the Main Thread and that we do not incur in any race condition
+  // or concurrency problem.
+  id<RCTBridgeModule> a11yManager = [self->_bridge moduleForName:@"AccessibilityManager"
+                                           lazilyLoadIfNecessary:YES];
+  __weak NSObject * a11yManagerWeakObject = a11yManager;
   // This dispatch_async avoids a deadlock while configuring native modules
   dispatch_async(dispatch_get_main_queue(), ^{
+    __strong NSObject * a11yManagerStrongObject = a11yManagerWeakObject;
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(didReceiveNewContentSizeMultiplier)
                                                  name:@"RCTAccessibilityManagerDidUpdateMultiplierNotification"
-                                               object:[self->_bridge moduleForName:@"AccessibilityManager"
-                                                             lazilyLoadIfNecessary:YES]];
+                                               object:a11yManagerStrongObject];
   });
 #if !TARGET_OS_TV
   [[NSNotificationCenter defaultCenter] addObserver:self

package/React/Views/ScrollView/RCTScrollView.m

@@ -288,6 +288,7 @@
   NSString *_lastEmittedEventName;
   NSHashTable *_scrollListeners;
   NSMutableDictionary *_tvRemoteGestureRecognizers;
+  BOOL _blockFirstTouch;
 }
 
 - (void)_registerKeyboardListener
@@ -989,7 +990,11 @@ RCT_SCROLL_EVENT_HANDLER(scrollViewDidScrollToTop, onScrollToTop)
         [self becomeFirstResponder];
         [self addSwipeGestureRecognizers];
         [self sendFocusNotification];
+        // if we enter the scroll view from different view then block first touch event since it is the event that triggered the focus
+        _blockFirstTouch = (unsigned long)context.focusHeading != 0;
+        [self addArrowsListeners];
     } else if (context.previouslyFocusedView == self) {
+        [self removeArrowsListeners];
         [self sendBlurNotification];
         [self removeSwipeGestureRecognizers];
         [self resignFirstResponder];
@@ -1009,6 +1014,76 @@ RCT_SCROLL_EVENT_HANDLER(scrollViewDidScrollToTop, onScrollToTop)
     }
 }
 
+- (void) addArrowsListeners {
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(handleTVNavigationEventNotification:)
+                                                 name:@"RCTTVNavigationEventNotification"
+                                               object:nil];
+}
+
+- (void) removeArrowsListeners {
+    [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                    name:@"RCTTVNavigationEventNotification"
+                                                  object:nil];
+}
+
+
+- (void)handleTVNavigationEventNotification:(NSNotification *)notif
+{
+    NSArray *supportedEvents = [NSArray arrayWithObjects:@"up", @"down", @"left", @"right", nil];
+
+    if (notif.object == nil || notif.object[@"eventType"] == nil || ![supportedEvents containsObject:notif.object[@"eventType"]] ) {
+        return;
+    }
+    
+    if (_blockFirstTouch) {
+        _blockFirstTouch = NO;
+        return;
+    }
+
+    if (![self isHorizontal:self.scrollView]) {
+        if ([notif.object[@"eventType"]  isEqual: @"down"]) {
+            [self swipedDown];
+            return;
+        }
+        
+        if ([notif.object[@"eventType"]  isEqual: @"up"]) {
+            [self swipedUp];
+            return;
+        }
+    }
+  
+    if ([notif.object[@"eventType"]  isEqual: @"left"]) {
+        [self swipedLeft];
+        return;
+    }
+    
+    if ([notif.object[@"eventType"]  isEqual: @"right"]) {
+        [self swipedRight];
+        return;
+    }
+}
+
+- (BOOL)shouldUpdateFocusInContext:(UIFocusUpdateContext *)context
+{
+    // Keep focus inside the scroll view till the end of the content
+    if ([self isHorizontal:self.scrollView]) {
+        if ((context.focusHeading == UIFocusHeadingLeft && self.scrollView.contentOffset.x > 0)
+            || (context.focusHeading == UIFocusHeadingRight && self.scrollView.contentOffset.x < self.scrollView.contentSize.width - self.scrollView.visibleSize.width)
+        ) {
+            return [UIFocusSystem environment:self containsEnvironment:context.nextFocusedItem];
+        }
+    } else {
+        if ((context.focusHeading == UIFocusHeadingUp && self.scrollView.contentOffset.y > 0)
+            || (context.focusHeading == UIFocusHeadingDown && self.scrollView.contentOffset.y < self.scrollView.contentSize.height - self.scrollView.visibleSize.height)
+        ) {
+            return [UIFocusSystem environment:self containsEnvironment:context.nextFocusedItem];
+        }
+    }
+
+    return [super shouldUpdateFocusInContext:context];
+}
+
 - (void)sendFocusNotification
 {
   [[NSNotificationCenter defaultCenter] postNotificationName:@"RCTTVNavigationEventNotification"
@@ -1048,6 +1123,7 @@ RCT_SCROLL_EVENT_HANDLER(scrollViewDidScrollToTop, onScrollToTop)
 
 - (void)swipeVerticalScrollToOffset:(CGFloat)yOffset
 {
+    _blockFirstTouch = NO;
     dispatch_async(dispatch_get_main_queue(), ^{
         CGFloat limitedOffset = yOffset;
         limitedOffset = MAX(limitedOffset, 0.0);
@@ -1061,6 +1137,7 @@ RCT_SCROLL_EVENT_HANDLER(scrollViewDidScrollToTop, onScrollToTop)
 
 - (void)swipeHorizontalScrollToOffset:(CGFloat)xOffset
 {
+    _blockFirstTouch = NO;
     dispatch_async(dispatch_get_main_queue(), ^{
         CGFloat limitedOffset = xOffset;
         limitedOffset = MAX(limitedOffset, 0.0);

package/ReactAndroid/gradle.properties

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

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

@@ -113,6 +113,7 @@ public abstract class ReactActivity extends AppCompatActivity
   @Override
   public void onRequestPermissionsResult(
       int requestCode, String[] permissions, int[] grantResults) {
+    super.onRequestPermissionsResult(requestCode, permissions, grantResults);
     mDelegate.onRequestPermissionsResult(requestCode, permissions, grantResults);
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.java

@@ -10,6 +10,8 @@ package com.facebook.react.bridge.queue;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
+import com.facebook.common.logging.FLog;
+import com.facebook.react.common.ReactConstants;
 
 /** Handler that can catch and dispatch Exceptions to an Exception handler. */
 public class MessageQueueThreadHandler extends Handler {
@@ -26,6 +28,15 @@ public class MessageQueueThreadHandler extends Handler {
     try {
       super.dispatchMessage(msg);
     } catch (Exception e) {
+      if (e instanceof NullPointerException) {
+        FLog.e(
+            ReactConstants.TAG,
+            "Caught NullPointerException when dispatching message in MessageQueueThreadHandler. This is likely caused by runnable"
+                + "(msg.callback) being nulled in Android Handler after dispatching and before handling (see T170239922 for more details)."
+                + "Currently we observe that it only happen once which is during initialisation. Due to fixing probably involve Android "
+                + "System code, we decide to ignore here for now and print an error message for debugging purpose in case this cause more serious issues in future.");
+        return;
+      }
       mExceptionHandler.handleException(e);
     }
   }

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

@@ -17,6 +17,6 @@ public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
       "minor", 73,
-      "patch", 2,
+      "patch", 4,
       "prerelease", "0");
 }

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

@@ -206,7 +206,15 @@ import java.util.Set;
     }
     for (String oldKey : keysToNormalize) {
       Object value = events.get(oldKey);
-      String newKey = "top" + oldKey.substring(0, 1).toUpperCase() + oldKey.substring(1);
+      String baseKey = "";
+      if (oldKey.startsWith("on")) {
+        // Drop "on" prefix.
+        baseKey = oldKey.substring(2);
+      } else {
+        // Capitalize first letter.
+        baseKey = oldKey.substring(0, 1).toUpperCase() + oldKey.substring(1);
+      }
+      String newKey = "top" + baseKey;
       events.put(newKey, value);
     }
   }

package/ReactCommon/cxxreact/ReactNativeVersion.h

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

package/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp

@@ -991,7 +991,7 @@ void YogaLayoutableShadowNode::ensureConsistency() const {
 }
 
 void YogaLayoutableShadowNode::ensureYogaChildrenLookFine() const {
-#ifdef REACT_NATIVE_DEBUG
+#if defined(REACT_NATIVE_DEBUG) && defined(WITH_FBSYSTRACE)
   // Checking that the shapes of Yoga node children object look fine.
   // This is the only heuristic that might produce false-positive results
   // (really broken dangled nodes might look fine). This is useful as an early
@@ -1009,7 +1009,7 @@ void YogaLayoutableShadowNode::ensureYogaChildrenLookFine() const {
 }
 
 void YogaLayoutableShadowNode::ensureYogaChildrenAlignment() const {
-#ifdef REACT_NATIVE_DEBUG
+#if defined(REACT_NATIVE_DEBUG) && defined(WITH_FBSYSTRACE)
   // If the node is not a leaf node, checking that:
   // - All children are `YogaLayoutableShadowNode` subclasses.
   // - All Yoga children are owned/connected to corresponding children of

package/ReactCommon/react/renderer/core/EventEmitter.cpp

@@ -16,18 +16,26 @@
 
 namespace facebook::react {
 
+static bool hasPrefix(const std::string& str, const std::string& prefix) {
+  return str.compare(0, prefix.length(), prefix) == 0;
+}
+
 // TODO(T29874519): Get rid of "top" prefix once and for all.
 /*
- * Capitalizes the first letter of the event type and adds "top" prefix if
- * necessary (e.g. "layout" becames "topLayout").
+ * Replaces "on" with "top" if present. Or capitalizes the first letter and adds
+ * "top" prefix. E.g. "eventName" becomes "topEventName", "onEventName" also
+ * becomes "topEventName".
  */
 static std::string normalizeEventType(std::string type) {
   auto prefixedType = std::move(type);
-  if (prefixedType.find("top", 0) != 0) {
-    prefixedType.insert(0, "top");
-    prefixedType[3] = static_cast<char>(toupper(prefixedType[3]));
+  if (facebook::react::hasPrefix(prefixedType, "top")) {
+    return prefixedType;
+  }
+  if (facebook::react::hasPrefix(prefixedType, "on")) {
+    return "top" + prefixedType.substr(2);
   }
-  return prefixedType;
+  prefixedType[0] = static_cast<char>(toupper(prefixedType[0]));
+  return "top" + prefixedType;
 }
 
 std::mutex& EventEmitter::DispatchMutex() {

package/ReactCommon/react/renderer/debug/flags.h

@@ -26,7 +26,7 @@
 // Enables some Shadow Tree introspection features (maintains a StubViewTree,
 // and logs prev/next tree and mutations if there are any discrepancies). If you
 // define this, also define `RN_DEBUG_STRING_CONVERTIBLE`.
-#ifdef REACT_NATIVE_DEBUG
+#if (defined(REACT_NATIVE_DEBUG) && defined(WITH_FBSYSTRACE))
 #define RN_SHADOW_TREE_INTROSPECTION 1
 #endif
 
@@ -34,9 +34,7 @@
 // Enable if `RN_SHADOW_TREE_INTROSPECTION` is enabled.
 #ifdef RN_SHADOW_TREE_INTROSPECTION
 #define RN_DEBUG_STRING_CONVERTIBLE 1
-#endif
-
-#ifndef RN_DEBUG_STRING_CONVERTIBLE
+#else
 #define RN_DEBUG_STRING_CONVERTIBLE 0
 #endif
 

package/ReactCommon/react/renderer/debug/tests/DebugStringConvertibleTest.cpp

@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 #include <memory>
 
 #include <gtest/gtest.h>
@@ -82,3 +83,4 @@ TEST(DebugStringConvertibleTest, handleNodeWithComplexProps) {
       item->getDebugDescription().c_str(),
       "<View=hello x=1(height=100 width=200)/>");
 }
+#endif

package/ReactCommon/react/renderer/templateprocessor/tests/UITemplateProcessorTest.cpp

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#if RN_DEBUG_STRING_CONVERTIBLE
+
 #include <exception>
 
 #include <glog/logging.h>
@@ -164,3 +166,5 @@ TEST(UITemplateProcessorTest, testConditionalBytecode) {
       root2->getChildren().at(0)->getProps());
   ASSERT_STREQ(child_props2->testId.c_str(), "cond_false");
 }
+
+#endif

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.73.2-0",
+  "version": "0.73.4-0",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -98,16 +98,17 @@
     "@react-native-community/cli-platform-android": "12.3.2",
     "@react-native-community/cli-platform-ios": "12.3.2",
     "@react-native/assets-registry": "0.73.1",
-    "@react-native/community-cli-plugin": "0.73.12",
-    "@react-native/codegen": "0.73.2",
+    "@react-native/community-cli-plugin": "0.73.16",
+    "@react-native/codegen": "0.73.3",
     "@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-tvos/virtualized-lists": "0.73.4-0",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
     "base64-js": "^1.5.1",
+    "chalk": "^4.0.0",
     "deprecated-react-native-prop-types": "^5.0.0",
     "event-target-shim": "^5.0.1",
     "flow-enums-runtime": "^0.0.6",
@@ -150,6 +151,6 @@
     ]
   },
   "devDependencies": {
-    "react-native-core": "npm:react-native@0.73.2"
+    "react-native-core": "npm:react-native@0.73.4"
   }
 }

package/scripts/cocoapods/utils.rb

@@ -162,7 +162,7 @@ class ReactNativePodsUtils
             project.build_configurations.each do |config|
                 # fix for weak linking
                 self.safe_init(config, other_ld_flags_key)
-                if self.is_using_xcode15_or_greater(:xcodebuild_manager => xcodebuild_manager)
+                if self.is_using_xcode15_0(:xcodebuild_manager => xcodebuild_manager)
                     self.add_value_to_setting_if_missing(config, other_ld_flags_key, xcode15_compatibility_flags)
                 else
                     self.remove_value_to_setting_if_present(config, other_ld_flags_key, xcode15_compatibility_flags)
@@ -391,7 +391,7 @@ class ReactNativePodsUtils
         end
     end
 
-    def self.is_using_xcode15_or_greater(xcodebuild_manager: Xcodebuild)
+    def self.is_using_xcode15_0(xcodebuild_manager: Xcodebuild)
         xcodebuild_version = xcodebuild_manager.version
 
         # The output of xcodebuild -version is something like
@@ -402,7 +402,8 @@ class ReactNativePodsUtils
         regex = /(\d+)\.(\d+)(?:\.(\d+))?/
         if match_data = xcodebuild_version.match(regex)
             major = match_data[1].to_i
-            return major >= 15
+            minor = match_data[2].to_i
+            return major == 15 && minor == 0
         end
 
         return false
@@ -542,43 +543,6 @@ class ReactNativePodsUtils
         ReactNativePodsUtils.update_header_paths_if_depends_on(target_installation_result, "React-ImageManager", header_search_paths)
     end
 
-    def self.get_plist_paths_from(user_project)
-        info_plists = user_project
-          .files
-          .select { |p|
-            p.name&.end_with?('Info.plist')
-          }
-        return info_plists
-      end
-
-    def self.update_ats_in_plist(plistPaths, parent)
-        plistPaths.each do |plistPath|
-            fullPlistPath = File.join(parent, plistPath.path)
-            plist = Xcodeproj::Plist.read_from_path(fullPlistPath)
-            ats_configs = {
-                "NSAllowsArbitraryLoads" => false,
-                "NSAllowsLocalNetworking" => true,
-            }
-            if plist.nil?
-                plist = {
-                    "NSAppTransportSecurity" => ats_configs
-                }
-            else
-                plist["NSAppTransportSecurity"] ||= {}
-                plist["NSAppTransportSecurity"] = plist["NSAppTransportSecurity"].merge(ats_configs)
-            end
-            Xcodeproj::Plist.write_to_path(plist, fullPlistPath)
-        end
-    end
-
-    def self.apply_ats_config(installer)
-        user_project = installer.aggregate_targets
-                    .map{ |t| t.user_project }
-                    .first
-        plistPaths = self.get_plist_paths_from(user_project)
-        self.update_ats_in_plist(plistPaths, user_project.path.parent)
-    end
-
     def self.react_native_pods
         return [
             "DoubleConversion",

package/scripts/react-native-xcode.sh

@@ -127,7 +127,7 @@ fi
 PACKAGER_SOURCEMAP_FILE=
 if [[ $EMIT_SOURCEMAP == true ]]; then
   if [[ $USE_HERMES != false ]]; then
-    PACKAGER_SOURCEMAP_FILE="$CONFIGURATION_BUILD_DIR/$(basename $SOURCEMAP_FILE)"
+    PACKAGER_SOURCEMAP_FILE="$CONFIGURATION_BUILD_DIR/$(basename "$SOURCEMAP_FILE")"
   else
     PACKAGER_SOURCEMAP_FILE="$SOURCEMAP_FILE"
   fi

package/scripts/react_native_pods.rb

@@ -312,7 +312,6 @@ def react_native_post_install(
   ReactNativePodsUtils.set_node_modules_user_settings(installer, react_native_path)
   ReactNativePodsUtils.apply_flags_for_fabric(installer, fabric_enabled: fabric_enabled)
   ReactNativePodsUtils.apply_xcode_15_patch(installer)
-  ReactNativePodsUtils.apply_ats_config(installer)
   ReactNativePodsUtils.updateOSDeploymentTarget(installer)
 
   NewArchitectureHelper.set_clang_cxx_language_standard_if_needed(installer)

package/sdks/.hermesversion

@@ -1 +1 @@
-hermes-2023-11-21-RNv0.73.0-ab91a3dcf7cd8c892ffeb0f9c32730551aa7c2d4
+hermes-2024-01-31-RNv0.73.3-398783c198253f61e0a5eb603f1eb7b55af6baa4

package/sdks/hermes-engine/utils/replace_hermes_version.js

@@ -53,7 +53,7 @@ function shouldReplaceHermesConfiguration(configuration) {
 }
 
 function replaceHermesConfiguration(configuration, version, podsRoot) {
-  const tarballURLPath = `${podsRoot}/hermes-engine-artifacts/hermes-ios-${version}-${configuration}.tar.gz`;
+  const tarballURLPath = `${podsRoot}/hermes-engine-artifacts/hermes-ios-${version.toLowerCase()}-${configuration.toLowerCase()}.tar.gz`;
 
   const finalLocation = 'hermes-engine';
   console.log('Preparing the final location');

package/template/Gemfile

@@ -3,5 +3,7 @@ source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 
-gem 'cocoapods', '~> 1.13'
-gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
+# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
+# bound in the template on Cocoapods with next React Native release.
+gem 'cocoapods', '>= 1.13', '< 1.15'
+gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'

package/template/package.json

@@ -13,15 +13,15 @@
   "dependencies": {
     "expo": "^50.0.2",
     "react": "18.2.0",
-    "react-native": "npm:react-native-tvos@0.73.2-0"
+    "react-native": "npm:react-native-tvos@0.73.4-0"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@babel/preset-env": "^7.20.0",
     "@babel/runtime": "^7.20.0",
-    "@react-native/babel-preset": "0.73.19",
+    "@react-native/babel-preset": "0.73.21",
     "@react-native/eslint-config": "0.73.2",
-    "@react-native/metro-config": "0.73.3",
+    "@react-native/metro-config": "0.73.5",
     "@react-native/typescript-config": "0.73.1",
     "@types/react": "^18.2.6",
     "@types/react-test-renderer": "^18.0.0",

package/types/index.d.ts

@@ -116,7 +116,7 @@ export * from '../Libraries/LayoutAnimation/LayoutAnimation';
 export * from '../Libraries/Linking/Linking';
 export * from '../Libraries/Lists/FlatList';
 export * from '../Libraries/Lists/SectionList';
-export * from '@react-native/virtualized-lists';
+export * from '@react-native-tvos/virtualized-lists';
 export * from '../Libraries/LogBox/LogBox';
 export * from '../Libraries/Modal/Modal';
 export * as Systrace from '../Libraries/Performance/Systrace';