react-native-tvos 0.68.1-0 → 0.68.2-1

package/Libraries/Components/Pressable/Pressable.js

@@ -39,6 +39,7 @@ import View from '../View/View';
 import typeof TVParallaxPropertiesType from '../AppleTV/TVViewPropTypes';
 import Platform from '../../Utilities/Platform';
 import {tvFocusEventHandler} from '../AppleTV/TVFocusEventHandler';
+import tagForComponentOrHandle from '../AppleTV/tagForComponentOrHandle';
 
 type ViewStyleProp = $ElementType<React.ElementConfig<typeof View>, 'style'>;
 
@@ -212,6 +213,11 @@ function Pressable(props: Props, forwardedRef): React.Node {
     onHoverIn,
     onHoverOut,
     isTVSelectable,
+    nextFocusDown,
+    nextFocusForward,
+    nextFocusLeft,
+    nextFocusRight,
+    nextFocusUp,
     onBlur,
     onFocus,
     onLongPress,
@@ -354,6 +360,11 @@ function Pressable(props: Props, forwardedRef): React.Node {
       {...restPropsWithDefaults}
       {...eventHandlers}
       ref={viewRef}
+      nextFocusDown={tagForComponentOrHandle(props.nextFocusDown)}
+      nextFocusForward={tagForComponentOrHandle(props.nextFocusForward)}
+      nextFocusLeft={tagForComponentOrHandle(props.nextFocusLeft)}
+      nextFocusRight={tagForComponentOrHandle(props.nextFocusRight)}
+      nextFocusUp={tagForComponentOrHandle(props.nextFocusUp)}
       isTVSelectable={isTVSelectable !== false && accessible !== false}
       style={typeof style === 'function' ? style({pressed, focused}) : style}
       tvParallaxProperties={tvParallaxProperties}

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/TouchableNativeFeedback.js

@@ -20,6 +20,7 @@ import type {PressEvent} from '../../Types/CoreEventTypes';
 import Platform from '../../Utilities/Platform';
 import View from '../../Components/View/View';
 import processColor from '../../StyleSheet/processColor';
+import tagForComponentOrHandle from '../AppleTV/tagForComponentOrHandle';
 import * as React from 'react';
 import invariant from 'invariant';
 
@@ -291,11 +292,11 @@ class TouchableNativeFeedback extends React.Component<Props, State> {
           this.props.onPress !== undefined &&
           !this.props.disabled,
         nativeID: this.props.nativeID,
-        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),
         onLayout: this.props.onLayout,
         testID: this.props.testID,
       },

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.
 

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

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

@@ -309,41 +309,92 @@ using namespace facebook::react;
   return _props->isTVSelectable;
 }
 
