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

package/React/Base/RCTTVRemoteHandler.m

@@ -15,6 +15,7 @@
 #import "RCTLog.h"
 #import "RCTRootView.h"
 #import "RCTTVNavigationEventEmitter.h"
+#import "RCTTVNavigationEventNotification.h"
 #import "RCTUIManager.h"
 #import "RCTUtils.h"
 #import "RCTView.h"
@@ -29,32 +30,6 @@ NSString *const RCTTVDisablePanGestureNotification = @"RCTTVDisablePanGestureNot
 NSString *const RCTTVEnableGestureHandlersCancelTouchesNotification = @"RCTTVEnableGestureHandlersCancelTouchesNotification";
 NSString *const RCTTVDisableGestureHandlersCancelTouchesNotification = @"RCTTVDisableGestureHandlersCancelTouchesNotification";
 
-NSString *const RCTTVRemoteEventMenu = @"menu";
-NSString *const RCTTVRemoteEventPlayPause = @"playPause";
-NSString *const RCTTVRemoteEventSelect = @"select";
-
-NSString *const RCTTVRemoteEventLongPlayPause = @"longPlayPause";
-NSString *const RCTTVRemoteEventLongSelect = @"longSelect";
-NSString *const RCTTVRemoteEventLongUp = @"longUp";
-NSString *const RCTTVRemoteEventLongDown = @"longDown";
-NSString *const RCTTVRemoteEventLongLeft = @"longLeft";
-NSString *const RCTTVRemoteEventLongRight = @"longRight";
-
-NSString *const RCTTVRemoteEventLeft = @"left";
-NSString *const RCTTVRemoteEventRight = @"right";
-NSString *const RCTTVRemoteEventUp = @"up";
-NSString *const RCTTVRemoteEventDown = @"down";
-
-NSString *const RCTTVRemoteEventPageUp = @"pageUp";
-NSString *const RCTTVRemoteEventPageDown = @"pageDown";
-
-NSString *const RCTTVRemoteEventSwipeLeft = @"swipeLeft";
-NSString *const RCTTVRemoteEventSwipeRight = @"swipeRight";
-NSString *const RCTTVRemoteEventSwipeUp = @"swipeUp";
-NSString *const RCTTVRemoteEventSwipeDown = @"swipeDown";
-
-NSString *const RCTTVRemoteEventPan = @"pan";
-
 @interface RCTTVRemoteHandler()
 
 @property (nonatomic, copy, readonly) NSDictionary<NSString *, UIGestureRecognizer *> *tvRemoteGestureRecognizers;
@@ -349,7 +324,8 @@ static __volatile BOOL __gestureHandlersCancelTouches = YES;
     for (NSString *name in [self.tvRemoteGestureRecognizers allKeys]) {
       self.tvRemoteGestureRecognizers[name].cancelsTouchesInView = YES;
     }
-    [self.tvMenuKeyRecognizer setCancelsTouchesInView:YES];
+    // Issue #678: menu key should not be included
+    // [self.tvMenuKeyRecognizer setCancelsTouchesInView:YES];
     [self.tvPanGestureRecognizer setCancelsTouchesInView:YES];
   });
 }
@@ -360,7 +336,8 @@ static __volatile BOOL __gestureHandlersCancelTouches = YES;
     for (NSString *name in [self.tvRemoteGestureRecognizers allKeys]) {
       self.tvRemoteGestureRecognizers[name].cancelsTouchesInView = NO;
     }
-    [self.tvMenuKeyRecognizer setCancelsTouchesInView:NO];
+    // Issue #678: menu key should not be included
+    // [self.tvMenuKeyRecognizer setCancelsTouchesInView:NO];
     [self.tvPanGestureRecognizer setCancelsTouchesInView:NO];
   });
 }
@@ -370,117 +347,117 @@ static __volatile BOOL __gestureHandlersCancelTouches = YES;
 
 - (void)playPausePressed:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventPlayPause];
+    [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventPlayPause keyAction:r.eventKeyAction tag:nil target:nil];
 }
 
 - (void)menuPressed:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventMenu];
+    [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventMenu keyAction:r.eventKeyAction tag:nil target:nil];
 }
 
 - (void)selectPressed:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventSelect];
+    [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventSelect keyAction:r.eventKeyAction tag:nil target:nil];
 }
 
 - (void)longPlayPausePressed:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventLongPlayPause];
+    [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventLongPlayPause keyAction:r.eventKeyAction tag:nil target:nil];
 
 #if RCT_DEV
