react-native-tvos 0.73.6-2 → 0.73.6-3

package/Libraries/Core/ReactNativeVersion.js

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

package/React/Base/RCTVersion.m

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

package/React/CoreModules/RCTTVNavigationEventEmitter.mm

@@ -6,7 +6,9 @@
  */
 
 #import "RCTTVNavigationEventEmitter.h"
+#if TARGET_OS_TV
 #import "RCTTVNavigationEventNotificationConstants.h"
+#endif
 
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import "CoreModulesPlugins.h"
@@ -28,10 +30,12 @@ RCT_EXPORT_MODULE()
 - (instancetype)init
 {
   if (self = [super init]) {
+#if TARGET_OS_TV
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(handleTVNavigationEventNotification:)
                                                  name:RCTTVNavigationEventNotificationName
                                                object:nil];
+#endif
   }
   return self;
 }

package/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.h

@@ -9,6 +9,10 @@
 
 @protocol RCTFabricModalHostViewControllerDelegate <NSObject>
 - (void)boundsDidChange:(CGRect)newBounds;
+#if TARGET_OS_TV
+- (void)enableEventHandlers;
+- (void)disableEventHandlers;
+#endif
 @end
 
 @interface RCTFabricModalHostViewController : UIViewController

package/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm

@@ -42,18 +42,28 @@
   [_touchHandler attachToView:self.view];
 }
 
-#if !TARGET_OS_TV
-- (UIStatusBarStyle)preferredStatusBarStyle
-{
-  return [RCTSharedApplication() statusBarStyle];
-}
-
 - (void)viewDidDisappear:(BOOL)animated
 {
   [super viewDidDisappear:animated];
   _lastViewBounds = CGRectZero;
 }
 
