react-native-tvos 0.74.0-0rc0 → 0.74.0-0rc2

package/Libraries/AppDelegate/RCTAppDelegate.mm

@@ -243,13 +243,18 @@
 
 - (RCTRootViewFactory *)createRCTRootViewFactory
 {
+  __weak __typeof(self) weakSelf = self;
+  RCTBundleURLBlock bundleUrlBlock = ^{
+    RCTAppDelegate *strongSelf = weakSelf;
+    return strongSelf.bundleURL;
+  };
+
   RCTRootViewFactoryConfiguration *configuration =
-      [[RCTRootViewFactoryConfiguration alloc] initWithBundleURL:self.bundleURL
-                                                  newArchEnabled:self.fabricEnabled
-                                              turboModuleEnabled:self.turboModuleEnabled
-                                               bridgelessEnabled:self.bridgelessEnabled];
+      [[RCTRootViewFactoryConfiguration alloc] initWithBundleURLBlock:bundleUrlBlock
+                                                       newArchEnabled:self.fabricEnabled
+                                                   turboModuleEnabled:self.turboModuleEnabled
+                                                    bridgelessEnabled:self.bridgelessEnabled];
 
-  __weak __typeof(self) weakSelf = self;
   configuration.createRootViewWithBridge = ^UIView *(RCTBridge *bridge, NSString *moduleName, NSDictionary *initProps)
   {
     return [weakSelf createRootViewWithBridge:bridge moduleName:moduleName initProps:initProps];

package/Libraries/AppDelegate/RCTRootViewFactory.h

@@ -23,6 +23,11 @@ typedef UIView *_Nonnull (
     ^RCTCreateRootViewWithBridgeBlock)(RCTBridge *bridge, NSString *moduleName, NSDictionary *initProps);
 typedef RCTBridge *_Nonnull (
     ^RCTCreateBridgeWithDelegateBlock)(id<RCTBridgeDelegate> delegate, NSDictionary *launchOptions);
+typedef NSURL *_Nullable (^RCTSourceURLForBridgeBlock)(RCTBridge *bridge);
+typedef NSURL *_Nullable (^RCTBundleURLBlock)(void);
+typedef NSArray<id<RCTBridgeModule>> *_Nonnull (^RCTExtraModulesForBridgeBlock)(RCTBridge *bridge);
+typedef NSDictionary<NSString *, Class> *_Nonnull (^RCTExtraLazyModuleClassesForBridge)(RCTBridge *bridge);
+typedef BOOL (^RCTBridgeDidNotFindModuleBlock)(RCTBridge *bridge, NSString *moduleName);
 
 #pragma mark - RCTRootViewFactory Configuration
 @interface RCTRootViewFactoryConfiguration : NSObject
@@ -37,7 +42,7 @@ typedef RCTBridge *_Nonnull (
 @property (nonatomic, assign, readonly) BOOL turboModuleEnabled;
 
 /// Return the bundle URL for the main bundle.
-@property (nonatomic) NSURL *bundleURL;
+@property (nonatomic, nonnull) RCTBundleURLBlock bundleURLBlock;
 
 /**
  * Use this method to initialize a new instance of `RCTRootViewFactoryConfiguration` by passing a `bundleURL`
@@ -48,10 +53,15 @@ typedef RCTBridge *_Nonnull (
  * pointing to a path inside the app resources, e.g. `file://.../main.jsbundle`.
  *
  */
+- (instancetype)initWithBundleURLBlock:(RCTBundleURLBlock)bundleURLBlock
+                        newArchEnabled:(BOOL)newArchEnabled
+                    turboModuleEnabled:(BOOL)turboModuleEnabled
+                     bridgelessEnabled:(BOOL)bridgelessEnabled NS_DESIGNATED_INITIALIZER;
+
 - (instancetype)initWithBundleURL:(NSURL *)bundleURL
                    newArchEnabled:(BOOL)newArchEnabled
                turboModuleEnabled:(BOOL)turboModuleEnabled
-                bridgelessEnabled:(BOOL)bridgelessEnabled;
+                bridgelessEnabled:(BOOL)bridgelessEnabled __deprecated;
 
 /**
  * Block that allows to override logic of creating root view instance.
@@ -107,7 +117,7 @@ typedef RCTBridge *_Nonnull (
  *
  * @parameter: moduleName  - the name of the app, used by Metro to resolve the module.
  * @parameter: initialProperties  -  a set of initial properties.
- * @parameter: moduleName  - a dictionary with a set of options.
+ * @parameter: launchOptions  - a dictionary with a set of options.
  */
 - (UIView *_Nonnull)viewWithModuleName:(NSString *)moduleName
                      initialProperties:(NSDictionary *__nullable)initialProperties

package/Libraries/AppDelegate/RCTRootViewFactory.mm

@@ -57,9 +57,23 @@ static NSDictionary *updateInitialProps(NSDictionary *initialProps, BOOL isFabri
                    newArchEnabled:(BOOL)newArchEnabled
                turboModuleEnabled:(BOOL)turboModuleEnabled
                 bridgelessEnabled:(BOOL)bridgelessEnabled
+{
+  return [self
+      initWithBundleURLBlock:^{
+        return bundleURL;
+      }
+              newArchEnabled:newArchEnabled
+          turboModuleEnabled:turboModuleEnabled
+           bridgelessEnabled:bridgelessEnabled];
+}
+
+- (instancetype)initWithBundleURLBlock:(RCTBundleURLBlock)bundleURLBlock
+                        newArchEnabled:(BOOL)newArchEnabled
+                    turboModuleEnabled:(BOOL)turboModuleEnabled
+                     bridgelessEnabled:(BOOL)bridgelessEnabled
 {
   if (self = [super init]) {
-    _bundleURL = bundleURL;
+    _bundleURLBlock = bundleURLBlock;
     _fabricEnabled = newArchEnabled;
     _turboModuleEnabled = turboModuleEnabled;
     _bridgelessEnabled = bridgelessEnabled;
@@ -123,7 +137,7 @@ static NSDictionary *updateInitialProps(NSDictionary *initialProps, BOOL isFabri
     RCTEnableTurboModuleInterop(YES);
     RCTEnableTurboModuleInteropBridgeProxy(YES);
 
-    [self createReactHostIfNeeded];
+    [self createReactHostIfNeeded:launchOptions];
 
     RCTFabricSurface *surface = [_reactHost createSurfaceWithModuleName:moduleName initialProperties:initProps];
 
@@ -208,19 +222,20 @@ static NSDictionary *updateInitialProps(NSDictionary *initialProps, BOOL isFabri
 
 #pragma mark - New Arch Utilities
 
-- (void)createReactHostIfNeeded
+- (void)createReactHostIfNeeded:(NSDictionary *)launchOptions
 {
   if (_reactHost) {
     return;
   }
 
   __weak __typeof(self) weakSelf = self;
-  _reactHost = [[RCTHost alloc] initWithBundleURL:[self bundleURL]
-                                     hostDelegate:nil
-                       turboModuleManagerDelegate:_turboModuleManagerDelegate
-                                 jsEngineProvider:^std::shared_ptr<facebook::react::JSRuntimeFactory>() {
-                                   return [weakSelf createJSRuntimeFactory];
-                                 }];
+  _reactHost = [[RCTHost alloc] initWithBundleURLProvider:self->_configuration.bundleURLBlock
+                                             hostDelegate:nil
+                               turboModuleManagerDelegate:_turboModuleManagerDelegate
+                                         jsEngineProvider:^std::shared_ptr<facebook::react::JSRuntimeFactory>() {
+                                           return [weakSelf createJSRuntimeFactory];
+                                         }
+                                            launchOptions:launchOptions];
   [_reactHost setBundleURLProvider:^NSURL *() {
     return [weakSelf bundleURL];
   }];
@@ -249,7 +264,7 @@ static NSDictionary *updateInitialProps(NSDictionary *initialProps, BOOL isFabri
 
 - (NSURL *)bundleURL
 {
-  return self->_configuration.bundleURL;
+  return self->_configuration.bundleURLBlock();
 }
 
 @end

package/Libraries/Components/Pressable/Pressable.js

@@ -388,19 +388,15 @@ function Pressable(props: Props, forwardedRef): React.Node {
           setFocused(false);
         }
       }
-      // Use these on tvOS only. Android press events go to onClick() so we don't
-      // need to call onPress() again here
-      if (Platform.isTVOS) {
-        // $FlowFixMe[prop-missing]
-        if (focused && evt.eventType === 'select') {
-          // $FlowFixMe[incompatible-exact]
-          onPress && onPress(evt);
-        }
-        // $FlowFixMe[prop-missing]
-        if (focused && evt.eventType === 'longSelect') {
-          // $FlowFixMe[incompatible-exact]
-          onLongPress && onLongPress(evt);
-        }
+      // $FlowFixMe[prop-missing]
+      if (focused && evt.eventType === 'select') {
+        // $FlowFixMe[incompatible-exact]
+        onPress && onPress(evt);
+      }
+      // $FlowFixMe[prop-missing]
+      if (focused && evt.eventType === 'longSelect') {
+        // $FlowFixMe[incompatible-exact]
+        onLongPress && onLongPress(evt);
       }
     },
     [focused, onBlur, onFocus, onLongPress, onPress, focusable, isTVSelectable],

package/Libraries/Components/Touchable/TVTouchable.js

@@ -54,7 +54,7 @@ export default class TVTouchable {
             config.onPress(tvData);
           }
         } else if (tvData.eventType === 'longSelect') {
-          if (Platform.OS !== 'android' && !config.getDisabled()) {
+          if (!config.getDisabled()) {
             config.onLongPress(tvData);
           }
         }

package/Libraries/Components/Touchable/TouchableHighlight.js

@@ -399,12 +399,12 @@ class TouchableHighlight extends React.Component<Props, State> {
           }
         },
         onPress: event => {
-          if (this.props.onPress != null && Platform.OS !== 'android') {
+          if (this.props.onPress != null) {
             this.props.onPress(event);
           }
         },
         onLongPress: event => {
-          if (this.props.onLongPress != null && Platform.OS !== 'android') {
+          if (this.props.onLongPress != null) {
             this.props.onLongPress(event);
           }
         },

package/Libraries/Components/Touchable/TouchableNativeFeedback.js

@@ -356,12 +356,12 @@ class TouchableNativeFeedback extends React.Component<Props, State> {
           }
         },
         onPress: event => {
-          if (this.props.onPress != null && Platform.OS !== 'android') {
+          if (this.props.onPress != null) {
             this.props.onPress(event);
           }
         },
         onLongPress: event => {
-          if (this.props.onLongPress != null && Platform.OS !== 'android') {
+          if (this.props.onLongPress != null) {
             this.props.onLongPress(event);
           }
         },

package/Libraries/Components/Touchable/TouchableOpacity.js

@@ -328,12 +328,12 @@ class TouchableOpacity extends React.Component<Props, State> {
           }
         },
         onPress: event => {
-          if (this.props.onPress != null && Platform.OS !== 'android') {
+          if (this.props.onPress != null) {
             this.props.onPress(event);
           }
         },
         onLongPress: event => {
-          if (this.props.onLongPress != null && Platform.OS !== 'android') {
+          if (this.props.onLongPress != null) {
             this.props.onLongPress(event);
           }
         },

package/Libraries/Core/ReactNativeVersion.js

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

package/Libraries/Pressability/Pressability.js

@@ -582,6 +582,11 @@ export default class Pressability {
           return;
         }
 
+        // Remove spurious onClick events with empty event object generated on Android TV
+        if (Platform.isTV && !event?.eventType) {
+          return;
+        }
+
         const {onPress, disabled} = this._config;
         if (onPress != null && disabled !== true) {
           onPress(event);

package/Libraries/ReactNative/AppContainer-dev.js

@@ -21,7 +21,6 @@ import Platform from '../Utilities/Platform';
 import DebuggingOverlay from '../Debugging/DebuggingOverlay';
 import useSubscribeToDebuggingOverlayRegistry from '../Debugging/useSubscribeToDebuggingOverlayRegistry';
 import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
-import ReactDevToolsOverlay from '../Inspector/ReactDevToolsOverlay';
 import LogBoxNotificationContainer from '../LogBox/LogBoxNotificationContainer';
 import StyleSheet from '../StyleSheet/StyleSheet';
 import {RootTagContext, createRootTag} from './RootTag';
@@ -65,6 +64,26 @@ const InspectorDeferred = ({
   );
 };
 
+type ReactDevToolsOverlayDeferredProps = {
+  inspectedViewRef: InspectedViewRef,
+  reactDevToolsAgent: ReactDevToolsAgent,
+};
+
+const ReactDevToolsOverlayDeferred = ({
+  inspectedViewRef,
+  reactDevToolsAgent,
+}: ReactDevToolsOverlayDeferredProps) => {
+  const ReactDevToolsOverlay =
+    require('../Inspector/ReactDevToolsOverlay').default;
+
+  return (
+    <ReactDevToolsOverlay
+      inspectedViewRef={inspectedViewRef}
+      reactDevToolsAgent={reactDevToolsAgent}
+    />
+  );
+};
+
 const AppContainer = ({
   children,
   fabric,
@@ -156,7 +175,7 @@ const AppContainer = ({
         {!Platform.isTV ? <DebuggingOverlay ref={debuggingOverlayRef} /> : null}
 
         {reactDevToolsAgent != null && (
-          <ReactDevToolsOverlay
+          <ReactDevToolsOverlayDeferred
             inspectedViewRef={innerViewRef}
             reactDevToolsAgent={reactDevToolsAgent}
           />

package/React/Base/RCTBridge+Inspector.h

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <React/RCTBridge.h>
+
+#ifdef __cplusplus
+#import <jsinspector-modern/ReactCdp.h>
+#endif
+
+@interface RCTBridge (Inspector)
+
+/**
+ * The HostTarget for this bridge, if one has been created. Exposed for RCTCxxBridge only.
+ */
+@property (nonatomic, assign, readonly)
+#ifdef __cplusplus
+    facebook::react::jsinspector_modern::PageTarget *
+#else
+    // The inspector infrastructure cannot be used in C or Swift code.
+    void *
+#endif
+        inspectorTarget;
+
+@property (nonatomic, readonly, getter=isInspectable) BOOL inspectable;
+
+@end

package/React/Base/RCTBridge+Private.h

@@ -6,9 +6,6 @@
  */
 
 #import <React/RCTBridge.h>
-#ifdef __cplusplus
-#import <jsinspector-modern/ReactCdp.h>
-#endif
 
 @class RCTModuleRegistry;
 @class RCTModuleData;
@@ -73,17 +70,6 @@ RCT_EXTERN void RCTRegisterModule(Class);
  */
 @property (nonatomic, strong, readonly) RCTModuleRegistry *moduleRegistry;
 
-/**
- * The page target for this bridge, if one has been created. Exposed for RCTCxxBridge only.
- */
-@property (nonatomic, assign, readonly)
-#ifdef __cplusplus
-    facebook::react::jsinspector_modern::PageTarget *
-#else
-    // The inspector infrastructure cannot be used in C code.
-    void *
-#endif
-        inspectorTarget;
 @end
 
 @interface RCTBridge (RCTCxxBridge)
@@ -155,12 +141,6 @@ RCT_EXTERN void RCTRegisterModule(Class);
 
 @end
 
-@interface RCTBridge (Inspector)
-
-@property (nonatomic, readonly, getter=isInspectable) BOOL inspectable;
-
-@end
-
 @interface RCTCxxBridge : RCTBridge
 
 // TODO(cjhopman): this seems unsafe unless we require that it is only called on the main js queue.

package/React/Base/RCTBridge.mm

@@ -6,6 +6,7 @@
  */
 
 #import "RCTBridge.h"
+#import "RCTBridge+Inspector.h"
 #import "RCTBridge+Private.h"
 
 #import <objc/runtime.h>

package/React/Base/RCTBridgeProxy.h

@@ -9,6 +9,8 @@
 
 #import "RCTBridgeModule.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @class RCTBundleManager;
 @class RCTCallableJSModules;
 @class RCTModuleRegistry;
@@ -22,7 +24,8 @@
                    callableJSModules:(RCTCallableJSModules *)callableJSModules
                   dispatchToJSThread:(void (^)(dispatch_block_t))dispatchToJSThread
                registerSegmentWithId:(void (^)(NSNumber *, NSString *))registerSegmentWithId
-                             runtime:(void *)runtime NS_DESIGNATED_INITIALIZER;
+                             runtime:(void *)runtime
+                       launchOptions:(nullable NSDictionary *)launchOptions NS_DESIGNATED_INITIALIZER;
 
 - (NSMethodSignature *)methodSignatureForSelector:(SEL)sel;
 - (void)forwardInvocation:(NSInvocation *)invocation;
@@ -37,3 +40,5 @@
 - (id)moduleForName:(NSString *)moduleName lazilyLoadIfNecessary:(BOOL)lazilyLoad;
 
 @end
+
+NS_ASSUME_NONNULL_END

package/React/Base/RCTBridgeProxy.mm

@@ -35,6 +35,7 @@ using namespace facebook;
   RCTModuleRegistry *_moduleRegistry;
   RCTBundleManager *_bundleManager;
   RCTCallableJSModules *_callableJSModules;
+  NSDictionary *_launchOptions;
   void (^_dispatchToJSThread)(dispatch_block_t);
   void (^_registerSegmentWithId)(NSNumber *, NSString *);
   void *_runtime;
@@ -47,6 +48,7 @@ using namespace facebook;
                   dispatchToJSThread:(void (^)(dispatch_block_t))dispatchToJSThread
                registerSegmentWithId:(void (^)(NSNumber *, NSString *))registerSegmentWithId
                              runtime:(void *)runtime
+                       launchOptions:(nullable NSDictionary *)launchOptions
 {
   self = [super self];
   if (self) {
@@ -57,6 +59,7 @@ using namespace facebook;
     _dispatchToJSThread = dispatchToJSThread;
     _registerSegmentWithId = registerSegmentWithId;
     _runtime = runtime;
+    _launchOptions = [launchOptions copy];
   }
   return self;
 }
@@ -191,8 +194,7 @@ using namespace facebook;
 
 - (NSDictionary *)launchOptions
 {
-  [self logError:@"This method is not supported. Returning nil." cmd:_cmd];
-  return nil;
+  return _launchOptions;
 }
 
 - (BOOL)loading

package/React/Base/RCTTVNavigationEventNotification.h

@@ -0,0 +1,37 @@
+/*
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#ifndef RCTTVNavigationEventNotification_h
+#define RCTTVNavigationEventNotification_h
+
+#import <Foundation/Foundation.h>
+#import "RCTTVNavigationEventNotificationConstants.h"
+#import "RCTTVRemoteHandlerConstants.h"
+
+@interface NSNotificationCenter (RCTTVNavigationEventNotification)
+
+- (void)postNavigationFocusEventWithTag:(NSNumber * _Nullable)eventTag
+                                 target:(NSNumber * _Nullable)eventTarget;
+
+- (void)postNavigationBlurEventWithTag:(NSNumber * _Nullable)eventTag
+                                target:(NSNumber * _Nullable)eventTarget;
+
+- (void)postNavigationPressEventWithType:(RCTTVRemoteEvent _Nonnull)eventType
+                               keyAction:(RCTTVRemoteEventKeyAction _Nullable)eventKeyAction
+                                     tag:(NSNumber * _Nullable)eventTag
+                                  target:(NSNumber * _Nullable)eventTarget;
+
+- (void)postNavigationTouchEventWithType:(RCTTVRemoteEvent _Nonnull)eventType
+                                    body:(NSDictionary * _Nullable)eventBody;
+@end
+
+@interface UIGestureRecognizer (RCTTVNavigationEventNotification)
+
+@property (readonly, nullable) RCTTVRemoteEventKeyAction eventKeyAction;
+@property (readonly, nonnull) NSDictionary *eventState;
+
+@end
+
+#endif /* RCTTVNavigationEventNotification_h */

package/React/Base/RCTTVNavigationEventNotification.mm

@@ -0,0 +1,106 @@
+/*
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTTVNavigationEventNotification.h"
+#import "RCTTVNavigationEventNotificationConstants.h"
+
+@implementation NSNotificationCenter (RCTTVNavigationEventNotification)
+- (void)postNavigationFocusEventWithTag:(NSNumber * _Nullable)eventTag
+                                 target:(NSNumber * _Nullable)eventTarget {
+    [self postNavigationEventWithtEventType:@"focus" keyAction:RCTTVRemoteEventKeyActionUnknown tag:eventTag target:eventTarget body:nil];
+}
+
+- (void)postNavigationBlurEventWithTag:(NSNumber * _Nullable)eventTag
+                                target:(NSNumber * _Nullable)eventTarget {
+    [self postNavigationEventWithtEventType:@"blur" keyAction:RCTTVRemoteEventKeyActionUnknown tag:eventTag target:eventTarget body:nil];
+}
+
+- (void)postNavigationPressEventWithType:(RCTTVRemoteEvent _Nonnull)eventType
+                               keyAction:(RCTTVRemoteEventKeyAction _Nullable)eventKeyAction
+                                     tag:(NSNumber * _Nullable)eventTag
+                                  target:(NSNumber * _Nullable)eventTarget {
+
+    [self postNavigationEventWithtEventType:eventType keyAction:eventKeyAction tag:eventTag target:eventTarget body:nil];
+
+}
+
+- (void)postNavigationTouchEventWithType:(RCTTVRemoteEvent _Nonnull)eventType
+                                    body:(NSDictionary * _Nullable)eventBody {
+    [self postNavigationEventWithtEventType:eventType keyAction:nil tag:nil target:nil body:eventBody];
+
+}
+
+#pragma mark - Private
+
+- (void)postNavigationEventWithtEventType:(NSString *)eventType
+                                keyAction:(RCTTVRemoteEventKeyAction _Nullable)eventKeyAction
+                                      tag:(NSNumber * _Nullable)eventTag
+                                   target:(NSNumber * _Nullable)eventTarget
+                                     body:(NSDictionary * _Nullable)eventBody
+
+{
+    NSMutableDictionary *payload = [@{RCTTVNavigationEventNotificationKeyEventType : eventType} mutableCopy];
+
+    if (eventKeyAction != nil) {
+        payload[RCTTVNavigationEventNotificationKeyEventKeyAction] = eventKeyAction;
+    }
+
+    if (eventTag != nil) {
+        payload[RCTTVNavigationEventNotificationKeyTag] = eventTag;
+    }
+
+    if (eventTarget != nil) {
+        payload[RCTTVNavigationEventNotificationKeyTarget] = eventTarget;
+    }
+
+    if (eventBody != nil && eventBody.count > 0) {
+        payload[RCTTVNavigationEventNotificationKeyBody] = eventBody;
+    }
+
+    [self postNotificationName:RCTTVNavigationEventNotificationName object:[payload copy]];
+}
+
+@end
+
+@implementation UIGestureRecognizer (RCTTVNavigationEventNotification)
+
+- (RCTTVRemoteEventKeyAction _Nullable)eventKeyAction
+{
+    switch (self.state) {
+        case UIGestureRecognizerStateBegan:
+            return RCTTVRemoteEventKeyActionDown;
+        case UIGestureRecognizerStateEnded:
+            return RCTTVRemoteEventKeyActionUp;
+        default:
+            return nil;
+    }
+}
+
+- (NSDictionary * _Nonnull)eventState {
+    NSString *eventBodyState = self.eventBodyState;
+    if (eventBodyState) {
+        return @{@"state": eventBodyState};
+    }
+    else {
+        return @{};
+    }
+}
+
+#pragma mark - Private
+
+- (NSString * _Nullable)eventBodyState {
+    switch (self.state) {
+        case UIGestureRecognizerStateBegan:
+            return @"Began";
+        case UIGestureRecognizerStateChanged:
+            return @"Changed";
+        case UIGestureRecognizerStateEnded:
+            return @"Ended";
+        default:
+            return nil;
+    }
+}
+
+@end

package/React/Base/RCTTVNavigationEventNotificationConstants.h

@@ -0,0 +1,25 @@
+/*
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#ifndef RCTTVNavigationEventNotificationConstants_h
+#define RCTTVNavigationEventNotificationConstants_h
+
+#import <Foundation/Foundation.h>
+
+extern NSString * _Nonnull const RCTTVNavigationEventNotificationName;
+
+typedef NSString *RCTTVNavigationEventNotificationKey NS_TYPED_ENUM;
+extern RCTTVNavigationEventNotificationKey _Nonnull const RCTTVNavigationEventNotificationKeyEventType;
+extern RCTTVNavigationEventNotificationKey _Nonnull const RCTTVNavigationEventNotificationKeyEventKeyAction;
+extern RCTTVNavigationEventNotificationKey _Nonnull const RCTTVNavigationEventNotificationKeyTag;
+extern RCTTVNavigationEventNotificationKey _Nonnull const RCTTVNavigationEventNotificationKeyTarget;
+extern RCTTVNavigationEventNotificationKey _Nonnull const RCTTVNavigationEventNotificationKeyBody;
+
+typedef NSNumber *RCTTVRemoteEventKeyAction NS_TYPED_ENUM;
+extern RCTTVRemoteEventKeyAction _Nonnull const RCTTVRemoteEventKeyActionUnknown;
+extern RCTTVRemoteEventKeyAction _Nonnull const RCTTVRemoteEventKeyActionDown;
+extern RCTTVRemoteEventKeyAction _Nonnull const RCTTVRemoteEventKeyActionUp;
+
+#endif /* RCTTVNavigationEventNotificationConstants_h */

package/React/Base/RCTTVNavigationEventNotificationConstants.mm

@@ -0,0 +1,18 @@
+/*
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTTVNavigationEventNotificationConstants.h"
+
+NSString *const RCTTVNavigationEventNotificationName = @"RCTTVNavigationEventNotification";
+
+RCTTVNavigationEventNotificationKey _Nonnull const RCTTVNavigationEventNotificationKeyEventType = @"eventType";
+RCTTVNavigationEventNotificationKey _Nonnull const RCTTVNavigationEventNotificationKeyEventKeyAction = @"eventKeyAction";
+RCTTVNavigationEventNotificationKey _Nonnull const RCTTVNavigationEventNotificationKeyTag = @"tag";
+RCTTVNavigationEventNotificationKey _Nonnull const RCTTVNavigationEventNotificationKeyTarget = @"target";
+RCTTVNavigationEventNotificationKey _Nonnull const RCTTVNavigationEventNotificationKeyBody = @"body";
+
+RCTTVRemoteEventKeyAction _Nonnull const RCTTVRemoteEventKeyActionUnknown = @(-1);
+RCTTVRemoteEventKeyAction _Nonnull const RCTTVRemoteEventKeyActionDown = @(0);
+RCTTVRemoteEventKeyAction _Nonnull const RCTTVRemoteEventKeyActionUp = @(1);

package/React/Base/RCTTVRemoteHandler.h

@@ -16,32 +16,6 @@ extern NSString * _Nonnull const RCTTVDisablePanGestureNotification;
 extern NSString * _Nonnull const RCTTVEnableGestureHandlersCancelTouchesNotification;
 extern NSString * _Nonnull const RCTTVDisableGestureHandlersCancelTouchesNotification;
 
-extern NSString * _Nonnull const RCTTVRemoteEventMenu;
-extern NSString * _Nonnull const RCTTVRemoteEventPlayPause;
-extern NSString * _Nonnull const RCTTVRemoteEventSelect;
-
-extern NSString * _Nonnull const RCTTVRemoteEventLongPlayPause;
-extern NSString * _Nonnull const RCTTVRemoteEventLongSelect;
-extern NSString * _Nonnull const RCTTVRemoteEventLongUp;
-extern NSString * _Nonnull const RCTTVRemoteEventLongDown;
-extern NSString * _Nonnull const RCTTVRemoteEventLongLeft;
-extern NSString * _Nonnull const RCTTVRemoteEventLongRight;
-
-extern NSString * _Nonnull const RCTTVRemoteEventLeft;
-extern NSString * _Nonnull const RCTTVRemoteEventRight;
-extern NSString * _Nonnull const RCTTVRemoteEventUp;
-extern NSString * _Nonnull const RCTTVRemoteEventDown;
-
-extern NSString * _Nonnull const RCTTVRemoteEventPageUp;
-extern NSString * _Nonnull const RCTTVRemoteEventPageDown;
-
-extern NSString * _Nonnull const RCTTVRemoteEventSwipeLeft;
-extern NSString * _Nonnull const RCTTVRemoteEventSwipeRight;
-extern NSString * _Nonnull const RCTTVRemoteEventSwipeUp;
-extern NSString * _Nonnull const RCTTVRemoteEventSwipeDown;
-
-extern NSString * _Nonnull const RCTTVRemoteEventPan;
-
 @interface RCTTVRemoteHandler : NSObject
 
 - (instancetype _Nonnull )initWithView:(UIView * _Nonnull)view;