-  // If shake to show is enabled on device, use long play/pause event to show dev menu
-  [[NSNotificationCenter defaultCenter] postNotificationName:@"RCTShowDevMenuNotification" object:nil];
+    // If shake to show is enabled on device, use long play/pause event to show dev menu
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"RCTShowDevMenuNotification" object:nil];
 #endif
 }
 
 - (void)longSelectPressed:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventLongSelect];
+    [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventLongSelect keyAction:r.eventKeyAction tag:nil target:nil];
 }
 
 - (void)longUpPressed:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventLongUp];
+    [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventLongUp keyAction:r.eventKeyAction tag:nil target:nil];
 }
 
 - (void)longDownPressed:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventLongDown];
+    [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventLongDown keyAction:r.eventKeyAction tag:nil target:nil];
 }
 
 - (void)longLeftPressed:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventLongLeft];
+    [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventLongLeft keyAction:r.eventKeyAction tag:nil target:nil];
 }
 
 - (void)longRightPressed:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventLongRight];
+    [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventLongRight keyAction:r.eventKeyAction tag:nil target:nil];
 }
 
 - (void)swipedUp:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventSwipeUp];
+    [[NSNotificationCenter defaultCenter] postNavigationTouchEventWithType:RCTTVRemoteEventSwipeUp body:r.eventState];
 }
 
 - (void)swipedDown:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventSwipeDown];
+    [[NSNotificationCenter defaultCenter] postNavigationTouchEventWithType:RCTTVRemoteEventSwipeDown body:r.eventState];
 }
 
 - (void)swipedLeft:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventSwipeLeft];
+    [[NSNotificationCenter defaultCenter] postNavigationTouchEventWithType:RCTTVRemoteEventSwipeLeft body:r.eventState];
 }
 
 - (void)swipedRight:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventSwipeRight];
+    [[NSNotificationCenter defaultCenter] postNavigationTouchEventWithType:RCTTVRemoteEventSwipeRight body:r.eventState];
 }
 
 - (void)tappedUp:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventUp];
+    [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventUp keyAction:r.eventKeyAction tag:nil target:nil];
 }
 
 - (void)tappedDown:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventDown];
+    [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventDown keyAction:r.eventKeyAction tag:nil target:nil];
 }
 
 - (void)tappedPageUp:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventPageUp];
+    [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventPageUp keyAction:r.eventKeyAction tag:nil target:nil];
 }
 
 - (void)tappedPageDown:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventPageDown];
+    [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventPageDown keyAction:r.eventKeyAction tag:nil target:nil];
 }
 
 - (void)tappedLeft:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventLeft];
+    [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventLeft keyAction:r.eventKeyAction tag:nil target:nil];
 }
 
 - (void)tappedRight:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventRight];
+    [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventRight keyAction:r.eventKeyAction tag:nil target:nil];
 }
 
 - (void)panned:(UIPanGestureRecognizer *)gesture {
     UIView *rootView = [self view];
-    NSString *gestureState = [self recognizerStateToString:gesture.state];
+    NSMutableDictionary *eventBody= [gesture.eventState mutableCopy];
     CGPoint translation = [gesture translationInView:rootView];
     CGPoint velocity = [gesture velocityInView:rootView];
 
-    if (gestureState) {
-        [self sendAppleTVEvent:RCTTVRemoteEventPan withBody:@{@"state": gestureState,
-                                                              @"x": [NSNumber numberWithInt:translation.x],
-                                                              @"y": [NSNumber numberWithInt:translation.y],
-                                                              @"velocityX": [NSNumber numberWithFloat:velocity.x],
-                                                              @"velocityY": [NSNumber numberWithFloat:velocity.y],
-                                                            }];
+    if (eventBody.count > 0) {
+        eventBody[@"x"] = [NSNumber numberWithInt:translation.x];
+        eventBody[@"y"] = [NSNumber numberWithInt:translation.y];
+        eventBody[@"velocityX"] = [NSNumber numberWithFloat:velocity.x];
+        eventBody[@"velocityY"] = [NSNumber numberWithFloat:velocity.y];
+
+        [[NSNotificationCenter defaultCenter] postNavigationTouchEventWithType:RCTTVRemoteEventPan body:[eventBody copy]];
     }
 }
 
@@ -517,37 +494,4 @@ static __volatile BOOL __gestureHandlersCancelTouches = YES;
 
   _tvRemoteGestureRecognizers[name] = recognizer;
 }