+#if TARGET_OS_TV
+- (void)viewDidAppear:(BOOL)animated
+{
+  [self.delegate enableEventHandlers];
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+  [self.delegate disableEventHandlers];
+}
+#else
+- (UIStatusBarStyle)preferredStatusBarStyle
+{
+  return [RCTSharedApplication() statusBarStyle];
+}
+
 - (BOOL)prefersStatusBarHidden
 {
   return [RCTSharedApplication() isStatusBarHidden];

package/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm

@@ -19,6 +19,10 @@
 
 #import "RCTFabricModalHostViewController.h"
 
+#if TARGET_OS_TV
+#import <React/RCTTVRemoteHandler.h>
+#endif
+
 using namespace facebook::react;
 
 #if !TARGET_OS_TV
@@ -115,6 +119,10 @@ static ModalHostViewEventEmitter::OnOrientationChange onOrientationChangeStruct(
   BOOL _shouldPresent;
   BOOL _isPresented;
   UIView *_modalContentsSnapshot;
+#if TARGET_OS_TV
+  UITapGestureRecognizer *_menuButtonGestureRecognizer;
+  RCTTVRemoteHandler *_tvRemoteHandler;
+#endif
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -123,6 +131,11 @@ static ModalHostViewEventEmitter::OnOrientationChange onOrientationChangeStruct(
     static const auto defaultProps = std::make_shared<const ModalHostViewProps>();
     _props = defaultProps;
     _shouldAnimatePresentation = YES;
+#if TARGET_OS_TV
+    _menuButtonGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self
+                                                                           action:@selector(menuButtonPressed)];
+    _menuButtonGestureRecognizer.allowedPressTypes = @[ @(UIPressTypeMenu) ];
+#endif
 
     _isPresented = NO;
   }
@@ -130,6 +143,38 @@ static ModalHostViewEventEmitter::OnOrientationChange onOrientationChangeStruct(
   return self;
 }
 
+#if TARGET_OS_TV
+- (void)menuButtonPressed {
+  UIView *snapshot = _modalContentsSnapshot;
+  [self.viewController.view addSubview:snapshot];
+  [self dismissViewController:self.viewController
+                     animated:_shouldAnimatePresentation
+                   completion:^{
+                     [snapshot removeFromSuperview];
+                     auto eventEmitter = [self modalEventEmitter];
+                     if (eventEmitter) {
+                       eventEmitter->onDismiss(ModalHostViewEventEmitter::OnDismiss{});
+                       eventEmitter->onRequestClose(ModalHostViewEventEmitter::OnRequestClose{});
+                     }
+                   }];
+}
+
+- (void)enableEventHandlers
+{
+  _tvRemoteHandler = [[RCTTVRemoteHandler alloc] initWithView:_viewController.view];
+  [_tvRemoteHandler disableTVMenuKey];
+
+  [_viewController.view addGestureRecognizer:_menuButtonGestureRecognizer];
+}
+
+- (void)disableEventHandlers
+{
+  _tvRemoteHandler = nil;
+  [_viewController.view removeGestureRecognizer:_menuButtonGestureRecognizer];
+}
+
+#endif
+
 - (RCTFabricModalHostViewController *)viewController
 {
   if (!_viewController) {

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

@@ -11,7 +11,6 @@
 #import <React/RCTBridge+Private.h>
 #import <React/RCTConstants.h>
 #import <React/RCTScrollEvent.h>
-#import <React/RCTTVNavigationEventNotification.h>
 
 #import <react/renderer/components/scrollview/RCTComponentViewHelpers.h>
 #import <react/renderer/components/scrollview/ScrollViewComponentDescriptor.h>
@@ -26,7 +25,8 @@
 #import "RCTFabricComponentsPlugins.h"
 
 #if TARGET_OS_TV
-#import "RCTTVRemoteHandler.h"
+#import <React/RCTTVRemoteHandler.h>
+#import <React/RCTTVNavigationEventNotification.h>
 #endif
 
 using namespace facebook::react;

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

@@ -19,7 +19,9 @@
 #import <React/RCTLog.h>
 
 #import <React/RCTRootComponentView.h>
+#if TARGET_OS_TV
 #import <React/RCTTVNavigationEventNotification.h>
+#endif
 
 #import <react/renderer/components/view/ViewComponentDescriptor.h>
 #import <react/renderer/components/view/ViewEventEmitter.h>

package/React/Views/RCTModalHostViewController.m

@@ -34,6 +34,32 @@
   return self;
 }
 
+- (void)viewDidAppear:(BOOL)animated
+{
+#if TARGET_OS_TV
+  [self.modalHostView enableEventHandlers];
+#endif
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+#if TARGET_OS_TV
+  [self.modalHostView disableEventHandlers];
+  if (self.modalHostView.onRequestClose) {
+    self.modalHostView.onRequestClose(nil);
+  }
+#endif
+}
+
+- (void)viewDidDisappear:(BOOL)animated
+{
+#if TARGET_OS_TV
+  if (self.modalHostView.onDismiss) {
+    self.modalHostView.onDismiss(nil);
+  }
+#endif
+}
+
 - (void)viewDidLayoutSubviews
 {
   [super viewDidLayoutSubviews];

package/React/Views/ScrollView/RCTScrollView.m

@@ -12,7 +12,6 @@
 #import "RCTConvert.h"
 #import "RCTLog.h"
 #import "RCTScrollEvent.h"
-#import "RCTTVNavigationEventNotification.h"
 #import "RCTUIManager.h"
 #import "RCTUIManagerObserverCoordinator.h"
 #import "RCTUIManagerUtils.h"
@@ -23,6 +22,7 @@
 
 #if TARGET_OS_TV
 #import "RCTTVRemoteHandler.h"
+#import "RCTTVNavigationEventNotification.h"
 #endif
 
 #if !TARGET_OS_TV

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.73.6-2
+VERSION_NAME=0.73.6-3
 
 # 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", 6,
-      "prerelease", "2");
+      "prerelease", "3");
 }

package/ReactCommon/cxxreact/ReactNativeVersion.h

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.73.6-2",
+  "version": "0.73.6-3",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -103,7 +103,7 @@
     "@react-native/gradle-plugin": "0.73.4",
     "@react-native/js-polyfills": "0.73.1",
     "@react-native/normalize-colors": "0.73.2",
-    "@react-native-tvos/virtualized-lists": "0.73.6-2",
+    "@react-native-tvos/virtualized-lists": "0.73.6-3",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",

package/sdks/.hermesversion

@@ -1 +1 @@
-hermes-2024-03-01-RNv0.73.5-5e3ba8a5ff73efc46f4570492176b0605de77ed6
+hermes-2024-04-19-RNv0.73.0-4f027b891c5e0a187dfd1a98ce80c3ec61dbc9c8

package/template/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "expo": "^50.0.2",
     "react": "18.2.0",
-    "react-native": "npm:react-native-tvos@0.73.6-2"
+    "react-native": "npm:react-native-tvos@0.73.6-3"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",