react-native-tvos 0.66.3-0 → 0.66.3-3

package/Libraries/Components/AppleTV/TVFocusEventHandler.js

@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow
+ */
+
+'use strict';
+
+import NativeEventEmitter from '../../EventEmitter/NativeEventEmitter';
+import Platform from '../../Utilities/Platform';
+import {type EventSubscription} from '../../vendor/emitter/EventEmitter';
+import NativeTVNavigationEventEmitter from './NativeTVNavigationEventEmitter';
+
+class TVFocusEventHandler {
+  __nativeTVNavigationEventListener: ?EventSubscription = null;
+  __nativeTVNavigationEventEmitter: ?NativeEventEmitter = null;
+  __callbackMap: Map<any, Function> = new Map();
+
+  constructor() {
+    if (Platform.OS === 'ios' && !NativeTVNavigationEventEmitter) {
+      return;
+    }
+
+    this.__nativeTVNavigationEventEmitter = new NativeEventEmitter(
+      NativeTVNavigationEventEmitter,
+    );
+    this.__nativeTVNavigationEventListener = this.__nativeTVNavigationEventEmitter.addListener(
+      'onHWKeyEvent',
+      data => {
+        const callback = this.__callbackMap.get(data.tag);
+        if (callback) {
+          callback(data);
+        }
+      },
+    );
+  }
+
+  register(componentTag: ?any, callback: Function): void {
+    this.__callbackMap.set(componentTag, callback);
+  }
+
+  unregister(componentTag: ?any): void {
+    this.__callbackMap.delete(componentTag);
+  }
+}
+
+export const tvFocusEventHandler: TVFocusEventHandler | null = Platform.isTV ? new TVFocusEventHandler() : null;

package/Libraries/Components/AppleTV/TVFocusGuideView.js

@@ -8,10 +8,11 @@
  * @format
  */
 
-const requireNativeComponent = require('../../ReactNative/requireNativeComponent');
 const React = require('react');
 const ReactNative = require('react-native');
+import ReactNativeShims from '../../Renderer/shims/ReactNative';
 const Platform = require('../../Utilities/Platform');