-
-#pragma mark -
-#pragma mark Helper methods
-
-- (void)sendAppleTVEvent:(NSString *)eventType
-{
-    [self sendAppleTVEvent:eventType withBody: nil];
-}
-
-- (void)sendAppleTVEvent:(NSString *)eventType
-                withBody:(NSDictionary * __nullable)body
-{
-    NSDictionary *payload = (body != nil) ?
-                                @{@"eventType" : eventType, @"body": body} :
-                                @{@"eventType" : eventType};
-
-  [[NSNotificationCenter defaultCenter] postNotificationName:@"RCTTVNavigationEventNotification"
-                                                      object:payload];
-}
-
-- (NSString *)recognizerStateToString:(UIGestureRecognizerState)state {
-    switch (state) {
-        case UIGestureRecognizerStateBegan:
-            return @"Began";
-        case UIGestureRecognizerStateChanged:
-            return @"Changed";
-        case UIGestureRecognizerStateEnded:
-            return @"Ended";
-        default:
-            return nil;
-    }
-}
-
 @end

package/React/Base/RCTTVRemoteHandlerConstants.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 RCTTVRemoteHandlerConstants_h
+#define RCTTVRemoteHandlerConstants_h
+
+typedef NSString *RCTTVRemoteEvent NS_TYPED_ENUM;
+
+extern RCTTVRemoteEvent _Nonnull const RCTTVRemoteEventMenu;
+extern RCTTVRemoteEvent _Nonnull const RCTTVRemoteEventPlayPause;
+extern RCTTVRemoteEvent _Nonnull const RCTTVRemoteEventSelect;
+
+extern RCTTVRemoteEvent _Nonnull const RCTTVRemoteEventLongPlayPause;
+extern RCTTVRemoteEvent _Nonnull const RCTTVRemoteEventLongSelect;
+extern RCTTVRemoteEvent _Nonnull const RCTTVRemoteEventLongUp;
+extern RCTTVRemoteEvent _Nonnull const RCTTVRemoteEventLongDown;
+extern RCTTVRemoteEvent _Nonnull const RCTTVRemoteEventLongLeft;
+extern RCTTVRemoteEvent _Nonnull const RCTTVRemoteEventLongRight;
+
+extern RCTTVRemoteEvent _Nonnull const RCTTVRemoteEventLeft;
+extern RCTTVRemoteEvent _Nonnull const RCTTVRemoteEventRight;
+extern RCTTVRemoteEvent _Nonnull const RCTTVRemoteEventUp;
+extern RCTTVRemoteEvent _Nonnull const RCTTVRemoteEventDown;
+
+extern RCTTVRemoteEvent _Nonnull const RCTTVRemoteEventPageUp;
+extern RCTTVRemoteEvent _Nonnull const RCTTVRemoteEventPageDown;
+
+extern RCTTVRemoteEvent _Nonnull const RCTTVRemoteEventSwipeLeft;
+extern RCTTVRemoteEvent _Nonnull const RCTTVRemoteEventSwipeRight;
+extern RCTTVRemoteEvent _Nonnull const RCTTVRemoteEventSwipeUp;
+extern RCTTVRemoteEvent _Nonnull const RCTTVRemoteEventSwipeDown;
+
+extern RCTTVRemoteEvent _Nonnull const RCTTVRemoteEventPan;
+
+#endif /* RCTTVRemoteHandlerConstants_h */

package/React/Base/RCTTVRemoteHandlerConstants.mm

