react-native-tvos 0.68.0-0 → 0.68.2-0

package/Libraries/Components/AppleTV/{TVMenuControl.js → TVEventControl.js}

@@ -1,4 +1,6 @@
 /**
+ * Methods to enable and disable listening for Apple TV remote events (menu key, pan gesture)
+ *
  * @format
  * @flow
  */
@@ -14,4 +16,10 @@ module.exports = {
   disableTVMenuKey: () => {
     TVMenuBridge && TVMenuBridge.disableTVMenuKey();
   },
+  enableTVPanGesture: () => {
+    TVMenuBridge && TVMenuBridge.enableTVPanGesture();
+  },
+  disableTVPanGesture: () => {
+    TVMenuBridge && TVMenuBridge.disableTVPanGesture();
+  },
 };

package/Libraries/Components/AppleTV/tagForComponentOrHandle.js

@@ -0,0 +1,34 @@
+// Replacement for findNodeHandle, since we need this for converting
+// components to tags when rendering nextFocus props
+// @flow
+
+// TODO: make this work for Fabric
+
+// import {findNodeHandle} from '../../Renderer/shims/ReactNative';
+
+type TagForComponentOrHandleType = (
+    component: ?(
+      | {_nativeTag: ?number, canonical: ?{_nativeTag: ?number}}
+      | number
+    ),
+  ) => ?number;
+
+const tagForComponentOrHandle: TagForComponentOrHandleType = (
+  component: ?(
+    | {_nativeTag: ?number, canonical: ?{_nativeTag: ?number}}
+    | number
+  ),
+): ?number => {
+  if (typeof component === 'number') {
+    return component;
+  }
+  if (typeof component?._nativeTag === 'number') {
+    return component?._nativeTag;
+  }
+  if (typeof component?.canonical?._nativeTag === 'number') {
+    return component?.canonical?._nativeTag;
+  }
+  return undefined;
+};
+
+export default tagForComponentOrHandle;

package/Libraries/Components/Touchable/TouchableHighlight.js

@@ -19,6 +19,8 @@ import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback';
 import Platform from '../../Utilities/Platform';
 import View from '../../Components/View/View';
 import type {ViewProps} from '../../Components/View/ViewPropTypes';