+import {Commands} from '../../Components/View/ViewNativeComponent';
 import type {ViewProps} from '../View/ViewPropTypes';
 
 type FocusGuideProps = $ReadOnly<{
@@ -23,26 +24,21 @@ type FocusGuideProps = $ReadOnly<{
   destinations: ?(Object[]),
 }>;
 
-class TVFocusGuideView extends React.Component<FocusGuideProps> {
-  _focusGuideRef: ?Object;
-  _destinationTags: ?(number[]);
+const TVFocusGuideView = (props: FocusGuideProps) => {
+  const focusGuideRef = React.useRef(null);
 
-  componentDidUpdate() {
-    const destinations = this.props.destinations || [];
-    this._destinationTags = destinations.map(
-      c => ReactNative.findNodeHandle(c) || 0,
-    );
-    this._focusGuideRef &&
-      this._focusGuideRef.setNativeProps({
-        destinationTags: this._destinationTags,
-      });
-  }
+  React.useEffect(() => {
+    const nativeDestinations = (props.destinations || [])
+                                 .map(d => ReactNative.findNodeHandle(d))
+                                 .filter(c => c !== 0 && c !== null && c !== undefined);
+    const hostComponentRef = ReactNativeShims.findHostInstance_DEPRECATED(focusGuideRef?.current);
+    hostComponentRef && Commands.setDestinations(hostComponentRef, nativeDestinations);
+  }, [props.destinations]);
 
-  render(): React.Node {
-    return (
-      // Container view must have nonzero size
-      <ReactNative.View style={[{minHeight: 1, minWidth: 1}, this.props.style]}>
-        {
+  return (
+    // Container view must have nonzero size
+    <ReactNative.View style={[{minHeight: 1, minWidth: 1}, props.style]}>
+      {
           /**
            * The client specified layout(using 'style' prop) should be applied the container view ReactNative.View.
            * And the focusGuide's layout shoule be overrided to wrap it fully inside the container view.
@@ -51,20 +47,21 @@ class TVFocusGuideView extends React.Component<FocusGuideProps> {
            * and so, the left margin is getting added twice and UI becomes incorrect. 
            * The same is applicable for other layout properties.
            */
-        }
-        {Platform.isTVOS ? (
-          <RNFocusGuide
-            style={[this.props.style, styles.focusGuideLayout]}
-            ref={ref => (this._focusGuideRef = ref)}
-            destinationTags={this._destinationTags}>
-            {this.props.children}
-          </RNFocusGuide>
-        ) : (
-          this.props.children
-        )}
-      </ReactNative.View>)
-  }
-}
+      }
+      {Platform.isTVOS ? (
+        <ReactNative.View
+          style={[props.style, styles.focusGuideLayout]}
+          ref={focusGuideRef}
+        >
+          {props.children}
+        </ReactNative.View>
+      ) : (
+          props.children
+      )}
+    </ReactNative.View>
+  );
+
+};
 
 const styles = ReactNative.StyleSheet.create({
   focusGuideLayout: {
@@ -79,6 +76,4 @@ const styles = ReactNative.StyleSheet.create({
   },
 });
 
-const RNFocusGuide = requireNativeComponent('RCTTVFocusGuideView');
-
 module.exports = TVFocusGuideView;

package/Libraries/Components/AppleTV/TVViewPropTypes.js

@@ -78,31 +78,4 @@ export type TVViewProps = $ReadOnly<{|
    */
   tvParallaxProperties?: TVParallaxPropertiesType,
 
-  /**
-   * *(Apple TV only)* May be used to change the appearance of the Apple TV parallax effect when this view goes in or out of focus.  Defaults to 2.0.
-   *
-   * @platform ios
-   */
-  tvParallaxShiftDistanceX?: number,
-
-  /**
-   * *(Apple TV only)* May be used to change the appearance of the Apple TV parallax effect when this view goes in or out of focus.  Defaults to 2.0.
-   *
-   * @platform ios
-   */
-  tvParallaxShiftDistanceY?: number,
-
-  /**
-   * *(Apple TV only)* May be used to change the appearance of the Apple TV parallax effect when this view goes in or out of focus.  Defaults to 0.05.
-   *
-   * @platform ios
-   */
-  tvParallaxTiltAngle?: number,
-
-  /**
-   * *(Apple TV only)* May be used to change the appearance of the Apple TV parallax effect when this view goes in or out of focus.  Defaults to 1.0.
-   *
-   * @platform ios
-   */
-  tvParallaxMagnification?: number,
 |}>;

package/Libraries/Components/Pressable/Pressable.js

@@ -9,7 +9,14 @@
  */
 
 import * as React from 'react';
-import {useMemo, useState, useRef, useImperativeHandle} from 'react';
+import {
+  useMemo,
+  useState,
+  useRef,
+  useImperativeHandle,
+  useCallback,
+  useEffect,
+} from 'react';
 import useAndroidRippleForView, {
   type RippleConfig,
 } from './useAndroidRippleForView';
@@ -26,8 +33,8 @@ import {normalizeRect, type RectOrSize} from '../../StyleSheet/Rect';
 import type {LayoutEvent, PressEvent} from '../../Types/CoreEventTypes';
 import View from '../View/View';
 import typeof TVParallaxPropertiesType from '../AppleTV/TVViewPropTypes';
-import useTVEventHandler from '../AppleTV/useTVEventHandler';
 import Platform from '../../Utilities/Platform';
+import {tvFocusEventHandler} from '../AppleTV/TVFocusEventHandler';
 
 type ViewStyleProp = $ElementType<React.ElementConfig<typeof View>, 'style'>;
 
@@ -186,6 +193,7 @@ function Pressable(props: Props, forwardedRef): React.Node {
     pressRetentionOffset,
     style,
     testOnly_pressed,
+    tvParallaxProperties,
     unstable_pressDelay,
     ...restProps
   } = props;
@@ -269,9 +277,9 @@ function Pressable(props: Props, forwardedRef): React.Node {
   );
   const eventHandlers = usePressability(config);
 
-  const pressableTVEventHandler = (evt: Event) => {
-    if (props.isTVSelectable !== false || props.focusable !== false) {
-      if (viewRef?.current?._nativeTag === evt.target) {
+  const pressableTVFocusEventHandler = useCallback(
+    (evt: Event) => {
+      if (isTVSelectable !== false || focusable !== false) {
         if (evt?.eventType === 'focus') {
           setFocused(true);
           onFocus && onFocus(evt);
@@ -280,7 +288,7 @@ function Pressable(props: Props, forwardedRef): React.Node {
           setFocused(false);
         }
       }
-      // Use these on tvOS only.  Android press events go to onClick() so we don't
+      // Use these on tvOS only. Android press events go to onClick() so we don't
       // need to call onPress() again here
       if (Platform.isTVOS) {
         if (focused && evt.eventType === 'select') {
@@ -290,9 +298,20 @@ function Pressable(props: Props, forwardedRef): React.Node {
           onLongPress && onLongPress(evt);
         }
       }
+    },
+    [focused, onBlur, onFocus, onLongPress, onPress, focusable, isTVSelectable],
+  );
+
+  useEffect(() => {
+    if (!tvFocusEventHandler) {
+      return;
     }
-  };
-  useTVEventHandler(pressableTVEventHandler);
+    const viewTag = viewRef?.current?._nativeTag;
+    tvFocusEventHandler.register(viewTag, pressableTVFocusEventHandler);
+    return () => {
+      tvFocusEventHandler.unregister(viewTag);
+    };
+  }, [pressableTVFocusEventHandler]);
 
   return (
     <View
@@ -301,6 +320,7 @@ function Pressable(props: Props, forwardedRef): React.Node {
       ref={viewRef}
       isTVSelectable={isTVSelectable !== false && accessible !== false}
       style={typeof style === 'function' ? style({pressed, focused}) : style}
+      tvParallaxProperties={tvParallaxProperties}
       collapsable={false}>
       {typeof children === 'function' ? children({pressed, focused}) : children}
       {__DEV__ ? <PressabilityDebugView color="red" hitSlop={hitSlop} /> : null}

package/Libraries/Components/Touchable/Touchable.js

@@ -15,7 +15,7 @@ import Platform from '../../Utilities/Platform';
 import Position from './Position';
 import UIManager from '../../ReactNative/UIManager';
 import SoundManager from '../Sound/SoundManager';
-import TVEventHandler from '../AppleTV/TVEventHandler';
+import {tvFocusEventHandler} from '../AppleTV/TVFocusEventHandler';
 
 import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
 
@@ -364,24 +364,21 @@ const LONG_PRESS_ALLOWED_MOVEMENT = 10;
  */
 const TouchableMixin = {
   componentDidMount: function() {
-    if (!Platform.isTV) {
+    if (!tvFocusEventHandler) {
       return;
     }
 
-    this._tvEventHandler = new TVEventHandler();
-    this._tvEventHandler.enable(this, function(cmp, evt) {
-      const myTag = ReactNative.findNodeHandle(cmp);
+    this._componentTag = ReactNative.findNodeHandle(this);
+    tvFocusEventHandler.register(this._componentTag, evt => {
       evt.dispatchConfig = {};
-      if (myTag === evt.tag) {
-        if (evt.eventType === 'focus') {
-          cmp.touchableHandleFocus(evt);
-        } else if (evt.eventType === 'blur') {
-          cmp.touchableHandleBlur(evt);
-        } else if (evt.eventType === 'select' && Platform.OS !== 'android') {
-          cmp.touchableHandlePress &&
-            !cmp.props.disabled &&
-            cmp.touchableHandlePress(evt);
-        }
+      if (evt.eventType === 'focus') {
+        this.touchableHandleFocus(evt);
+      } else if (evt.eventType === 'blur') {
+        this.touchableHandleBlur(evt);
+      } else if (evt.eventType === 'select' && Platform.OS !== 'android') {
+        this.touchableHandlePress &&
+          !this.props.disabled &&
+          this.touchableHandlePress(evt);
       }
     });
   },
@@ -390,9 +387,8 @@ const TouchableMixin = {
    * Clear all timeouts on unmount
    */
   componentWillUnmount: function() {
-    if (this._tvEventHandler) {
-      this._tvEventHandler.disable();
-      delete this._tvEventHandler;
+    if (tvFocusEventHandler) {
+      tvFocusEventHandler.unregister(this._componentTag);
     }
     this.touchableDelayTimeout && clearTimeout(this.touchableDelayTimeout);
     this.longPressDelayTimeout && clearTimeout(this.longPressDelayTimeout);

package/Libraries/Components/View/ViewNativeComponent.js

@@ -34,10 +34,15 @@ interface NativeCommands {
     viewRef: React.ElementRef<HostComponent<mixed>>,
     pressed: boolean,
   ) => void;
+  // Apple TV focus guide API
+  +setDestinations: (
+    viewRef: React.ElementRef<HostComponent<mixed>>,
+    destinations: Array<React.ElementRef<HostComponent<mixed>>>,
+  ) => void;
 }
 
 export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
-  supportedCommands: ['hotspotUpdate', 'setPressed'],
+  supportedCommands: ['hotspotUpdate', 'setPressed', 'setDestinations'],
 });
 
 export default ViewNativeComponent;

package/Libraries/LogBox/UI/LogBoxButton.js

@@ -63,6 +63,7 @@ function LogBoxButton(props: Props): React.Node {
     content
   ) : (
     <LogBoxTouchable
+      tvParallaxProperties={{enabled: false}}
       hitSlop={props.hitSlop}
       onPress={props.onPress}
       onPressIn={() => setPressed(true)}

package/React/Base/RCTTVRemoteHandler.h

@@ -19,6 +19,9 @@ extern NSString *const RCTTVRemoteEventRight;
 extern NSString *const RCTTVRemoteEventUp;
 extern NSString *const RCTTVRemoteEventDown;
 
+extern NSString *const RCTTVRemoteEventPageUp;
+extern NSString *const RCTTVRemoteEventPageDown;
+
 extern NSString *const RCTTVRemoteEventSwipeLeft;
 extern NSString *const RCTTVRemoteEventSwipeRight;
 extern NSString *const RCTTVRemoteEventSwipeUp;

package/React/Base/RCTTVRemoteHandler.m

@@ -32,6 +32,9 @@ 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";
@@ -102,6 +105,17 @@ static __volatile BOOL __useMenuKey = NO;
   [self addTapGestureRecognizerWithSelector:@selector(selectPressed:)
                                   pressType:UIPressTypeSelect
                                        name:RCTTVRemoteEventSelect];
+    
+  // Page Up/Down
+  if (@available(tvOS 14.3, *)) {
+      [self addTapGestureRecognizerWithSelector:@selector(tappedPageUp:)
+                                      pressType:UIPressTypePageUp
+                                           name:RCTTVRemoteEventPageUp];
+        
+      [self addTapGestureRecognizerWithSelector:@selector(tappedPageDown:)
+                                      pressType:UIPressTypePageDown
+                                           name:RCTTVRemoteEventPageDown];
+  }
 
   // Up
   [self addTapGestureRecognizerWithSelector:@selector(tappedUp:)
@@ -280,6 +294,16 @@ static __volatile BOOL __useMenuKey = NO;
   [self sendAppleTVEvent:RCTTVRemoteEventDown toView:r.view];
 }
 
+- (void)tappedPageUp:(UIGestureRecognizer *)r
+{
+  [self sendAppleTVEvent:RCTTVRemoteEventPageUp toView:r.view];
+}
+
+- (void)tappedPageDown:(UIGestureRecognizer *)r
+{
+  [self sendAppleTVEvent:RCTTVRemoteEventPageDown toView:r.view];
+}
+
 - (void)tappedLeft:(UIGestureRecognizer *)r
 {
   [self sendAppleTVEvent:RCTTVRemoteEventLeft toView:r.view];

package/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm

@@ -24,7 +24,7 @@
 
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
     __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
-  if (@available(iOS 13.0, *)) {
+  if (@available(iOS 13.0, tvOS 13.0, *)) {
     self.modalInPresentation = YES;
   }
 #endif

package/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm

@@ -79,9 +79,17 @@ static UIModalPresentationStyle presentationConfiguration(ModalHostViewProps con
     case ModalHostViewPresentationStyle::FullScreen:
       return UIModalPresentationFullScreen;
     case ModalHostViewPresentationStyle::PageSheet:
+#if TARGET_OS_TV
+      return UIModalPresentationOverFullScreen;
+#else
       return UIModalPresentationPageSheet;
+#endif
     case ModalHostViewPresentationStyle::FormSheet:
+#if TARGET_OS_TV
+      return UIModalPresentationOverFullScreen;
+#else
       return UIModalPresentationFormSheet;
+#endif
     case ModalHostViewPresentationStyle::OverFullScreen:
       return UIModalPresentationOverFullScreen;
   }

package/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.h

@@ -31,14 +31,20 @@ Class<RCTComponentViewProtocol> RCTFabricComponentsProvider(const char *name);
 // Lookup functions
 Class<RCTComponentViewProtocol> RCTSafeAreaViewCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTScrollViewCls(void) __attribute__((used));
+#if !TARGET_OS_TV
 Class<RCTComponentViewProtocol> RCTPullToRefreshViewCls(void) __attribute__((used));
+#endif
 Class<RCTComponentViewProtocol> RCTActivityIndicatorViewCls(void) __attribute__((used));
+#if !TARGET_OS_TV
 Class<RCTComponentViewProtocol> RCTSliderCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTSwitchCls(void) __attribute__((used));
+#endif
 Class<RCTComponentViewProtocol> RCTUnimplementedNativeViewCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTParagraphCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTTextInputCls(void) __attribute__((used));
+#if !TARGET_OS_TV
 Class<RCTComponentViewProtocol> RCTInputAccessoryCls(void) __attribute__((used));
+#endif
 Class<RCTComponentViewProtocol> RCTViewCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTImageCls(void) __attribute__((used));
 

package/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.mm

@@ -20,14 +20,20 @@ Class<RCTComponentViewProtocol> RCTFabricComponentsProvider(const char *name) {
   static std::unordered_map<std::string, Class (*)(void)> sFabricComponentsClassMap = {
     {"SafeAreaView", RCTSafeAreaViewCls},
     {"ScrollView", RCTScrollViewCls},
+#if !TARGET_OS_TV
     {"PullToRefreshView", RCTPullToRefreshViewCls},
+#endif
     {"ActivityIndicatorView", RCTActivityIndicatorViewCls},
+#if !TARGET_OS_TV
     {"Slider", RCTSliderCls},
     {"Switch", RCTSwitchCls},
+#endif
     {"UnimplementedNativeView", RCTUnimplementedNativeViewCls},
     {"Paragraph", RCTParagraphCls},
     {"TextInput", RCTTextInputCls},
+#if !TARGET_OS_TV
     {"InputAccessoryView", RCTInputAccessoryCls},
+#endif
     {"View", RCTViewCls},
     {"Image", RCTImageCls},
   };

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

@@ -9,6 +9,10 @@
 
 #import <React/RCTViewComponentView.h>
 
+#if TARGET_OS_TV
+#import "RCTTVRemoteHandler.h"
+#endif
+
 NS_ASSUME_NONNULL_BEGIN
 
 /**
@@ -16,6 +20,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface RCTRootComponentView : RCTViewComponentView
 
+#if TARGET_OS_TV
+@property (nonatomic, strong, nullable) RCTTVRemoteHandler *tvRemoteHandler;
+@property (nonatomic, weak, nullable) UIView *reactPreferredFocusedView;
+#endif
+
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -20,11 +20,29 @@ using namespace facebook::react;
   if (self = [super initWithFrame:frame]) {
     static const auto defaultProps = std::make_shared<const RootProps>();
     _props = defaultProps;
+#if TARGET_OS_TV
+      self.tvRemoteHandler = [[RCTTVRemoteHandler alloc] initWithView:self];
+#endif
   }
 
   return self;
 }
 
+#if TARGET_OS_TV
+- (void)dealloc
+{
+  self.tvRemoteHandler = nil;
+}
+
+- (NSArray<id<UIFocusEnvironment>> *)preferredFocusEnvironments {
+  if (self.reactPreferredFocusedView) {
+    return @[self.reactPreferredFocusedView];
+  }
+  return [super preferredFocusEnvironments];
+}
+#endif
+
+
 #pragma mark - RCTComponentViewProtocol
 
 + (ComponentDescriptorProvider)componentDescriptorProvider

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

@@ -195,9 +195,11 @@ static void RCTSendPaperScrollEvent_DEPRECATED(UIScrollView *scrollView, NSInteg
   MAP_SCROLL_VIEW_PROP(maximumZoomScale);
   MAP_SCROLL_VIEW_PROP(minimumZoomScale);
   MAP_SCROLL_VIEW_PROP(scrollEnabled);
+#if !TARGET_OS_TV
   MAP_SCROLL_VIEW_PROP(pagingEnabled);
   MAP_SCROLL_VIEW_PROP(pinchGestureEnabled);
   MAP_SCROLL_VIEW_PROP(scrollsToTop);
+#endif
   MAP_SCROLL_VIEW_PROP(showsHorizontalScrollIndicator);
   MAP_SCROLL_VIEW_PROP(showsVerticalScrollIndicator);
 

package/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm

@@ -233,7 +233,7 @@ using namespace facebook::react;
 - (void)handleLongPress:(UILongPressGestureRecognizer *)gesture
 {
   // TODO: Adopt showMenuFromRect (necessary for UIKitForMac)
-#if !TARGET_OS_UIKITFORMAC
+#if !TARGET_OS_UIKITFORMAC && !TARGET_OS_TV
   UIMenuController *menuController = [UIMenuController sharedMenuController];
 
   if (menuController.isMenuVisible) {
@@ -268,6 +268,7 @@ using namespace facebook::react;
 
 - (void)copy:(id)sender
 {
+#if !TARGET_OS_TV
   NSAttributedString *attributedText = self.attributedText;
 
   NSMutableDictionary *item = [NSMutableDictionary new];
@@ -284,6 +285,7 @@ using namespace facebook::react;
 
   UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
   pasteboard.items = @[ item ];
+#endif
 }
 
 @end

package/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm

@@ -464,6 +464,7 @@ using namespace facebook::react;
     return;
   }
 
+#if !TARGET_OS_TV
   if (shouldHaveInputAccesoryView) {
     UIToolbar *toolbarView = [[UIToolbar alloc] init];
     [toolbarView sizeToFit];
@@ -475,7 +476,9 @@ using namespace facebook::react;
                                                       action:@selector(handleInputAccessoryDoneButton)];
     toolbarView.items = @[ flexibleSpace, doneButton ];
     _backedTextInputView.inputAccessoryView = toolbarView;
-  } else {
+  } else
+#endif
+  {
     _backedTextInputView.inputAccessoryView = nil;
   }
 

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

@@ -69,6 +69,10 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, assign) UIEdgeInsets hitTestEdgeInsets;
 
+#if TARGET_OS_TV
+@property(nonatomic, nullable) UIFocusGuide *focusGuide;
+#endif
+
 /**
  * Enforcing `call super` semantic for overridden methods from `RCTComponentViewProtocol`.
  * The methods update the instance variables.