@@ -0,0 +1,32 @@
+/*
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTTVRemoteHandlerConstants.h"
+
+RCTTVRemoteEvent const RCTTVRemoteEventMenu = @"menu";
+RCTTVRemoteEvent const RCTTVRemoteEventPlayPause = @"playPause";
+RCTTVRemoteEvent const RCTTVRemoteEventSelect = @"select";
+
+RCTTVRemoteEvent const RCTTVRemoteEventLongPlayPause = @"longPlayPause";
+RCTTVRemoteEvent const RCTTVRemoteEventLongSelect = @"longSelect";
+RCTTVRemoteEvent const RCTTVRemoteEventLongUp = @"longUp";
+RCTTVRemoteEvent const RCTTVRemoteEventLongDown = @"longDown";
+RCTTVRemoteEvent const RCTTVRemoteEventLongLeft = @"longLeft";
+RCTTVRemoteEvent const RCTTVRemoteEventLongRight = @"longRight";
+
+RCTTVRemoteEvent const RCTTVRemoteEventLeft = @"left";
+RCTTVRemoteEvent const RCTTVRemoteEventRight = @"right";
+RCTTVRemoteEvent const RCTTVRemoteEventUp = @"up";
+RCTTVRemoteEvent const RCTTVRemoteEventDown = @"down";
+
+RCTTVRemoteEvent const RCTTVRemoteEventPageUp = @"pageUp";
+RCTTVRemoteEvent const RCTTVRemoteEventPageDown = @"pageDown";
+
+RCTTVRemoteEvent const RCTTVRemoteEventSwipeLeft = @"swipeLeft";
+RCTTVRemoteEvent const RCTTVRemoteEventSwipeRight = @"swipeRight";
+RCTTVRemoteEvent const RCTTVRemoteEventSwipeUp = @"swipeUp";
+RCTTVRemoteEvent const RCTTVRemoteEventSwipeDown = @"swipeDown";
+
+RCTTVRemoteEvent const RCTTVRemoteEventPan = @"pan";

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(74),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"0rc0",
+                  RCTVersionPrerelease: @"0rc2",
                   };
   });
   return __rnVersion;

package/React/CoreModules/RCTDevSettings.mm

@@ -10,6 +10,7 @@
 #import <objc/runtime.h>
 
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
+#import <React/RCTBridge+Inspector.h>
 #import <React/RCTBridge+Private.h>
 #import <React/RCTBridgeModule.h>
 #import <React/RCTConstants.h>

package/React/CoreModules/RCTDeviceInfo.mm

@@ -57,11 +57,6 @@ RCT_EXPORT_MODULE()
 #if !TARGET_OS_TV
   _currentInterfaceOrientation = [RCTSharedApplication() statusBarOrientation];
 
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(interfaceOrientationDidChange)
-                                               name:UIApplicationDidChangeStatusBarOrientationNotification
-                                             object:nil];
-
   _currentInterfaceDimensions = [self _exportedDimensions];
 
   [[NSNotificationCenter defaultCenter] addObserver:self
@@ -78,6 +73,11 @@ RCT_EXPORT_MODULE()
                                            selector:@selector(interfaceFrameDidChange)
                                                name:RCTWindowFrameDidChangeNotification
                                              object:nil];
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(interfaceFrameDidChange)
+                                               name:UIDeviceOrientationDidChangeNotification
+                                             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
@@ -89,11 +89,13 @@ RCT_EXPORT_MODULE()
                                                name:RCTBridgeWillInvalidateModulesNotification
                                              object:nil];
 
-#endif
 }
 
 - (void)invalidate
 {
+  if (_invalidated) {
+    return;
+  }
   _invalidated = YES;
   [self _cleanupObservers];
 }
@@ -103,21 +105,18 @@ RCT_EXPORT_MODULE()
   [[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:RCTBridgeWillInvalidateModulesNotification object:nil];
 
+#if !TARGET_OS_TV
   [[NSNotificationCenter defaultCenter] removeObserver:self name:RCTWindowFrameDidChangeNotification object:nil];
 
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(invalidate)
-                                               name:RCTBridgeWillInvalidateModulesNotification
-                                             object:nil];
+  [[NSNotificationCenter defaultCenter] removeObserver:self name:RCTUserInterfaceStyleDidChangeNotification object:nil];
+
+  [[NSNotificationCenter defaultCenter] removeObserver:self name:UIDeviceOrientationDidChangeNotification object:nil];
+#endif
 }
 
 static BOOL RCTIsIPhoneNotched()

package/React/CoreModules/RCTTVNavigationEventEmitter.mm

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

package/React/CxxBridge/RCTCxxBridge.mm

@@ -9,6 +9,7 @@
 #include <future>
 
 #import <React/RCTAssert.h>
+#import <React/RCTBridge+Inspector.h>
 #import <React/RCTBridge+Private.h>
 #import <React/RCTBridge.h>
 #import <React/RCTBridgeMethod.h>

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

@@ -11,6 +11,7 @@
 #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>
@@ -865,22 +866,22 @@ static void RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrol
 {
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(handleTVNavigationEventNotification:)
-                                                 name:@"RCTTVNavigationEventNotification"
+                                                 name:RCTTVNavigationEventNotificationName
                                                object:nil];
 }
 
 - (void)removeArrowsListeners
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                    name:@"RCTTVNavigationEventNotification"
+                                                    name:RCTTVNavigationEventNotificationName
                                                   object:nil];
 }
 
 - (void)handleTVNavigationEventNotification:(NSNotification *)notif
 {
-    NSArray *supportedEvents = [NSArray arrayWithObjects:@"up", @"down", @"left", @"right", nil];
+    NSArray *supportedEvents = @[RCTTVRemoteEventUp, RCTTVRemoteEventDown, RCTTVRemoteEventLeft, RCTTVRemoteEventRight];
 
-    if (notif.object == nil || notif.object[@"eventType"] == nil || ![supportedEvents containsObject:notif.object[@"eventType"]] ) {
+    if (notif.object == nil || notif.object[RCTTVNavigationEventNotificationKeyEventType] == nil || ![supportedEvents containsObject:notif.object[RCTTVNavigationEventNotificationKeyEventType]] ) {
         return;
     }
 
@@ -891,23 +892,23 @@ static void RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrol
 
     BOOL isHorizontal = _scrollView.contentSize.width > self.frame.size.width;
     if (!isHorizontal) {
-        if ([notif.object[@"eventType"] isEqual: @"down"]) {
+        if ([notif.object[RCTTVNavigationEventNotificationKeyEventType] isEqual:RCTTVRemoteEventDown]) {
             [self swipedDown];
             return;
         }
 
-        if ([notif.object[@"eventType"] isEqual: @"up"]) {
+        if ([notif.object[RCTTVNavigationEventNotificationKeyEventType] isEqual:RCTTVRemoteEventUp]) {
             [self swipedUp];
             return;
         }
     }
 
-    if ([notif.object[@"eventType"] isEqual: @"left"]) {
+    if ([notif.object[RCTTVNavigationEventNotificationKeyEventType] isEqual:RCTTVRemoteEventLeft]) {
         [self swipedLeft];
         return;
     }
 
-    if ([notif.object[@"eventType"] isEqual: @"right"]) {
+    if ([notif.object[RCTTVNavigationEventNotificationKeyEventType] isEqual:RCTTVRemoteEventRight]) {
         [self swipedRight];
         return;
     }
@@ -936,14 +937,12 @@ static void RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrol
 
 - (void)sendFocusNotification
 {
-    [[NSNotificationCenter defaultCenter] postNotificationName:@"RCTTVNavigationEventNotification"
-                                                        object:@{ @"eventType": @"focus", @"tag": @([self tag]) }];
+    [[NSNotificationCenter defaultCenter] postNavigationFocusEventWithTag:@(self.tag) target:nil];
 }
 
 - (void)sendBlurNotification
 {
-    [[NSNotificationCenter defaultCenter] postNotificationName:@"RCTTVNavigationEventNotification"
-                                                        object:@{ @"eventType": @"blur", @"tag": @([self tag]) }];
+    [[NSNotificationCenter defaultCenter] postNavigationBlurEventWithTag:@(self.tag) target:nil];
 }
 
 - (NSInteger)swipeVerticalInterval

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

@@ -19,6 +19,7 @@
 #import <React/RCTLog.h>
 
 #import <React/RCTSurfaceHostingProxyRootView.h>
+#import <React/RCTTVNavigationEventNotification.h>
 
 #import <react/renderer/components/view/ViewComponentDescriptor.h>
 #import <react/renderer/components/view/ViewEventEmitter.h>
@@ -245,35 +246,25 @@ using namespace facebook::react;
 
 - (void)sendFocusNotification:(__unused UIFocusUpdateContext *)context
 {
-    [self sendNotificationWithEventType:@"focus"];
+    [[NSNotificationCenter defaultCenter] postNavigationFocusEventWithTag:@(self.tag) target:@(self.tag)];
 }
 
 - (void)sendBlurNotification:(__unused UIFocusUpdateContext *)context
 {
-    [self sendNotificationWithEventType:@"blur"];
+    [[NSNotificationCenter defaultCenter] postNavigationBlurEventWithTag:@(self.tag) target:@(self.tag)];
 }
 
 - (void)sendSelectNotification:(UIGestureRecognizer *)recognizer
 {
-    [self sendNotificationWithEventType:@"select"];
+    [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventSelect keyAction:RCTTVRemoteEventKeyActionUp tag:@(self.tag) target:@(self.tag)];
 }
 
 - (void)sendLongSelectNotification:(UIGestureRecognizer *)recognizer
 {
-  [self sendNotificationWithEventType:@"longSelect"];
+    [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventLongSelect keyAction:recognizer.eventKeyAction tag:@(self.tag) target:@(self.tag)];
 }
 
-- (void)sendNotificationWithEventType:(NSString * __nonnull)eventType
-{
-  [[NSNotificationCenter defaultCenter] postNotificationName:@"RCTTVNavigationEventNotification"
-                                                      object:@{
-                                                          @"eventType":eventType,
-                                                          @"tag":@([self tag]),
-                                                          @"target":@([self tag])
-                                                      }];
-}
-
-- (void)handleSelect:(__unused UIGestureRecognizer *)r
+- (void)handleSelect:(UIGestureRecognizer *)r
 {
   if (_tvParallaxProperties.enabled == YES) {
     float magnification = _tvParallaxProperties.magnification;
@@ -308,9 +299,7 @@ using namespace facebook::react;
 
 - (void)handleLongSelect:(UIGestureRecognizer *)r
 {
-  if (r.state == UIGestureRecognizerStateBegan) {
     [self sendLongSelectNotification:r];
-  }
 }
 
 - (void)addParallaxMotionEffects

package/React/Fabric/RCTSurfacePointerHandler.mm

@@ -788,5 +788,6 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithTarget : (id)target action : (SEL)act
     }
   }
 }
+#endif
 
 @end

package/React/Modules/RCTUIManager.m

@@ -1684,6 +1684,16 @@ static UIView *_jsResponder;
   return self;
 }
 
+- (NSUInteger)count
+{
+  return self->_registry.count;
+}
+
+- (NSEnumerator *)keyEnumerator
+{
+  return self->_registry.keyEnumerator;
+}
+
 - (id)objectForKey:(id)key
 {
   if (![key isKindOfClass:[NSNumber class]]) {

package/React/Views/RCTTVView.m

@@ -18,6 +18,7 @@
 #import "RCTView.h"
 #import "UIView+React.h"
 #import <React/RCTUIManager.h>
+#import <React/RCTTVNavigationEventNotification.h>
 
 @implementation RCTTVView {
   __weak RCTBridge *_bridge;
@@ -98,7 +99,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : unused)
   }
 }
 
-- (void)handleSelect:(__unused UIGestureRecognizer *)r
+- (void)handleSelect:(UIGestureRecognizer *)r
 {
   if ([self.tvParallaxProperties[@"enabled"] boolValue] == YES) {
     float magnification = [self.tvParallaxProperties[@"magnification"] floatValue];
@@ -133,9 +134,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : unused)
 
 - (void)handleLongSelect:(UIGestureRecognizer *)r
 {
-  if (r.state == UIGestureRecognizerStateBegan) {
     [self sendLongSelectNotification:r];
-  }
 }
 
 - (BOOL)isTVFocusGuide
@@ -434,32 +433,22 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : unused)
 
 - (void)sendFocusNotification:(__unused UIFocusUpdateContext *)context
 {
-    [self sendNotificationWithEventType:@"focus"];
+    [[NSNotificationCenter defaultCenter] postNavigationFocusEventWithTag:self.reactTag target:self.reactTag];
 }
 
 - (void)sendBlurNotification:(__unused UIFocusUpdateContext *)context
 {
-    [self sendNotificationWithEventType:@"blur"];
+    [[NSNotificationCenter defaultCenter] postNavigationBlurEventWithTag:self.reactTag target:self.reactTag];
 }
 
 - (void)sendSelectNotification:(UIGestureRecognizer *)recognizer
 {
-    [self sendNotificationWithEventType:@"select"];
+    [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventSelect keyAction:RCTTVRemoteEventKeyActionUp tag:self.reactTag target:self.reactTag];
 }
 
 - (void)sendLongSelectNotification:(UIGestureRecognizer *)recognizer
 {
-    [self sendNotificationWithEventType:@"longSelect"];
-}
-
-- (void)sendNotificationWithEventType:(NSString * __nonnull)eventType
-{
-  [[NSNotificationCenter defaultCenter] postNotificationName:@"RCTTVNavigationEventNotification"
-                                                      object:@{
-                                                          @"eventType":eventType,
-                                                          @"tag":self.reactTag,
-                                                          @"target":self.reactTag
-                                                      }];
+    [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventLongSelect keyAction:recognizer.eventKeyAction tag:self.reactTag target:self.reactTag];
 }
 
 - (RCTTVView *)getViewById:(NSNumber *)viewId {