+import typeof TVParallaxPropertiesType from '../AppleTV/TVViewPropTypes';
+import tagForComponentOrHandle from '../AppleTV/tagForComponentOrHandle';
 import * as React from 'react';
 
 type AndroidProps = $ReadOnly<{|
@@ -29,9 +31,21 @@ type AndroidProps = $ReadOnly<{|
   nextFocusUp?: ?number,
 |}>;
 
+type TVProps = $ReadOnly<{|
+  hasTVPreferredFocus?: ?boolean,
+  isTVSelectable?: ?boolean,
+  tvParallaxProperties?: ?TVParallaxPropertiesType,
+  nextFocusDown?: ?number,
+  nextFocusForward?: ?number,
+  nextFocusLeft?: ?number,
+  nextFocusRight?: ?number,
+  nextFocusUp?: ?number,
+|}>;
+
 type Props = $ReadOnly<{|
   ...React.ElementConfig<TouchableWithoutFeedback>,
   ...AndroidProps,
+  ...TVProps,
   ...ViewProps,
 
   activeOpacity?: ?number,
@@ -313,11 +327,11 @@ class TouchableHighlight extends React.Component<Props, State> {
         hasTVPreferredFocus={this.props.hasTVPreferredFocus === true}
         isTVSelectable={this.props.isTVSelectable !== false && this.props.accessible !== false}
         tvParallaxProperties={this.props.tvParallaxProperties}
-        nextFocusDown={this.props.nextFocusDown}
-        nextFocusForward={this.props.nextFocusForward}
-        nextFocusLeft={this.props.nextFocusLeft}
-        nextFocusRight={this.props.nextFocusRight}
-        nextFocusUp={this.props.nextFocusUp}
+        nextFocusDown={tagForComponentOrHandle(this.props.nextFocusDown)}
+        nextFocusForward={tagForComponentOrHandle(this.props.nextFocusForward)}
+        nextFocusLeft={tagForComponentOrHandle(this.props.nextFocusLeft)}
+        nextFocusRight={tagForComponentOrHandle(this.props.nextFocusRight)}
+        nextFocusUp={tagForComponentOrHandle(this.props.nextFocusUp)}
         focusable={
           this.props.focusable !== false && this.props.onPress !== undefined
         }

package/Libraries/Components/Touchable/TouchableOpacity.js

@@ -20,6 +20,7 @@ import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
 import flattenStyle from '../../StyleSheet/flattenStyle';
 import Platform from '../../Utilities/Platform';
 import typeof TVParallaxPropertiesType from '../AppleTV/TVViewPropTypes';
+import tagForComponentOrHandle from '../AppleTV/tagForComponentOrHandle';
 
 import * as React from 'react';
 
@@ -245,13 +246,15 @@ class TouchableOpacity extends React.Component<Props, State> {
         nativeID={this.props.nativeID}
         testID={this.props.testID}
         onLayout={this.props.onLayout}
-        nextFocusDown={this.props.nextFocusDown}
-        nextFocusForward={this.props.nextFocusForward}
-        nextFocusLeft={this.props.nextFocusLeft}
-        nextFocusRight={this.props.nextFocusRight}
-        nextFocusUp={this.props.nextFocusUp}
+        nextFocusDown={tagForComponentOrHandle(this.props.nextFocusDown)}
+        nextFocusForward={tagForComponentOrHandle(this.props.nextFocusForward)}
+        nextFocusLeft={tagForComponentOrHandle(this.props.nextFocusLeft)}
+        nextFocusRight={tagForComponentOrHandle(this.props.nextFocusRight)}
+        nextFocusUp={tagForComponentOrHandle(this.props.nextFocusUp)}
         hasTVPreferredFocus={this.props.hasTVPreferredFocus === true}
-        isTVSelectable={this.props.isTVSelectable !== false && this.props.accessible !== false}
+        isTVSelectable={
+          this.props.isTVSelectable !== false && this.props.accessible !== false
+        }
         tvParallaxProperties={this.props.tvParallaxProperties}
         hitSlop={this.props.hitSlop}
         focusable={
@@ -284,7 +287,7 @@ class TouchableOpacity extends React.Component<Props, State> {
           }
         },
         onPress: event => {
-          if (this.props.onPress != null && Platform.OS !== "android") {
+          if (this.props.onPress != null && Platform.OS !== 'android') {
             this.props.onPress(event);
           }
         },

package/Libraries/Core/ReactNativeVersion.js

@@ -12,6 +12,6 @@
 exports.version = {
   major: 0,
   minor: 68,
-  patch: 0,
+  patch: 1,
   prerelease: null,
 };

package/README.md

@@ -28,6 +28,7 @@ Notes:
 - _Apple TV_: `pod install` will pick up the additional pods needed for the new architecture.
 - _Android TV_: Enabling the new architecture will cause your app to be built from React Native sources, including C++ sources, so you will need the NDK and the build will take much longer.
 - _Third party libraries_: As of this moment, third party libraries have not all enabled support for the new architecture.
+- _Bugs_: There are some issues with interactions between Apple TV parallax properties implementation and the new renderer. TabBarIOS has not been reimplemented in the new architecture so it will show up as an "unimplemented component".
 
 ### Typescript
 
@@ -182,7 +183,7 @@ class Game2048 extends React.Component {
 
 - _Turbomodules_: Working as of the 0.61.2-0 release.
 
-- _Flipper_: Working in the 0.62.2-x releases.  Working in the 0.63.x releases; however, tvOS requires the Flipper pods from 0.62.2-x.  `scripts/react_native_pods.rb` contains macros for both versions.  The new project template Podfile is correctly set up to provide the older Flipper for both iOS and tvOS targets. In 0.64.x, Flipper support has been temporarily removed until issues can be resolved with newer Xcode versions.
+- _Flipper_: Working in the 0.62.2-x releases.  Working in the 0.63.x releases; however, tvOS requires the Flipper pods from 0.62.2-x.  `scripts/react_native_pods.rb` contains macros for both versions.  The new project template Podfile is correctly set up to provide the older Flipper for both iOS and tvOS targets. In 0.64.x and later, Flipper support is removed until issues can be resolved with newer Xcode versions.
 
 - _Hermes for tvOS_: RN core added support for the Hermes JS engine on iOS in 0.64. tvOS does not yet have this, as it will require significant additions to the Hermes build structure.
 
@@ -196,7 +197,9 @@ class Game2048 extends React.Component {
 
 - _Back navigation with the TV remote menu button_: The `BackHandler` component, originally written to support the Android back button, now also supports back navigation on the Apple TV using the menu button on the TV remote.
 
-- _TVMenuControl_: This module provides methods to enable and disable navigation using the menu key on the TV remote.  This is required in order to fix an issue with Apple's guidelines for menu key navigation (see https://github.com/facebook/react-native/issues/18930).  The `RNTester` app uses this new module to implement correct menu key behavior.
+- _TVEventControl_: (Formerly "TVMenuControl") (Apple TV only) This module provides methods to enable and disable firing of two types of events from the Apple TV Siri remote:
+  - `enableTVMenuKey`/`disableTVMenuKey`:  Method to enable and disable the menu key gesture recognizer, in order to fix an issue with Apple's guidelines for menu key navigation (see https://github.com/facebook/react-native/issues/18930).  The `RNTester` app uses these methods to implement correct menu key behavior for back navigation.
+  - `enableTVPanGesture`/`disableTVPanGesture`: Methods to enable and disable detection of finger touches that pan across the touch surface of the Siri remote. See `TVEventHandlerExample` in the `RNTester` app for a demo.
 
 - _TVFocusGuideView_: This component provides support for Apple's `UIFocusGuide` API, to help ensure that focusable controls can be navigated to, even if they are not directly in line with other controls.  An example is provided in `RNTester` that shows two different ways of using this component.
 

package/React/Base/RCTRootView.m

@@ -40,8 +40,7 @@
 
 NSString *const RCTContentDidAppearNotification = @"RCTContentDidAppearNotification";
 
-NSString *const RCTTVEnableMenuKeyNotification = @"RCTTVEnableMenuKeyNotification";
-NSString *const RCTTVDisableMenuKeyNotification = @"RCTTVDisableMenuKeyNotification";
+
 
 
 @interface RCTUIManager (RCTRootView)
@@ -168,7 +167,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
 #if TARGET_OS_TV
 - (NSArray<id<UIFocusEnvironment>> *)preferredFocusEnvironments
 {
-  if (self.reactPreferredFocusedView) {
+  if (self.reactPreferredFocusedView && self.reactPreferredFocusedView.window != nil) {
     return @[self.reactPreferredFocusedView];
   }
   return [super preferredFocusEnvironments];

package/React/Base/RCTRootViewInternal.h

@@ -26,7 +26,7 @@
  */
 #if TARGET_OS_TV
 @property (nonatomic, strong) RCTTVRemoteHandler *tvRemoteHandler;
-@property (nonatomic, strong) UIView *reactPreferredFocusedView;
+@property (nonatomic, weak) UIView *reactPreferredFocusedView;
 #endif
 
 - (void)contentViewInvalidated;

package/React/Base/RCTTVRemoteHandler.h

@@ -7,25 +7,33 @@
 
 #import <UIKit/UIKit.h>
 
-extern NSString *const RCTTVRemoteEventMenu;
-extern NSString *const RCTTVRemoteEventPlayPause;
-extern NSString *const RCTTVRemoteEventSelect;
+extern NSString * _Nonnull const RCTTVEnableMenuKeyNotification;
+extern NSString * _Nonnull const RCTTVDisableMenuKeyNotification;
 
-extern NSString *const RCTTVRemoteEventLongPlayPause;
-extern NSString *const RCTTVRemoteEventLongSelect;
+extern NSString * _Nonnull const RCTTVEnablePanGestureNotification;
+extern NSString * _Nonnull const RCTTVDisablePanGestureNotification;
 
-extern NSString *const RCTTVRemoteEventLeft;
-extern NSString *const RCTTVRemoteEventRight;
-extern NSString *const RCTTVRemoteEventUp;
-extern NSString *const RCTTVRemoteEventDown;
+extern NSString * _Nonnull const RCTTVRemoteEventMenu;
+extern NSString * _Nonnull const RCTTVRemoteEventPlayPause;
+extern NSString * _Nonnull const RCTTVRemoteEventSelect;
 
-extern NSString *const RCTTVRemoteEventPageUp;
-extern NSString *const RCTTVRemoteEventPageDown;
+extern NSString * _Nonnull const RCTTVRemoteEventLongPlayPause;
+extern NSString * _Nonnull const RCTTVRemoteEventLongSelect;
 
-extern NSString *const RCTTVRemoteEventSwipeLeft;
-extern NSString *const RCTTVRemoteEventSwipeRight;
-extern NSString *const RCTTVRemoteEventSwipeUp;
-extern NSString *const RCTTVRemoteEventSwipeDown;
+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
 
@@ -35,4 +43,7 @@ extern NSString *const RCTTVRemoteEventSwipeDown;
 + (BOOL)useMenuKey;
 + (void)setUseMenuKey:(BOOL)useMenuKey;
 
++ (BOOL)usePanGesture;
++ (void)setUsePanGesture:(BOOL)usePanGesture;
+
 @end

package/React/Base/RCTTVRemoteHandler.m

@@ -20,6 +20,12 @@
 #import "RCTView.h"
 #import "UIView+React.h"
 
+NSString *const RCTTVEnableMenuKeyNotification = @"RCTTVEnableMenuKeyNotification";
+NSString *const RCTTVDisableMenuKeyNotification = @"RCTTVDisableMenuKeyNotification";
+
+NSString *const RCTTVEnablePanGestureNotification = @"RCTTVEnablePanGestureNotification";
+NSString *const RCTTVDisablePanGestureNotification = @"RCTTVDisablePanGestureNotification";
+
 NSString *const RCTTVRemoteEventMenu = @"menu";
 NSString *const RCTTVRemoteEventPlayPause = @"playPause";
 NSString *const RCTTVRemoteEventSelect = @"select";
@@ -40,10 +46,13 @@ NSString *const RCTTVRemoteEventSwipeRight = @"swipeRight";
 NSString *const RCTTVRemoteEventSwipeUp = @"swipeUp";
 NSString *const RCTTVRemoteEventSwipeDown = @"swipeDown";
 
+NSString *const RCTTVRemoteEventPan = @"pan";
+
 @interface RCTTVRemoteHandler()
 
 @property (nonatomic, copy, readonly) NSDictionary *tvRemoteGestureRecognizers;
 @property (nonatomic, strong) UITapGestureRecognizer *tvMenuKeyRecognizer;
+@property (nonatomic, strong) UIPanGestureRecognizer *tvPanGestureRecognizer;
 @property (nonatomic, weak) UIView *view;
 
 @end
@@ -53,9 +62,10 @@ NSString *const RCTTVRemoteEventSwipeDown = @"swipeDown";
 }
 
 #pragma mark -
-#pragma mark Static setting for using menu key
+#pragma mark Static settings for menu key and pan gesture
 
 static __volatile BOOL __useMenuKey = NO;
+static __volatile BOOL __usePanGesture = NO;
 
 + (BOOL)useMenuKey
 {
@@ -67,6 +77,16 @@ static __volatile BOOL __useMenuKey = NO;
     __useMenuKey = useMenuKey;
 }
 
++ (BOOL)usePanGesture
+{
+    return __usePanGesture;
+}
+
++ (void)setUsePanGesture:(BOOL)usePanGesture
+{
+    __usePanGesture = usePanGesture;
+}
+
 #pragma mark -
 #pragma mark Public methods
 
@@ -92,10 +112,14 @@ static __volatile BOOL __useMenuKey = NO;
 {
     _tvRemoteGestureRecognizers = [NSMutableDictionary dictionary];
   // Recognizers for Apple TV remote buttons
+
   // Menu recognizer
   self.tvMenuKeyRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(menuPressed:)];
   self.tvMenuKeyRecognizer.allowedPressTypes = @[@(UIPressTypeMenu)];
 
+  // Pan gesture recognizer
+  self.tvPanGestureRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(panned:)];
+
   // Play/Pause
   [self addTapGestureRecognizerWithSelector:@selector(playPausePressed:)
                                   pressType:UIPressTypePlayPause
@@ -169,7 +193,6 @@ static __volatile BOOL __useMenuKey = NO;
   [self addSwipeGestureRecognizerWithSelector:@selector(swipedRight:)
                                     direction:UISwipeGestureRecognizerDirectionRight
                                          name:RCTTVRemoteEventSwipeRight];
-
 }
 
 - (void)attachToView
@@ -183,6 +206,17 @@ static __volatile BOOL __useMenuKey = NO;
                                              selector:@selector(disableTVMenuKey)
                                                  name:RCTTVDisableMenuKeyNotification
                                                object:nil];
+
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(enableTVPanGesture)
+                                                 name:RCTTVEnablePanGestureNotification
+                                               object:nil];
+
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(disableTVPanGesture)
+                                                 name:RCTTVDisablePanGestureNotification
+                                               object:nil];
+
     for (NSString *key in [self.tvRemoteGestureRecognizers allKeys]) {
       [_view addGestureRecognizer:self.tvRemoteGestureRecognizers[key]];
     }
@@ -191,6 +225,11 @@ static __volatile BOOL __useMenuKey = NO;
     } else {
         [self disableTVMenuKey];
     }
+    if ([RCTTVRemoteHandler usePanGesture]) {
+        [self enableTVPanGesture];
+    } else {
+        [self disableTVPanGesture];
+    }
 }
 
 - (void)detachFromView
@@ -198,6 +237,9 @@ static __volatile BOOL __useMenuKey = NO;
     if ([[self.view gestureRecognizers] containsObject:self.tvMenuKeyRecognizer]) {
         [self.view removeGestureRecognizer:self.tvMenuKeyRecognizer];
     }
+    if ([[self.view gestureRecognizers] containsObject:self.tvPanGestureRecognizer]) {
+        [self.view removeGestureRecognizer:self.tvPanGestureRecognizer];
+    }
     for (NSString *key in [self.tvRemoteGestureRecognizers allKeys]) {
       [_view removeGestureRecognizer:self.tvRemoteGestureRecognizers[key]];
     }
@@ -207,7 +249,13 @@ static __volatile BOOL __useMenuKey = NO;
     [[NSNotificationCenter defaultCenter] removeObserver:self
                                                     name:RCTTVDisableMenuKeyNotification
                                                   object:nil];
-    
+    [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                    name:RCTTVEnablePanGestureNotification
+                                                  object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                    name:RCTTVDisablePanGestureNotification
+                                                  object:nil];
+
 }
 
 # pragma mark -
@@ -231,27 +279,45 @@ static __volatile BOOL __useMenuKey = NO;
     });
 }
 