-- (NSArray<id<UIFocusEnvironment>> *)preferredFocusEnvironments {
-  if (_nextFocusActiveTarget == nil) return [super preferredFocusEnvironments];
-  UIView * nextFocusActiveTarget = _nextFocusActiveTarget;
-  _nextFocusActiveTarget = nil;
-  NSArray<id<UIFocusEnvironment>> * focusEnvironment = @[nextFocusActiveTarget];
-  return focusEnvironment;
-}
-
-- (BOOL) shouldUpdateFocusInContext:(UIFocusUpdateContext *)context {
-  if (self.isFocused) {
-    if (_nextFocusUp != nil && context.focusHeading == UIFocusHeadingUp) {
-      self->_nextFocusActiveTarget = _nextFocusUp;
-      [self setNeedsFocusUpdate];
-      return false;
+// In tvOS, to support directional focus APIs, we add a UIFocusGuide for each
+// side of the view where a nextFocus has been set. Set layout constraints to
+// make the guide 1 px thick, and set the destination to the nextFocus object.
+//
+// This is only done once the view is focused.
+//
+- (void)enableDirectionalFocusGuides
+{
+  if (self->_nextFocusUp != nil) {
+    if (self.focusGuideUp == nil) {
+      self.focusGuideUp = [UIFocusGuide new];
+      [[self containingRootView] addLayoutGuide:self.focusGuideUp];
+
+      [self.focusGuideUp.bottomAnchor constraintEqualToAnchor:self.topAnchor].active = YES;
+      [self.focusGuideUp.widthAnchor constraintEqualToAnchor:self.widthAnchor].active = YES;
+      [self.focusGuideUp.heightAnchor constraintEqualToConstant:1.0].active = YES;
+      [self.focusGuideUp.leftAnchor constraintEqualToAnchor:self.leftAnchor].active = YES;
     }
-    if (_nextFocusDown != nil && context.focusHeading == UIFocusHeadingDown) {
-      self->_nextFocusActiveTarget = _nextFocusDown;
-      [self setNeedsFocusUpdate];
-      return false;
+
+    self.focusGuideUp.preferredFocusEnvironments = @[self->_nextFocusUp];
+  }
+
+  if (self->_nextFocusDown != nil) {
+    if (self.focusGuideDown == nil) {
+      self.focusGuideDown = [UIFocusGuide new];
+      [[self containingRootView] addLayoutGuide:self.focusGuideDown];
+
+      [self.focusGuideDown.topAnchor constraintEqualToAnchor:self.bottomAnchor].active = YES;
+      [self.focusGuideDown.widthAnchor constraintEqualToAnchor:self.widthAnchor].active = YES;
+      [self.focusGuideDown.heightAnchor constraintEqualToConstant:1.0].active = YES;
+      [self.focusGuideDown.leftAnchor constraintEqualToAnchor:self.leftAnchor].active = YES;
     }
-    if (_nextFocusLeft != nil && context.focusHeading == UIFocusHeadingLeft) {
-      self->_nextFocusActiveTarget = _nextFocusLeft;
-      [self setNeedsFocusUpdate];
-      return false;
+
+    self.focusGuideDown.preferredFocusEnvironments = @[self->_nextFocusDown];
+  }
+
+  if (self->_nextFocusLeft != nil) {
+    if (self.focusGuideLeft == nil) {
+      self.focusGuideLeft = [UIFocusGuide new];
+      [[self containingRootView] addLayoutGuide:self.focusGuideLeft];
+
+      [self.focusGuideLeft.topAnchor constraintEqualToAnchor:self.topAnchor].active = YES;
+      [self.focusGuideLeft.widthAnchor constraintEqualToConstant:1.0].active = YES;
+      [self.focusGuideLeft.heightAnchor constraintEqualToAnchor:self.heightAnchor].active = YES;
+      [self.focusGuideLeft.rightAnchor constraintEqualToAnchor:self.leftAnchor].active = YES;
     }
-    if (_nextFocusRight != nil && context.focusHeading == UIFocusHeadingRight) {
-      self->_nextFocusActiveTarget = _nextFocusRight;
-      [self setNeedsFocusUpdate];
-      return false;
+
+    self.focusGuideLeft.preferredFocusEnvironments = @[self->_nextFocusLeft];
+  }
+
+  if (self->_nextFocusRight != nil) {
+    if (self.focusGuideRight == nil) {
+      self.focusGuideRight = [UIFocusGuide new];
+      [[self containingRootView] addLayoutGuide:self.focusGuideRight];
+
+      [self.focusGuideRight.topAnchor constraintEqualToAnchor:self.topAnchor].active = YES;
+      [self.focusGuideRight.widthAnchor constraintEqualToConstant:1.0].active = YES;
+      [self.focusGuideRight.heightAnchor constraintEqualToAnchor:self.heightAnchor].active = YES;
+      [self.focusGuideRight.leftAnchor constraintEqualToAnchor:self.rightAnchor].active = YES;
     }
-    self->_nextFocusActiveTarget = nil;
-    return true;
+
+    self.focusGuideRight.preferredFocusEnvironments = @[self->_nextFocusRight];
+  }
+}
+// Called when focus leaves this view -- disable the directional focus guides
+// (if they exist) so that they don't interfere with focus navigation from
+// other views
+//
+- (void)disableDirectionalFocusGuides
+{
+  if (self.focusGuideUp != nil) {
+    [[self containingRootView] removeLayoutGuide:self.focusGuideUp];
+    self.focusGuideUp = nil;
+  }
+  if (self.focusGuideDown != nil) {
+    [[self containingRootView] removeLayoutGuide:self.focusGuideDown];
+    self.focusGuideDown = nil;
+  }
+  if (self.focusGuideLeft != nil) {
+    [[self containingRootView] removeLayoutGuide:self.focusGuideLeft];
+    self.focusGuideLeft = nil;
+  }
+  if (self.focusGuideRight != nil) {
+    [[self containingRootView] removeLayoutGuide:self.focusGuideRight];
+    self.focusGuideRight = nil;
   }
-  self->_nextFocusActiveTarget = nil;
-  return true;
 }
 
 - (void)didUpdateFocusInContext:(UIFocusUpdateContext *)context withAnimationCoordinator:(UIFocusAnimationCoordinator *)coordinator
@@ -353,11 +404,13 @@ using namespace facebook::react;
     }
     if (context.nextFocusedView == self && self.isUserInteractionEnabled ) {
       [self becomeFirstResponder];
+      [self enableDirectionalFocusGuides];
       [coordinator addCoordinatedAnimations:^(void){
           [self addParallaxMotionEffects];
           [self sendFocusNotification:context];
       } completion:^(void){}];
     } else {
+      [self disableDirectionalFocusGuides];
       [coordinator addCoordinatedAnimations:^(void){
           [self removeParallaxMotionEffects];
           [self sendBlurNotification:context];

package/React/Views/RCTTVView.h

@@ -32,11 +32,15 @@
 /**
  * Focus direction tags
  */
-@property (nonatomic, strong) RCTTVView * nextFocusUp;
-@property (nonatomic, strong) RCTTVView * nextFocusDown;
-@property (nonatomic, strong) RCTTVView * nextFocusLeft;
-@property (nonatomic, strong) RCTTVView * nextFocusRight;
-@property (nonatomic, strong) RCTTVView * nextFocusActiveTarget;
+@property (nonatomic, weak) RCTTVView * nextFocusUp;
+@property (nonatomic, weak) RCTTVView * nextFocusDown;
+@property (nonatomic, weak) RCTTVView * nextFocusLeft;
+@property (nonatomic, weak) RCTTVView * nextFocusRight;
+
+@property (nonatomic, strong) UIFocusGuide * focusGuideUp;
+@property (nonatomic, strong) UIFocusGuide * focusGuideDown;
+@property (nonatomic, strong) UIFocusGuide * focusGuideLeft;
+@property (nonatomic, strong) UIFocusGuide * focusGuideRight;
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge;
 

package/React/Views/RCTTVView.m

@@ -127,6 +127,18 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : unused)
   return (self.isTVSelectable);
 }
 
+- (RCTRootView *)rootView
+{
+  UIView *rootview = self;
+  while (![rootview isReactRootView] && rootview != nil) {
+    rootview = [rootview superview];
+  }
+  if (rootview == nil) return nil;
+
+  rootview = [rootview superview];
+  return (RCTRootView *)rootview;
+}
+
 - (void)addParallaxMotionEffects
 {
   if(![self.tvParallaxProperties[@"enabled"] boolValue]) {
@@ -237,11 +249,13 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : unused)
   }
   if (context.nextFocusedView == self && self.isTVSelectable ) {
     [self becomeFirstResponder];
+    [self enableDirectionalFocusGuides];
     [coordinator addCoordinatedAnimations:^(void){
       [self addParallaxMotionEffects];
       [self sendFocusNotification:context];
     } completion:^(void){}];
   } else {
+    [self disableDirectionalFocusGuides];
     [coordinator addCoordinatedAnimations:^(void){
       [self sendBlurNotification:context];
       [self removeParallaxMotionEffects];
@@ -250,41 +264,93 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : unused)
   }
 }
 
-- (BOOL) shouldUpdateFocusInContext:(UIFocusUpdateContext *)context {
-  if (self.isFocused) {
-    if (_nextFocusUp != nil && context.focusHeading == UIFocusHeadingUp) {
-      self->_nextFocusActiveTarget = _nextFocusUp;
-      [self setNeedsFocusUpdate];
-      return false;
+// In tvOS, to support directional focus APIs, we add a UIFocusGuide for each
+// side of the view where a nextFocus has been set. Set layout constraints to
+// make the guide 1 px thick, and set the destination to the nextFocus object.
+//
+// This is only done once the view is focused.
+//
+- (void)enableDirectionalFocusGuides
+{
+  if (self->_nextFocusUp != nil) {
+    if (self.focusGuideUp == nil) {
+      self.focusGuideUp = [UIFocusGuide new];
+      [[self rootView]  addLayoutGuide:self.focusGuideUp];
+
+      [self.focusGuideUp.bottomAnchor constraintEqualToAnchor:self.topAnchor].active = YES;
+      [self.focusGuideUp.widthAnchor constraintEqualToAnchor:self.widthAnchor].active = YES;
+      [self.focusGuideUp.heightAnchor constraintEqualToConstant:1.0].active = YES;
+      [self.focusGuideUp.leftAnchor constraintEqualToAnchor:self.leftAnchor].active = YES;
     }
-    if (_nextFocusDown != nil && context.focusHeading == UIFocusHeadingDown) {
-      self->_nextFocusActiveTarget = _nextFocusDown;
-      [self setNeedsFocusUpdate];
-      return false;
+
+    self.focusGuideUp.preferredFocusEnvironments = @[self->_nextFocusUp];
+  }
+
+  if (self->_nextFocusDown != nil) {
+    if (self.focusGuideDown == nil) {
+      self.focusGuideDown = [UIFocusGuide new];
+      [[self rootView]  addLayoutGuide:self.focusGuideDown];
+
+      [self.focusGuideDown.topAnchor constraintEqualToAnchor:self.bottomAnchor].active = YES;
+      [self.focusGuideDown.widthAnchor constraintEqualToAnchor:self.widthAnchor].active = YES;
+      [self.focusGuideDown.heightAnchor constraintEqualToConstant:1.0].active = YES;
+      [self.focusGuideDown.leftAnchor constraintEqualToAnchor:self.leftAnchor].active = YES;
     }
-    if (_nextFocusLeft != nil && context.focusHeading == UIFocusHeadingLeft) {
-      self->_nextFocusActiveTarget = _nextFocusLeft;
-      [self setNeedsFocusUpdate];
-      return false;
+
+    self.focusGuideDown.preferredFocusEnvironments = @[self->_nextFocusDown];
+  }
+
+  if (self->_nextFocusLeft != nil) {
+    if (self.focusGuideLeft == nil) {
+      self.focusGuideLeft = [UIFocusGuide new];
+      [[self rootView]  addLayoutGuide:self.focusGuideLeft];
+
+      [self.focusGuideLeft.topAnchor constraintEqualToAnchor:self.topAnchor].active = YES;
+      [self.focusGuideLeft.widthAnchor constraintEqualToConstant:1.0].active = YES;
+      [self.focusGuideLeft.heightAnchor constraintEqualToAnchor:self.heightAnchor].active = YES;
+      [self.focusGuideLeft.rightAnchor constraintEqualToAnchor:self.leftAnchor].active = YES;
     }
-    if (_nextFocusRight != nil && context.focusHeading == UIFocusHeadingRight) {
-      self->_nextFocusActiveTarget = _nextFocusRight;
-      [self setNeedsFocusUpdate];
-      return false;
+
+    self.focusGuideLeft.preferredFocusEnvironments = @[self->_nextFocusLeft];
+  }
+
+  if (self->_nextFocusRight != nil) {
+    if (self.focusGuideRight == nil) {
+      self.focusGuideRight = [UIFocusGuide new];
+      [[self rootView] addLayoutGuide:self.focusGuideRight];
+
+      [self.focusGuideRight.topAnchor constraintEqualToAnchor:self.topAnchor].active = YES;
+      [self.focusGuideRight.widthAnchor constraintEqualToConstant:1.0].active = YES;
+      [self.focusGuideRight.heightAnchor constraintEqualToAnchor:self.heightAnchor].active = YES;
+      [self.focusGuideRight.leftAnchor constraintEqualToAnchor:self.rightAnchor].active = YES;
     }
-    self->_nextFocusActiveTarget = nil;
-    return true;
+
+    self.focusGuideRight.preferredFocusEnvironments = @[self->_nextFocusRight];
   }
-  self->_nextFocusActiveTarget = nil;
-  return true;
 }
 
-- (NSArray<id<UIFocusEnvironment>> *)preferredFocusEnvironments {
-  if (_nextFocusActiveTarget == nil) return [super preferredFocusEnvironments];
-  RCTTVView * nextFocusActiveTarget = _nextFocusActiveTarget;
-  _nextFocusActiveTarget = nil;
-  NSArray<id<UIFocusEnvironment>> * focusEnvironment = @[nextFocusActiveTarget];
-  return focusEnvironment;
+// Called when focus leaves this view -- disable the directional focus guides
+// (if they exist) so that they don't interfere with focus navigation from
+// other views
+//
+- (void)disableDirectionalFocusGuides
+{
+  if (self.focusGuideUp != nil) {
+    [[self rootView] removeLayoutGuide:self.focusGuideUp];
+    self.focusGuideUp = nil;
+  }
+  if (self.focusGuideDown != nil) {
+    [[self rootView] removeLayoutGuide:self.focusGuideDown];
+    self.focusGuideDown = nil;
+  }
+  if (self.focusGuideLeft != nil) {
+    [[self rootView] removeLayoutGuide:self.focusGuideLeft];
+    self.focusGuideLeft = nil;
+  }
+  if (self.focusGuideRight != nil) {
+    [[self rootView] removeLayoutGuide:self.focusGuideRight];
+    self.focusGuideRight = nil;
+  }
 }
 
 - (void)sendFocusNotification:(__unused UIFocusUpdateContext *)context
@@ -339,15 +405,11 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : unused)
   _hasTVPreferredFocus = hasTVPreferredFocus;
   if (hasTVPreferredFocus) {
     dispatch_async(dispatch_get_main_queue(), ^{
-      UIView *rootview = self;
-      while (![rootview isReactRootView] && rootview != nil) {
-        rootview = [rootview superview];
-      }
-      if (rootview == nil) return;
+      RCTRootView *rootview = [self rootView];
       
-      rootview = [rootview superview];
+      if (rootview == nil) return;
       
-      [(RCTRootView *)rootview setReactPreferredFocusedView:self];
+      [rootview setReactPreferredFocusedView:self];
       [rootview setNeedsFocusUpdate];
       [rootview updateFocusIfNeeded];
     });
@@ -356,23 +418,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : unused)
 
 - (void)setHasTVPreferredFocus:(BOOL)hasTVPreferredFocus
 {
-  _hasTVPreferredFocus = hasTVPreferredFocus;
-  if (hasTVPreferredFocus) {
-    dispatch_async(dispatch_get_main_queue(), ^{
-      UIView *rootview = self;
-      while (![rootview isReactRootView] && rootview != nil) {
-        rootview = [rootview superview];
-      }
-      if (rootview == nil)
-        return;
-      
-      rootview = [rootview superview];
-      
-      [(RCTRootView *)rootview setReactPreferredFocusedView:self];
-      [rootview setNeedsFocusUpdate];
-      [rootview updateFocusIfNeeded];
-    });
-  }
+  [self setPreferredFocus:hasTVPreferredFocus];
 }
 
 - (void)addFocusGuide:(NSArray*)destinations {

package/ReactAndroid/build.gradle

@@ -333,18 +333,9 @@ android {
                     arguments "--output-sync=none"
                 }
 
-                // Note: On Windows there are limits on number of character in file paths and in command lines
-                // Ref: https://android.googlesource.com/platform/ndk/+/master/docs/BuildSystemMaintainers.md#Path-Length-Limits
-                // NDK allows circumventing command line limits using response(RSP) files as inputs using NDK_APP_SHORT_COMMANDS flag.
-                // 
-                // Windows can support long file paths if configured through registry or by prefixing all file paths with a special character sequence 
-                // The latter requires changes in NDK. And there are tools in NDK (AR) which is not able to handle long paths (>256) even after setting the registry key.
-                // The new architecutre source tree is too deep, and the object file naming conventions in NDK makes the matters worse, by producing incredibly long file paths.
-                // Other solutions such as symlinking source code etc. didn't work as expected, and makes the build scripts complicated and hard to manage.
-                // This change temporarily works around the issue by placing the temporary build outputs as short a path as possible within the project path.
+                // Fix for windows limit on number of character in file paths and in command lines
                 if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-                    arguments "NDK_OUT=${rootProject.projectDir.getParent()}\\.cxx",
-                              "NDK_APP_SHORT_COMMANDS=true"
+                    arguments "NDK_APP_SHORT_COMMANDS=true"
                 }
             }
         }

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.68.1-0
+VERSION_NAME=0.68.2-1
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative

package/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/Android.mk

@@ -13,6 +13,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jsijniprofiler
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 

package/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk

@@ -12,6 +12,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := hermes-executor-release
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 
@@ -35,6 +36,7 @@ LOCAL_MODULE := hermes-executor-debug
 LOCAL_CFLAGS := -DHERMES_ENABLE_DEBUGGER=1
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := mapbufferjni
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/react/common/mapbuffer/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
   libfb \

package/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := fabricjni
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
   libbutter \

package/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jscexecutor
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 

package/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := reactnativeblob
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 

package/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/Android.mk

@@ -26,6 +26,7 @@ LOCAL_MODULE := reactperfloggerjni
 
 # Compile all local c++ files
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/reactperflogger/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 # Build the files in this directory as a shared library
 include $(BUILD_SHARED_LIBRARY)

package/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk

@@ -28,6 +28,7 @@ LOCAL_MODULE := callinvokerholder
 
 # Compile all local c++ files
 LOCAL_SRC_FILES := $(LOCAL_PATH)/ReactCommon/CallInvokerHolder.cpp
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 # Build the files in this directory as a shared library
 include $(BUILD_STATIC_LIBRARY)
@@ -56,6 +57,7 @@ LOCAL_STATIC_LIBRARIES = libcallinvokerholder libreactperfloggerjni
 
 # Compile all local c++ files
 LOCAL_SRC_FILES := $(LOCAL_PATH)/ReactCommon/TurboModuleManager.cpp $(LOCAL_PATH)/ReactCommon/OnLoad.cpp
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 # Build the files in this directory as a shared library
 include $(BUILD_SHARED_LIBRARY)

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := uimanagerjni
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
   libfb \

package/ReactAndroid/src/main/jni/first-party/yogajni/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := yoga
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/jni/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/jni
 

package/ReactAndroid/src/main/jni/react/jni/Android.mk

@@ -47,6 +47,7 @@ LOCAL_MODULE := reactnativeutilsjni
 
 # Compile all local c++ files.
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 ifeq ($(APP_OPTIM),debug)
   # Keep symbols by overriding the strip command invoked by ndk-build.
@@ -106,6 +107,7 @@ LOCAL_MODULE := reactnativejni
 
 # Compile all local c++ files.
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 ifeq ($(APP_OPTIM),debug)
   # Keep symbols by overriding the strip command invoked by ndk-build.

package/ReactAndroid/src/main/jni/third-party/boost/Android.mk

@@ -5,6 +5,7 @@ include $(CLEAR_VARS)
 # because the react native version does not include anything outside of headers.
 # They are required for Folly futures to compile successfully.
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/asm/$(TARGET_ARCH)/*.S)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0