react-native-tvos 0.84.1-0 → 0.85.0-0

package/React/Fabric/Mounting/ComponentViews/VirtualView/RCTVirtualViewComponentView.mm

@@ -11,6 +11,8 @@
 #import <React/RCTConversions.h>
 #import <React/RCTScrollViewComponentView.h>
 #import <React/RCTScrollableProtocol.h>
+#import <React/RCTVirtualViewContainerProtocol.h>
+#import <React/RCTVirtualViewContainerState.h>
 #import <React/UIView+React.h>
 #import <jsi/jsi.h>
 
@@ -21,57 +23,37 @@
 #import <react/renderer/components/virtualview/VirtualViewComponentDescriptor.h>
 #import <react/renderer/components/virtualview/VirtualViewShadowNode.h>
 
-#import "../VirtualViewExperimental/RCTVirtualViewMode.h"
-#import "../VirtualViewExperimental/RCTVirtualViewRenderState.h"
 #import "RCTFabricComponentsPlugins.h"
+#import "RCTVirtualViewMode.h"
+#import "RCTVirtualViewRenderState.h"
 
 using namespace facebook;
 using namespace facebook::react;
 
-/**
- * Checks whether one CGRect overlaps with another CGRect.
- *
- * This is different from CGRectIntersectsRect because a CGRect representing
- * a line or a point is considered to overlap with another CGRect if the line
- * or point is within the rect bounds. However, two CGRects are not considered
- * to overlap if they only share a boundary.
- */
-static BOOL CGRectOverlaps(CGRect rect1, CGRect rect2)
-{
-  CGFloat minY1 = CGRectGetMinY(rect1);
-  CGFloat maxY1 = CGRectGetMaxY(rect1);
-  CGFloat minY2 = CGRectGetMinY(rect2);
-  CGFloat maxY2 = CGRectGetMaxY(rect2);
-  if (minY1 >= maxY2 || minY2 >= maxY1) {
-    // No overlap on the y-axis.
-    return NO;
-  }
-  CGFloat minX1 = CGRectGetMinX(rect1);
-  CGFloat maxX1 = CGRectGetMaxX(rect1);
-  CGFloat minX2 = CGRectGetMinX(rect2);
-  CGFloat maxX2 = CGRectGetMaxX(rect2);
-  if (minX1 >= maxX2 || minX2 >= maxX1) {
-    // No overlap on the x-axis.
-    return NO;
-  }
-  return YES;
+@interface RCTVirtualViewComponentView () {
+  NSString *_virtualViewID;
 }
 
-@interface RCTVirtualViewComponentView () <UIScrollViewDelegate>
 @end
 
 @implementation RCTVirtualViewComponentView {
-  RCTScrollViewComponentView *_lastParentScrollViewComponentView;
+  id<RCTVirtualViewContainerProtocol> _parentVirtualViewContainer;
   std::optional<RCTVirtualViewMode> _mode;
   RCTVirtualViewRenderState _renderState;
   std::optional<CGRect> _targetRect;
+  NSString *_nativeId;
+  BOOL _didLayout;
 }
 
+#pragma mark - Public API
+
 - (instancetype)initWithFrame:(CGRect)frame
 {
-  if (self = [super initWithFrame:frame]) {
+  if ((self = [super initWithFrame:frame]) != nil) {
     _props = VirtualViewShadowNode::defaultSharedProps();
     _renderState = RCTVirtualViewRenderStateUnknown;
+    _virtualViewID = [[NSUUID UUID] UUIDString];
+    _didLayout = NO;
   }
 
   return self;
@@ -88,34 +70,23 @@ static BOOL CGRectOverlaps(CGRect rect1, CGRect rect2)
     }
   }
 
-  // If disabled, `_renderState` will always be `RCTVirtualViewRenderStateUnknown`.
-  if (ReactNativeFeatureFlags::enableVirtualViewRenderState()) {
-    switch (newViewProps.renderState) {
-      case 1:
-        _renderState = RCTVirtualViewRenderStateRendered;
-        break;
-      case 2:
-        _renderState = RCTVirtualViewRenderStateNone;
-        break;
-      default:
-        _renderState = RCTVirtualViewRenderStateUnknown;
-        break;
-    }
+  switch (newViewProps.renderState) {
+    case 1:
+      _renderState = RCTVirtualViewRenderStateRendered;
+      break;
+    case 2:
+      _renderState = RCTVirtualViewRenderStateNone;
+      break;
+    default:
+      _renderState = RCTVirtualViewRenderStateUnknown;
+      break;
   }
 
-  [super updateProps:props oldProps:oldProps];
-}
+  const auto &newBaseViewProps = static_cast<const ViewProps &>(*props);
+  const auto nativeId = RCTNSStringFromStringNilIfEmpty(newBaseViewProps.nativeId);
+  _virtualViewID = nativeId == nil ? _virtualViewID : nativeId;
 
-- (RCTScrollViewComponentView *)getParentScrollViewComponentView
-{
-  UIView *view = self.superview;
-  while (view != nil) {
-    if ([view isKindOfClass:[RCTScrollViewComponentView class]]) {
-      return (RCTScrollViewComponentView *)view;
-    }
-    view = view.superview;
-  }
-  return nil;
+  [super updateProps:props oldProps:oldProps];
 }
 
 /**
@@ -126,18 +97,6 @@ static BOOL CGRectOverlaps(CGRect rect1, CGRect rect2)
  */
 static BOOL sIsAccessibilityUsed = NO;
 
-- (void)_unhideIfNeeded
-{
-  if (!sIsAccessibilityUsed) {
-    // accessibility is detected for the first time. Make views visible.
-    sIsAccessibilityUsed = YES;
-  }
-
-  if (self.hidden) {
-    self.hidden = NO;
-  }
-}
-
 - (NSInteger)accessibilityElementCount
 {
   // From empirical testing, method `accessibilityElementCount` is called lazily only
@@ -154,19 +113,23 @@ static BOOL sIsAccessibilityUsed = NO;
   return [super focusItemsInRect:rect];
 }
 
+- (NSString *)virtualViewID
+{
+  // Return a unique identifier for this virtual view
+  // Using the tag as a unique identifier since it's already unique per view
+  return _virtualViewID;
+}
+
 - (void)prepareForRecycle
 {
   [super prepareForRecycle];
 
-  // No need to remove the scroll listener here since the view is always removed from window before being recycled and
-  // we do that in didMoveToWindow, which gets called when the view is removed from window.
-  RCTAssert(
-      _lastParentScrollViewComponentView == nil,
-      @"_lastParentScrollViewComponentView should already have been cleared in didMoveToWindow.");
-
+  [[_parentVirtualViewContainer virtualViewContainerState] remove:self];
   self.hidden = NO;
+  _didLayout = NO;
   _mode.reset();
   _targetRect.reset();
+  _parentVirtualViewContainer = nil;
 }
 
 // Handles case when sibling changes size.
@@ -176,97 +139,41 @@ static BOOL sIsAccessibilityUsed = NO;
            oldLayoutMetrics:(const LayoutMetrics &)oldLayoutMetrics
 {
   [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:_layoutMetrics];
+  _didLayout = YES;
+  [self updateState];
+}
 
-  [self dispatchOnModeChangeIfNeeded:YES];
+- (void)updateState
+{
+  [[_parentVirtualViewContainer virtualViewContainerState] onChange:self];
 }
 
 - (void)didMoveToWindow
 {
   [super didMoveToWindow];
+  // here we will set the pointer to the virtualView container
+  // and if there was a layout, update
 
-  if (_lastParentScrollViewComponentView) {
-    [_lastParentScrollViewComponentView removeScrollListener:self];
-    _lastParentScrollViewComponentView = nil;
-  }
-
-  if (RCTScrollViewComponentView *parentScrollViewComponentView = [self getParentScrollViewComponentView]) {
-    if (self.window) {
-      // TODO(T202601695): We also want the ScrollView to emit layout changes from didLayoutSubviews so that any event
-      // that may affect visibily of this view notifies the listeners.
-      [parentScrollViewComponentView addScrollListener:self];
-      _lastParentScrollViewComponentView = parentScrollViewComponentView;
-
-      // We want to dispatch the event immediately when the view is added to the window before any scrolling occurs.
-      [self dispatchOnModeChangeIfNeeded:NO];
-    }
+  _parentVirtualViewContainer = [self _getParentVirtualViewContainer];
+  if (_parentVirtualViewContainer != nil && self.window != nil && _didLayout) {
+    [self updateState];
   }
 }
 
-- (void)scrollViewDidScroll:(UIScrollView *)scrollView
+- (CGRect)containerRelativeRect:(UIView *)scrollView
 {
-  [self dispatchOnModeChangeIfNeeded:NO];
+  // Return the view's position relative to its container (the scroll view)
+  return [self convertRect:self.bounds toView:scrollView];
 }
 
-- (void)dispatchOnModeChangeIfNeeded:(BOOL)checkForTargetRectChange
+- (void)onModeChange:(RCTVirtualViewMode)newMode targetRect:(CGRect)targetRect thresholdRect:(CGRect)thresholdRect
 {
-  if (!_lastParentScrollViewComponentView) {
-    return;
-  }
-
-  UIScrollView *scrollView = _lastParentScrollViewComponentView.scrollView;
-  CGRect targetRect = [self convertRect:self.bounds toView:scrollView];
-
-  // While scrolling, the `targetRect` does not change, so we don't check for changed `targetRect` in that case.
-  if (checkForTargetRectChange) {
-    if (_targetRect.has_value() && CGRectEqualToRect(targetRect, _targetRect.value())) {
-      return;
-    }
-    _targetRect = targetRect;
-  }
-
-  RCTVirtualViewMode newMode;
-  CGRect thresholdRect = CGRectMake(
-      scrollView.contentOffset.x,
-      scrollView.contentOffset.y,
-      scrollView.frame.size.width,
-      scrollView.frame.size.height);
-  const CGFloat visibleWidth = thresholdRect.size.width;
-  const CGFloat visibleHeight = thresholdRect.size.height;
-
-  if (CGRectOverlaps(targetRect, thresholdRect)) {
-    newMode = RCTVirtualViewModeVisible;
-  } else {
-    auto prerender = false;
-    const CGFloat prerenderRatio = ReactNativeFeatureFlags::virtualViewPrerenderRatio();
-    if (prerenderRatio > 0) {
-      thresholdRect = CGRectInset(thresholdRect, -visibleWidth * prerenderRatio, -visibleHeight * prerenderRatio);
-      prerender = CGRectOverlaps(targetRect, thresholdRect);
-    }
-    if (prerender) {
-      newMode = RCTVirtualViewModePrerender;
-    } else {
-      const CGFloat hysteresisRatio = ReactNativeFeatureFlags::virtualViewHysteresisRatio();
-      if (_mode.has_value() && hysteresisRatio > 0) {
-        thresholdRect = CGRectInset(thresholdRect, -visibleWidth * hysteresisRatio, -visibleHeight * hysteresisRatio);
-        if (CGRectOverlaps(targetRect, thresholdRect)) {
-          newMode = _mode.value();
-        } else {
-          newMode = RCTVirtualViewModeHidden;
-          thresholdRect = CGRectZero;
-        }
-      } else {
-        newMode = RCTVirtualViewModeHidden;
-        thresholdRect = CGRectZero;
-      }
-    }
-  }
-
   if (_mode.has_value() && newMode == _mode.value()) {
     return;
   }
 
-  // NOTE: Make sure to keep these props in sync with dispatchSyncModeChange below where we have to explicitly copy all
-  // props.
+  // NOTE: Make sure to keep these props in sync with dispatchSyncModeChange below where we have to explicitly copy
+  // all props.
   VirtualViewEventEmitter::OnModeChange event = {
       .mode = (int)newMode,
       .targetRect =
@@ -286,26 +193,22 @@ static BOOL sIsAccessibilityUsed = NO;
 
   switch (newMode) {
     case RCTVirtualViewModeVisible:
-      if (_renderState == RCTVirtualViewRenderStateUnknown) {
-        // Feature flag is disabled, so use the former logic.
-        [self dispatchSyncModeChange:event];
-      } else {
-        // If the previous mode was prerender and the result of dispatching that event was committed, we do not need to
-        // dispatch an event for visible.
-        const auto wasPrerenderCommitted = oldMode.has_value() && oldMode == RCTVirtualViewModePrerender &&
-            _renderState == RCTVirtualViewRenderStateRendered;
-        if (!wasPrerenderCommitted) {
-          [self dispatchSyncModeChange:event];
-        }
+      // If the previous mode was hidden, emit a mode change even if `renderState` is rendered,
+      // because the hidden mode change is still pending and will eventually be committed. Only
+      // skip emitting a mode change if the previous mode was prerender and the result of that
+      // event has already been committed.
+      if (!oldMode.has_value() || oldMode == RCTVirtualViewModeHidden ||
+          _renderState != RCTVirtualViewRenderStateRendered) {
+        [self _dispatchSyncModeChange:event];
       }
       break;
     case RCTVirtualViewModePrerender:
       if (!oldMode.has_value() || oldMode != RCTVirtualViewModeVisible) {
-        [self dispatchAsyncModeChange:event];
+        [self _dispatchAsyncModeChange:event];
       }
       break;
     case RCTVirtualViewModeHidden:
-      [self dispatchAsyncModeChange:event];
+      [self _dispatchAsyncModeChange:event];
       break;
   }
 
@@ -324,7 +227,33 @@ static BOOL sIsAccessibilityUsed = NO;
   }
 }
 
-- (void)dispatchAsyncModeChange:(VirtualViewEventEmitter::OnModeChange &)event
+#pragma mark - Private API
+
+- (void)_unhideIfNeeded
+{
+  if (!sIsAccessibilityUsed) {
+    // accessibility is detected for the first time. Make views visible.
+    sIsAccessibilityUsed = YES;
+  }
+
+  if (self.hidden) {
+    self.hidden = NO;
+  }
+}
+
+- (id<RCTVirtualViewContainerProtocol>)_getParentVirtualViewContainer
+{
+  UIView *view = self.superview;
+  while (view != nil) {
+    if ([view respondsToSelector:@selector(virtualViewContainerState)]) {
+      return (id<RCTVirtualViewContainerProtocol>)view;
+    }
+    view = view.superview;
+  }
+  return nil;
+}
+
+- (void)_dispatchAsyncModeChange:(VirtualViewEventEmitter::OnModeChange &)event
 {
   if (!_eventEmitter) {
     return;
@@ -334,7 +263,7 @@ static BOOL sIsAccessibilityUsed = NO;
   emitter.onModeChange(event);
 }
 
-- (void)dispatchSyncModeChange:(VirtualViewEventEmitter::OnModeChange &)event
+- (void)_dispatchSyncModeChange:(VirtualViewEventEmitter::OnModeChange &)event
 {
   if (!_eventEmitter) {
     return;

package/React/Fabric/Mounting/RCTMountingManager.mm

@@ -14,6 +14,7 @@
 #import <React/RCTLog.h>
 #import <React/RCTUtils.h>
 #import <cxxreact/TraceSection.h>
+#import <react/featureflags/ReactNativeFeatureFlags.h>
 #import <react/renderer/components/root/RootShadowNode.h>
 #import <react/renderer/core/LayoutableShadowNode.h>
 #import <react/renderer/core/RawProps.h>
@@ -286,7 +287,6 @@ static void RCTPerformMountInstructions(
                       componentDescriptor:(const ComponentDescriptor &)componentDescriptor
 {
   RCTAssertMainQueue();
-  NSArray<NSString *> *propsKeysToBeUpdated = extractKeysFromFollyDynamic(props);
   bool updatesTransform = props.find("transform") != props.items().end();
   bool updatesOpacity = props.find("opacity") != props.items().end();
 
@@ -296,13 +296,18 @@ static void RCTPerformMountInstructions(
     return;
   }
 
+  NSSet<NSString *> *propKeys = componentView.propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN ?: [NSSet new];
+
+  if (!ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
+    NSArray<NSString *> *propsKeysToBeUpdated = extractKeysFromFollyDynamic(props);
+    propKeys = [propKeys setByAddingObjectsFromArray:propsKeysToBeUpdated];
+  }
+
   SurfaceId surfaceId = RCTSurfaceIdForView(componentView);
   Props::Shared oldProps = [componentView props];
   Props::Shared newProps = componentDescriptor.cloneProps(
       PropsParserContext{surfaceId, *_contextContainer}, oldProps, RawProps(std::move(props)));
 
-  NSSet<NSString *> *propKeys = componentView.propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN ?: [NSSet new];
-  propKeys = [propKeys setByAddingObjectsFromArray:propsKeysToBeUpdated];
   componentView.propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN = nil;
   [componentView updateProps:newProps oldProps:oldProps];
   componentView.propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN = propKeys;

package/React/Fabric/RCTScheduler.h

@@ -31,6 +31,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)schedulerShouldRenderTransactions:
     (std::shared_ptr<const facebook::react::MountingCoordinator>)mountingCoordinator;
 
+- (void)schedulerShouldMergeReactRevision:(facebook::react::SurfaceId)surfaceId;
+
 - (void)schedulerDidDispatchCommand:(const facebook::react::ShadowView &)shadowView
                         commandName:(const std::string &)commandName
                                args:(const folly::dynamic &)args;

package/React/Fabric/RCTScheduler.mm

@@ -7,6 +7,7 @@
 
 #import "RCTScheduler.h"
 
+#import <QuartzCore/CADisplayLink.h>
 #import <cxxreact/TraceSection.h>
 #import <react/featureflags/ReactNativeFeatureFlags.h>
 #import <react/renderer/animations/LayoutAnimationDriver.h>
@@ -36,6 +37,12 @@ class SchedulerDelegateProxy : public SchedulerDelegate {
     [scheduler.delegate schedulerShouldRenderTransactions:mountingCoordinator];
   }
 
+  void schedulerShouldMergeReactRevision(SurfaceId surfaceId) override
+  {
+    RCTScheduler *scheduler = (__bridge RCTScheduler *)scheduler_;
+    [scheduler.delegate schedulerShouldMergeReactRevision:surfaceId];
+  }
+
   void schedulerDidRequestPreliminaryViewAllocation(const ShadowNode &shadowNode) override
   {
     // Does nothing.
@@ -113,6 +120,52 @@ class LayoutAnimationDelegateProxy : public LayoutAnimationStatusDelegate, publi
   void *scheduler_;
 };
 
+@interface RCTAnimationChoreographerDisplayLinkTarget : NSObject
+@property (nonatomic, assign) AnimationChoreographer *choreographer;
+- (void)displayLinkTick:(CADisplayLink *)sender;
+@end
+
+@implementation RCTAnimationChoreographerDisplayLinkTarget
+- (void)displayLinkTick:(CADisplayLink *)sender
+{
+  if (_choreographer != nullptr) {
+    _choreographer->onAnimationFrame(std::chrono::duration<double>(sender.targetTimestamp));
+  }
+}
+@end
+
+class RCTAnimationChoreographer : public AnimationChoreographer {
+  CADisplayLink *_animationDisplayLink;
+  RCTAnimationChoreographerDisplayLinkTarget *_displayLinkTarget;
+
+ public:
+  RCTAnimationChoreographer() : _displayLinkTarget([[RCTAnimationChoreographerDisplayLinkTarget alloc] init])
+  {
+    _displayLinkTarget.choreographer = this;
+  }
+  ~RCTAnimationChoreographer() override
+  {
+    if (_animationDisplayLink != nil) {
+      [_animationDisplayLink invalidate];
+      _animationDisplayLink = nil;
+    }
+    _displayLinkTarget.choreographer = nullptr;
+  }
+  void resume() override
+  {
+    if (_animationDisplayLink == nil) {
+      _animationDisplayLink = [CADisplayLink displayLinkWithTarget:_displayLinkTarget
+                                                          selector:@selector(displayLinkTick:)];
+      [_animationDisplayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
+    }
+    [_animationDisplayLink setPaused:NO];
+  }
+  void pause() override
+  {
+    [_animationDisplayLink setPaused:YES];
+  }
+};
+
 @implementation RCTScheduler {
   std::unique_ptr<Scheduler> _scheduler;
   std::shared_ptr<LayoutAnimationDriver> _animationDriver;
@@ -137,6 +190,10 @@ class LayoutAnimationDelegateProxy : public LayoutAnimationStatusDelegate, publi
       _uiRunLoopObserver->setDelegate(_layoutAnimationDelegateProxy.get());
     }
 
+    if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
+      toolbox.animationChoreographer = std::make_shared<RCTAnimationChoreographer>();
+    }
+
     _scheduler = std::make_unique<Scheduler>(
         toolbox, (_animationDriver ? _animationDriver.get() : nullptr), _delegateProxy.get());
   }

package/React/Fabric/RCTSurfacePointerHandler.mm

@@ -1,4 +1,3 @@
-#if !TARGET_OS_TV
 /*
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
@@ -16,6 +15,8 @@
 #import "RCTConversions.h"
 #import "RCTTouchableComponentViewProtocol.h"
 
+#if !TARGET_OS_TV
+
 using namespace facebook::react;
 
 typedef NS_ENUM(NSInteger, RCTPointerEventType) {
@@ -308,17 +309,21 @@ static PointerEvent CreatePointerEventFromActivePointer(
 
   event.pressure = activePointer.force;
 
-  if (activePointer.touchType == UITouchTypeIndirectPointer) {
-    // pointer events with a mouse button pressed should report a pressure of 0.5
-    // when the touch is down and 0.0 when it is lifted regardless of how it is reported by the OS
-    event.pressure = eventType != RCTPointerEventTypeEnd ? 0.5 : 0.0;
+  if (@available(iOS 13.4, tvOS 13.4, *)) {
+    if (activePointer.touchType == UITouchTypeIndirectPointer) {
+      // pointer events with a mouse button pressed should report a pressure of 0.5
+      // when the touch is down and 0.0 when it is lifted regardless of how it is reported by the OS
+      event.pressure = eventType != RCTPointerEventTypeEnd ? 0.5 : 0.0;
+    }
   }
 
   CGFloat pointerSize = activePointer.majorRadius * 2.0;
 
-  if (activePointer.touchType == UITouchTypeIndirectPointer) {
-    // mouse type pointers should always report a size of 1
-    pointerSize = 1.0;
+  if (@available(iOS 13.4, tvOS 13.4, *)) {
+    if (activePointer.touchType == UITouchTypeIndirectPointer) {
+      // mouse type pointers should always report a size of 1
+      pointerSize = 1.0;
+    }
   }
 
   event.width = pointerSize;
@@ -794,4 +799,5 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithTarget : (id)target action : (SEL)act
 #endif
 
 @end
-#endif
+
+#endif // !TARGET_OS_TV

package/React/Fabric/RCTSurfacePresenter.mm

@@ -307,6 +307,15 @@ using namespace facebook::react;
   [_mountingManager scheduleTransaction:mountingCoordinator];
 }
 
+- (void)schedulerShouldMergeReactRevision:(SurfaceId)surfaceId
+{
+  auto scheduler = [self scheduler];
+  RCTExecuteOnMainQueue(^{
+    scheduler.uiManager->getShadowTreeRegistry().visit(
+        surfaceId, [](const ShadowTree &shadowTree) { shadowTree.mergeReactRevision(); });
+  });
+}
+
 - (void)schedulerDidDispatchCommand:(const ShadowView &)shadowView
                         commandName:(const std::string &)commandName
                                args:(const folly::dynamic &)args

package/React/Fabric/RCTSurfaceTouchHandler.mm

@@ -1,4 +1,3 @@
-#if !TARGET_OS_TV
 /*
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
@@ -16,6 +15,8 @@
 #import "RCTSurfacePointerHandler.h"
 #import "RCTTouchableComponentViewProtocol.h"
 
+#if !TARGET_OS_TV
+
 using namespace facebook::react;
 
 typedef NS_ENUM(NSInteger, RCTTouchEventType) {
@@ -415,4 +416,5 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithTarget : (id)target action : (SEL)act
 }
 
 @end
-#endif
+
+#endif // !TARGET_OS_TV

package/React/Fabric/Surface/RCTFabricSurface.mm

@@ -45,7 +45,9 @@ using namespace facebook::react;
 
   // Can be accessed from the main thread only.
   RCTSurfaceView *_Nullable _view;
+#if !TARGET_OS_TV
   RCTSurfaceTouchHandler *_Nullable _touchHandler;
+#endif
 }
 
 @synthesize delegate = _delegate;
@@ -144,8 +146,10 @@ using namespace facebook::react;
   if (!_view) {
     _view = [[RCTSurfaceView alloc] initWithSurface:self];
     [self _updateLayoutContext];
+#if !TARGET_OS_TV
     _touchHandler = [RCTSurfaceTouchHandler new];
     [_touchHandler attachToView:_view];
+#endif
   }
 
   return _view;

package/React/Fabric/Utils/RCTLinearGradient.mm

@@ -24,18 +24,13 @@ using namespace facebook::react;
   CGPoint startPoint;
   CGPoint endPoint;
 
-  if (direction.type == GradientDirectionType::Angle) {
-    CGFloat angle = std::get<Float>(direction.value);
+  if (std::holds_alternative<Float>(direction)) {
+    CGFloat angle = std::get<Float>(direction);
     std::tie(startPoint, endPoint) = getPointsFromAngle(angle, size);
-  } else if (direction.type == GradientDirectionType::Keyword) {
-    auto keyword = std::get<GradientKeyword>(direction.value);
+  } else {
+    auto keyword = std::get<GradientKeyword>(direction);
     CGFloat angle = getAngleForKeyword(keyword, size);
     std::tie(startPoint, endPoint) = getPointsFromAngle(angle, size);
-  } else {
-    // Default to top-to-bottom gradient
-    CGFloat centerX = size.width / 2;
-    startPoint = CGPointMake(centerX, 0.0);
-    endPoint = CGPointMake(centerX, size.height);
   }
 
   CGFloat dx = endPoint.x - startPoint.x;

package/React/Inspector/RCTCxxInspectorWebSocketAdapter.mm

@@ -10,6 +10,7 @@
 #if RCT_DEV || RCT_REMOTE_PROFILE
 
 #import <React/RCTAssert.h>
+#import <React/RCTDevSupportHttpHeaders.h>
 #import <React/RCTInspector.h>
 #import <React/RCTInspectorPackagerConnection.h>
 #import <React/RCTUtils.h>
@@ -40,7 +41,10 @@ NSString *NSStringFromUTF8StringView(std::string_view view)
 {
   if ((self = [super init]) != nullptr) {
     _delegate = delegate;
-    _webSocket = [[SRWebSocket alloc] initWithURL:[NSURL URLWithString:NSStringFromUTF8StringView(url)]];
+    NSURL *requestURL = [NSURL URLWithString:NSStringFromUTF8StringView(url)];
+    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:requestURL];
+    [[RCTDevSupportHttpHeaders sharedInstance] applyHeadersToRequest:request];
+    _webSocket = [[SRWebSocket alloc] initWithURLRequest:request];
     _webSocket.delegate = self;
     [_webSocket open];
   }

package/React/Modules/RCTLayoutAnimation.m

@@ -33,6 +33,14 @@ static UIViewAnimationOptions UIViewAnimationOptionsFromRCTAnimationType(RCTAnim
   }
 }
 
+#if TARGET_OS_TV
+
+// No-op on tvOS
++ (void)initializeStatics
+{
+}
+
+#else
 // Use a custom initialization function rather than implementing `+initialize` so that we can control
 // when the initialization code runs. `+initialize` runs immediately before the first message is sent
 // to the class which may be too late for us. By this time, we may have missed some
@@ -58,6 +66,8 @@ static UIViewAnimationOptions UIViewAnimationOptionsFromRCTAnimationType(RCTAnim
 #endif
 }
 
+#endif
+
 - (instancetype)initWithDuration:(NSTimeInterval)duration
                            delay:(NSTimeInterval)delay
                         property:(NSString *)property