+- (void)enableTVPanGesture
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if (![[self.view gestureRecognizers] containsObject:self.tvPanGestureRecognizer]) {
+            [self.view addGestureRecognizer:self.tvPanGestureRecognizer];
+        }
+    });
+}
+
+- (void)disableTVPanGesture
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if ([[self.view gestureRecognizers] containsObject:self.tvPanGestureRecognizer]) {
+            [self.view removeGestureRecognizer:self.tvPanGestureRecognizer];
+        }
+    });
+}
+
 # pragma mark -
 # pragma mark Gesture handlers
 
 - (void)playPausePressed:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventPlayPause toView:r.view];
+  [self sendAppleTVEvent:RCTTVRemoteEventPlayPause];
 }
 
 - (void)menuPressed:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventMenu toView:r.view];
+  [self sendAppleTVEvent:RCTTVRemoteEventMenu];
 }
 
 - (void)selectPressed:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventSelect toView:r.view];
+  [self sendAppleTVEvent:RCTTVRemoteEventSelect];
 }
 
 - (void)longPlayPausePressed:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventLongPlayPause toView:r.view];
+  [self sendAppleTVEvent:RCTTVRemoteEventLongPlayPause];
 
 #if RCT_DEV
   // If shake to show is enabled on device, use long play/pause event to show dev menu
