react-native-tvos 0.74.0-0rc1 → 0.74.0-0rc3

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: '0rc1',
+  prerelease: '0rc3',
 };
 
 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/React-Native

@@ -0,0 +1,214 @@
+/**
+ * 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.
+ *
+ * @flow strict-local
+ * @format
+ * @oncall react_native
+ */
+
+import type {
+  ReactDevToolsAgent,
+  ReactDevToolsGlobalHook,
+} from '../Types/ReactDevToolsTypes';
+import type {Props} from './AppContainer';
+
+import ReactNativeStyleAttributes from '../Components/View/ReactNativeStyleAttributes';
+import View from '../Components/View/View';
+import Platform from '../Utilities/Platform';
+// import DebuggingOverlay from '../Debugging/DebuggingOverlay';
+// import useSubscribeToDebuggingOverlayRegistry from '../Debugging/useSubscribeToDebuggingOverlayRegistry';
+import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
+import LogBoxNotificationContainer from '../LogBox/LogBoxNotificationContainer';
+import StyleSheet from '../StyleSheet/StyleSheet';
+import {RootTagContext, createRootTag} from './RootTag';
+import * as React from 'react';
+
+const {useEffect, useState, useCallback} = React;
+
+const reactDevToolsHook: ReactDevToolsGlobalHook =
+  window.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+
+// Required for React DevTools to view / edit React Native styles in Flipper.
+// Flipper doesn't inject these values when initializing DevTools.
+if (reactDevToolsHook) {
+  reactDevToolsHook.resolveRNStyle = require('../StyleSheet/flattenStyle');
+  reactDevToolsHook.nativeStyleEditorValidAttributes = Object.keys(
+    ReactNativeStyleAttributes,
+  );
+}
+
+type InspectorDeferredProps = {
+  inspectedViewRef: InspectedViewRef,
+  onInspectedViewRerenderRequest: () => void,
+  reactDevToolsAgent?: ReactDevToolsAgent,
+};
+
+const InspectorDeferred = ({
+  inspectedViewRef,
+  onInspectedViewRerenderRequest,
+  reactDevToolsAgent,
+}: InspectorDeferredProps) => {
+  // D39382967 adds a require cycle: InitializeCore -> AppContainer -> Inspector -> InspectorPanel -> ScrollView -> InitializeCore
+  // We can't remove it yet, fallback to dynamic require for now. This is the only reason why this logic is in a separate function.
+  const Inspector = require('../Inspector/Inspector');
+
+  return (
+    <Inspector
+      inspectedViewRef={inspectedViewRef}
+      onRequestRerenderApp={onInspectedViewRerenderRequest}
+      reactDevToolsAgent={reactDevToolsAgent}
+    />
+  );
+};
+
+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,
+  initialProps,
+  internal_excludeInspector = false,
+  internal_excludeLogBox = false,
+  rootTag,
+  showArchitectureIndicator,
+  WrapperComponent,
+}: Props): React.Node => {
+  const appContainerRootViewRef: AppContainerRootViewRef = React.useRef(null);
+  const innerViewRef: InspectedViewRef = React.useRef(null);
+  const debuggingOverlayRef: DebuggingOverlayRef = React.useRef(null);
+
+/*
+  useSubscribeToDebuggingOverlayRegistry(
+    appContainerRootViewRef,
+    debuggingOverlayRef,
+  );
+ */
+
+  const [key, setKey] = useState(0);
+  const [shouldRenderInspector, setShouldRenderInspector] = useState(false);
+  const [reactDevToolsAgent, setReactDevToolsAgent] =
+    useState<ReactDevToolsAgent | void>(reactDevToolsHook?.reactDevtoolsAgent);
+
+  useEffect(() => {
+    let inspectorSubscription = null;
+    if (!internal_excludeInspector) {
+      inspectorSubscription = RCTDeviceEventEmitter.addListener(
+        'toggleElementInspector',
+        () => setShouldRenderInspector(value => !value),
+      );
+    }
+
+    let reactDevToolsAgentListener = null;
+    // If this is first render, subscribe to the event from React DevTools hook
+    if (reactDevToolsHook != null && reactDevToolsAgent == null) {
+      reactDevToolsAgentListener = setReactDevToolsAgent;
+      reactDevToolsHook.on?.('react-devtools', reactDevToolsAgentListener);
+    }
+
+    return () => {
+      inspectorSubscription?.remove();
+
+      if (
+        reactDevToolsHook?.off != null &&
+        reactDevToolsAgentListener != null
+      ) {
+        reactDevToolsHook.off('react-devtools', reactDevToolsAgentListener);
+      }
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  let innerView: React.Node = (
+    <View
+      collapsable={reactDevToolsAgent == null && !shouldRenderInspector}
+      pointerEvents="box-none"
+      key={key}
+      style={styles.container}
+      ref={innerViewRef}>
+      {children}
+    </View>
+  );
+
+  if (WrapperComponent != null) {
+    innerView = (
+      <WrapperComponent
+        initialProps={initialProps}
+        fabric={fabric === true}
+        showArchitectureIndicator={showArchitectureIndicator === true}>
+        {innerView}
+      </WrapperComponent>
+    );
+  }
+
+  const onInspectedViewRerenderRequest = useCallback(
+    () => setKey(k => k + 1),
+    [],
+  );
+
+  return (
+    <RootTagContext.Provider value={createRootTag(rootTag)}>
+      <View
+        ref={appContainerRootViewRef}
+        style={styles.container}
+        pointerEvents="box-none">
+        {innerView}
+
+        {/* <DebuggingOverlay ref={debuggingOverlayRef} /> */}
+
+        {reactDevToolsAgent != null && (
+          <ReactDevToolsOverlayDeferred
+            inspectedViewRef={innerViewRef}
+            reactDevToolsAgent={reactDevToolsAgent}
+          />
+        )}
+
+        {shouldRenderInspector && (
+          <InspectorDeferred
+            inspectedViewRef={innerViewRef}
+            onInspectedViewRerenderRequest={onInspectedViewRerenderRequest}
+            reactDevToolsAgent={reactDevToolsAgent}
+          />
+        )}
+
+        {!internal_excludeLogBox && <LogBoxNotificationContainer />}
+      </View>
+    </RootTagContext.Provider>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {flex: 1},
+});
+
+export type AppContainerRootViewRef = React.RefObject<React.ElementRef<
+  typeof View,
+> | null>;
+export type InspectedViewRef = React.RefObject<React.ElementRef<
+  typeof View,
+> | null>;
+export type DebuggingOverlayRef = React.RefObject<React.ElementRef<
+  typeof DebuggingOverlay,
+> | null>;
+
+export default AppContainer;

package/Libraries/ReactNative/AppContainer-dev.js

@@ -18,8 +18,11 @@ import type {Props} from './AppContainer';
 import ReactNativeStyleAttributes from '../Components/View/ReactNativeStyleAttributes';
 import View from '../Components/View/View';
 import Platform from '../Utilities/Platform';
+/*
+// Stub out DebuggingOverlay from TV for now
 import DebuggingOverlay from '../Debugging/DebuggingOverlay';
 import useSubscribeToDebuggingOverlayRegistry from '../Debugging/useSubscribeToDebuggingOverlayRegistry';
+ */
 import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
 import LogBoxNotificationContainer from '../LogBox/LogBoxNotificationContainer';
 import StyleSheet from '../StyleSheet/StyleSheet';
@@ -96,12 +99,14 @@ const AppContainer = ({
 }: Props): React.Node => {
   const appContainerRootViewRef: AppContainerRootViewRef = React.useRef(null);
   const innerViewRef: InspectedViewRef = React.useRef(null);
+/*
   const debuggingOverlayRef: DebuggingOverlayRef = React.useRef(null);
 
   useSubscribeToDebuggingOverlayRegistry(
     appContainerRootViewRef,
     debuggingOverlayRef,
   );
+ */
 
   const [key, setKey] = useState(0);
   const [shouldRenderInspector, setShouldRenderInspector] = useState(false);
@@ -172,7 +177,7 @@ const AppContainer = ({
         pointerEvents="box-none">
         {innerView}
 
-        {!Platform.isTV ? <DebuggingOverlay ref={debuggingOverlayRef} /> : null}
+        {/* <DebuggingOverlay ref={debuggingOverlayRef} /> */}
 
         {reactDevToolsAgent != null && (
           <ReactDevToolsOverlayDeferred

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 */