@@ -261,57 +327,73 @@ static __volatile BOOL __useMenuKey = NO;
 
 - (void)longSelectPressed:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventLongSelect toView:r.view];
+  [self sendAppleTVEvent:RCTTVRemoteEventLongSelect];
 }
 
 - (void)swipedUp:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventSwipeUp toView:r.view];
+  [self sendAppleTVEvent:RCTTVRemoteEventSwipeUp];
 }
 
 - (void)swipedDown:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventSwipeDown toView:r.view];
+  [self sendAppleTVEvent:RCTTVRemoteEventSwipeDown];
 }
 
 - (void)swipedLeft:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventSwipeLeft toView:r.view];
+  [self sendAppleTVEvent:RCTTVRemoteEventSwipeLeft];
 }
 
 - (void)swipedRight:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventSwipeRight toView:r.view];
+  [self sendAppleTVEvent:RCTTVRemoteEventSwipeRight];
 }
 
 - (void)tappedUp:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventUp toView:r.view];
+  [self sendAppleTVEvent:RCTTVRemoteEventUp];
 }
 
 - (void)tappedDown:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventDown toView:r.view];
+  [self sendAppleTVEvent:RCTTVRemoteEventDown];
 }
 
 - (void)tappedPageUp:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventPageUp toView:r.view];
+  [self sendAppleTVEvent:RCTTVRemoteEventPageUp];
 }
 
 - (void)tappedPageDown:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventPageDown toView:r.view];
+  [self sendAppleTVEvent:RCTTVRemoteEventPageDown];
 }
 
 - (void)tappedLeft:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventLeft toView:r.view];
+  [self sendAppleTVEvent:RCTTVRemoteEventLeft];
 }
 
 - (void)tappedRight:(UIGestureRecognizer *)r
 {
-  [self sendAppleTVEvent:RCTTVRemoteEventRight toView:r.view];
+  [self sendAppleTVEvent:RCTTVRemoteEventRight];
+}
+
+- (void)panned:(UIPanGestureRecognizer *)gesture {
+    UIView *rootView = [self view];
+    NSString *gestureState = [self recognizerStateToString:gesture.state];
+    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],
+                                                            }];
+    }
 }
 
 #pragma mark -
@@ -345,10 +427,36 @@ static __volatile BOOL __useMenuKey = NO;
   _tvRemoteGestureRecognizers[name] = recognizer;
 }
 
-- (void)sendAppleTVEvent:(NSString *)eventType toView:(__unused UIView *)v
+#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:@{@"eventType" : eventType}];
+                                                      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/RCTVersion.m

@@ -23,7 +23,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
     __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(68),
-                  RCTVersionPatch: @(0),
+                  RCTVersionPatch: @(1),
                   RCTVersionPrerelease: [NSNull null],
                   };
   });

package/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.mm

@@ -35,7 +35,7 @@ using namespace facebook::react;
 }
 
 - (NSArray<id<UIFocusEnvironment>> *)preferredFocusEnvironments {
-  if (self.reactPreferredFocusedView) {
+  if (self.reactPreferredFocusedView && self.reactPreferredFocusedView.window != nil) {
     return @[self.reactPreferredFocusedView];
   }
   return [super preferredFocusEnvironments];

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

@@ -71,6 +71,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 #if TARGET_OS_TV
 @property(nonatomic, nullable) UIFocusGuide *focusGuide;
+@property(nonatomic, nullable) UIFocusGuide *focusGuideUp;
+@property(nonatomic, nullable) UIFocusGuide *focusGuideDown;
+@property(nonatomic, nullable) UIFocusGuide *focusGuideLeft;
+@property(nonatomic, nullable) UIFocusGuide *focusGuideRight;
 #endif
 
 /**