react-native-tvos 0.86.0-2 → 0.87.0-0

package/React/Base/RCTRootView.m

@@ -7,7 +7,6 @@
 
 #import "RCTRootView.h"
 #import "RCTRootViewDelegate.h"
-#import "RCTRootViewInternal.h"
 
 #import <objc/runtime.h>
 
@@ -19,8 +18,6 @@
 #import "RCTLog.h"
 #import "RCTPerformanceLogger.h"
 #import "RCTProfile.h"
-#import "RCTRootContentView.h"
-#import "RCTRootShadowView.h"
 #import "RCTTouchHandler.h"
 #import "RCTUIManager.h"
 #import "RCTUIManagerUtils.h"
@@ -28,465 +25,10 @@
 #import "RCTView.h"
 #import "UIView+React.h"
 
-#if TARGET_OS_TV
-#import "RCTTVNavigationEventEmitter.h"
-#import "RCTTVRemoteHandler.h"
-#import "RCTTVRemoteSelectHandler.h"
-#import <React/RCTTVNavigationEventNotification.h>
-#endif
-
-#if RCT_DEV
-#import "RCTDevMenu.h"
-#endif
-
-
 NSString *const RCTContentDidAppearNotification = @"RCTContentDidAppearNotification";
 
-#ifndef RCT_REMOVE_LEGACY_ARCH
-
-@implementation RCTRootView {
-  RCTBridge *_bridge;
-  NSString *_moduleName;
-  RCTRootContentView *_contentView;
-  BOOL _passThroughTouches;
-  CGSize _intrinsicContentSize;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame
-                       bridge:(RCTBridge *)bridge
-                   moduleName:(NSString *)moduleName
-            initialProperties:(NSDictionary *)initialProperties
-{
-  RCTAssertMainQueue();
-  RCTAssert(bridge, @"A bridge instance is required to create an RCTRootView");
-  RCTAssert(moduleName, @"A moduleName is required to create an RCTRootView");
-
-  RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"-[RCTRootView init]", nil);
-  if (!bridge.isLoading) {
-    [bridge.performanceLogger markStartForTag:RCTPLTTI];
-  }
-
-  if (self = [super initWithFrame:frame]) {
-    self.backgroundColor = [UIColor whiteColor];
-
-    _bridge = bridge;
-    _moduleName = moduleName;
-    _appProperties = [initialProperties copy];
-    _loadingViewFadeDelay = 0.25;
-    _loadingViewFadeDuration = 0.25;
-    _sizeFlexibility = RCTRootViewSizeFlexibilityNone;
-    _minimumSize = CGSizeZero;
-
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(bridgeDidReload)
-                                                 name:RCTJavaScriptWillStartLoadingNotification
-                                               object:_bridge];
-
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(javaScriptDidLoad:)
-                                                 name:RCTJavaScriptDidLoadNotification
-                                               object:_bridge];
-
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(hideLoadingView)
-                                                 name:RCTContentDidAppearNotification
-                                               object:self];
-
-#if TARGET_OS_TV
-
-#if RCT_DEV
-      [[NSNotificationCenter defaultCenter] addObserver:self
-                                               selector:@selector(showDevMenu) 
-                                                   name:@"RCTShowDevMenuNotification"
-                                                 object:nil];
-#endif
-      
-    self.tvRemoteHandler = [[RCTTVRemoteHandler alloc] initWithView:self];
-    self.tvRemoteSelectHandler = [[RCTTVRemoteSelectHandler alloc] initWithView:self];
-#endif
-
-    [self showLoadingView];
-
-    // Immediately schedule the application to be started.
-    // (Sometimes actual `_bridge` is already batched bridge here.)
-    [self bundleFinishedLoading:([_bridge batchedBridge] ?: _bridge)];
-  }
-
-  RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
-
-  return self;
-}
-
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-                    moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties
-{
-  return [self initWithFrame:CGRectZero bridge:bridge moduleName:moduleName initialProperties:initialProperties];
-}
-
-#if TARGET_OS_TV && RCT_DEV
-- (void)showDevMenu {
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [[self->_bridge devMenu] show];
-    });
-}
-#endif // TARGET_OS_TV
-
-- (instancetype)initWithBundleURL:(NSURL *)bundleURL
-                       moduleName:(NSString *)moduleName
-                initialProperties:(NSDictionary *)initialProperties
-                    launchOptions:(NSDictionary *)launchOptions
-{
-  RCTBridge *bridge = [[RCTBridge alloc] initWithBundleURL:bundleURL moduleProvider:nil launchOptions:launchOptions];
-
-  return [self initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
-}
-
-RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
-RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
-
-- (UIView *)view
-{
-  return self;
-}
-
-#if TARGET_OS_TV
-- (NSArray<id<UIFocusEnvironment>> *)preferredFocusEnvironments
-{
-  if (self.reactPreferredFocusEnvironments != nil) {
-    NSArray<id<UIFocusEnvironment>> *tempReactPreferredFocusEnvironments = self.reactPreferredFocusEnvironments;
-    self.reactPreferredFocusEnvironments = nil;
-    return tempReactPreferredFocusEnvironments;
-  }
-
-  if (self.reactPreferredFocusedView && self.reactPreferredFocusedView.window != nil) {
-    return @[self.reactPreferredFocusedView];
-  }
-  return [super preferredFocusEnvironments];
-}
-#endif
-
-#pragma mark - passThroughTouches
-
-- (BOOL)passThroughTouches
-{
-  return _contentView.passThroughTouches;
-}
-
-- (void)setPassThroughTouches:(BOOL)passThroughTouches
-{
-  _passThroughTouches = passThroughTouches;
-  _contentView.passThroughTouches = passThroughTouches;
-}
-
-#pragma mark - Layout
-
-- (CGSize)sizeThatFits:(CGSize)size
-{
-  CGSize fitSize = _intrinsicContentSize;
-  CGSize currentSize = self.bounds.size;
-
-  // Following the current `size` and current `sizeFlexibility` policy.
-  fitSize = CGSizeMake(
-      _sizeFlexibility & RCTRootViewSizeFlexibilityWidth ? fitSize.width : currentSize.width,
-      _sizeFlexibility & RCTRootViewSizeFlexibilityHeight ? fitSize.height : currentSize.height);
-
-  // Following the given size constraints.
-  fitSize = CGSizeMake(MIN(size.width, fitSize.width), MIN(size.height, fitSize.height));
-
-  return fitSize;
-}
-
-- (void)layoutSubviews
-{
-  [super layoutSubviews];
-  _contentView.frame = self.bounds;
-  _loadingView.center = (CGPoint){CGRectGetMidX(self.bounds), CGRectGetMidY(self.bounds)};
-}
-
-- (void)setMinimumSize:(CGSize)minimumSize
-{
-  if (CGSizeEqualToSize(_minimumSize, minimumSize)) {
-    return;
-  }
-  _minimumSize = minimumSize;
-  __block NSNumber *tag = self.reactTag;
-  __weak typeof(self) weakSelf = self;
-  RCTExecuteOnUIManagerQueue(^{
-    __strong typeof(self) strongSelf = weakSelf;
-    if (strongSelf && strongSelf->_bridge.isValid) {
-      RCTRootShadowView *shadowView = (RCTRootShadowView *)[strongSelf->_bridge.uiManager shadowViewForReactTag:tag];
-      shadowView.minimumSize = minimumSize;
-    }
-  });
-}
-
-- (UIViewController *)reactViewController
-{
-  return _reactViewController ?: [super reactViewController];
-}
-
-- (BOOL)canBecomeFirstResponder
-{
-  return YES;
-}
-
-- (void)setLoadingView:(UIView *)loadingView
-{
-  _loadingView = loadingView;
-  if (!_contentView.contentHasAppeared) {
-    [self showLoadingView];
-  }
-}
-
-- (void)showLoadingView
-{
-  if (_loadingView && !_contentView.contentHasAppeared) {
-    _loadingView.hidden = NO;
-    [self addSubview:_loadingView];
-  }
-}
-
-- (void)hideLoadingView
-{
-  if (_loadingView.superview == self && _contentView.contentHasAppeared) {
-    if (_loadingViewFadeDuration > 0) {
-      dispatch_after(
-          dispatch_time(DISPATCH_TIME_NOW, (int64_t)(_loadingViewFadeDelay * NSEC_PER_SEC)),
-          dispatch_get_main_queue(),
-          ^{
-            [UIView transitionWithView:self
-                duration:self->_loadingViewFadeDuration
-                options:UIViewAnimationOptionTransitionCrossDissolve
-                animations:^{
-                  self->_loadingView.hidden = YES;
-                }
-                completion:^(__unused BOOL finished) {
-                  [self->_loadingView removeFromSuperview];
-                }];
-          });
-    } else {
-      _loadingView.hidden = YES;
-      [_loadingView removeFromSuperview];
-    }
-  }
-}
-
-- (NSNumber *)reactTag
-{
-  RCTAssertMainQueue();
-  if (!super.reactTag) {
-    /**
-     * Every root view that is created must have a unique react tag.
-     * Numbering of these tags goes from 1, 11, 21, 31, etc
-     *
-     * NOTE: Since the bridge persists, the RootViews might be reused, so the
-     * react tag must be re-assigned every time a new UIManager is created.
-     */
-    self.reactTag = RCTAllocateRootViewTag();
-  }
-  return super.reactTag;
-}
-
-- (void)bridgeDidReload
-{
-  RCTAssertMainQueue();
-  // Clear the reactTag so it can be re-assigned
-  self.reactTag = nil;
-}
-
-- (void)javaScriptDidLoad:(NSNotification *)notification
-{
-  RCTAssertMainQueue();
-
-  // Use the (batched) bridge that's sent in the notification payload, so the
-  // RCTRootContentView is scoped to the right bridge
-  RCTBridge *bridge = notification.userInfo[@"bridge"];
-  if (bridge != _contentView.bridge) {
-    [self bundleFinishedLoading:bridge];
-  }
-}
-
-- (void)bundleFinishedLoading:(RCTBridge *)bridge
-{
-  RCTAssert(bridge != nil, @"Bridge cannot be nil");
-  if (!bridge.valid) {
-    return;
-  }
-
-  [_contentView removeFromSuperview];
-  _contentView = [[RCTRootContentView alloc] initWithFrame:self.bounds
-                                                    bridge:bridge
-                                                  reactTag:self.reactTag
-                                           sizeFlexibility:_sizeFlexibility];
-  [self runApplication:bridge];
-
-  _contentView.passThroughTouches = _passThroughTouches;
-  [self insertSubview:_contentView atIndex:0];
-
-  if (_sizeFlexibility == RCTRootViewSizeFlexibilityNone) {
-    self.intrinsicContentSize = self.bounds.size;
-  }
-}
-
-- (void)runApplication:(RCTBridge *)bridge
-{
-  NSString *moduleName = _moduleName ?: @"";
-  NSDictionary *appParameters = @{
-    @"rootTag" : _contentView.reactTag,
-    @"initialProps" : _appProperties ?: @{},
-  };
-
-  RCTLogInfo(@"Running application %@ (%@)", moduleName, appParameters);
-  [bridge enqueueJSCall:@"AppRegistry" method:@"runApplication" args:@[ moduleName, appParameters ] completion:NULL];
-}
-
-- (void)setSizeFlexibility:(RCTRootViewSizeFlexibility)sizeFlexibility
-{
-  if (_sizeFlexibility == sizeFlexibility) {
-    return;
-  }
-
-  _sizeFlexibility = sizeFlexibility;
-  [self setNeedsLayout];
-  _contentView.sizeFlexibility = _sizeFlexibility;
-}
-
-- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
-{
-  // The root view itself should never receive touches
-  UIView *hitView = [super hitTest:point withEvent:event];
-  if (self.passThroughTouches && hitView == self) {
-    return nil;
-  }
-  return hitView;
-}
-
-- (void)setAppProperties:(NSDictionary *)appProperties
-{
-  RCTAssertMainQueue();
-
-  if ([_appProperties isEqualToDictionary:appProperties]) {
-    return;
-  }
-
-  _appProperties = [appProperties copy];
-
-  if (_contentView && _bridge.valid && !_bridge.loading) {
-    [self runApplication:_bridge];
-  }
-}
-
-- (void)setIntrinsicContentSize:(CGSize)intrinsicContentSize
-{
-  BOOL oldSizeHasAZeroDimension = _intrinsicContentSize.height == 0 || _intrinsicContentSize.width == 0;
-  BOOL newSizeHasAZeroDimension = intrinsicContentSize.height == 0 || intrinsicContentSize.width == 0;
-  BOOL bothSizesHaveAZeroDimension = oldSizeHasAZeroDimension && newSizeHasAZeroDimension;
-
-  BOOL sizesAreEqual = CGSizeEqualToSize(_intrinsicContentSize, intrinsicContentSize);
-
-  _intrinsicContentSize = intrinsicContentSize;
-
-  // Don't notify the delegate if the content remains invisible or its size has not changed
-  if (bothSizesHaveAZeroDimension || sizesAreEqual) {
-    return;
-  }
-
-  [self invalidateIntrinsicContentSize];
-  [self.superview setNeedsLayout];
-
-  [_delegate rootViewDidChangeIntrinsicSize:self];
-}
-
-- (CGSize)intrinsicContentSize
-{
-  return _intrinsicContentSize;
-}
-
-- (void)contentViewInvalidated
-{
-  [_contentView removeFromSuperview];
-  _contentView = nil;
-  [self showLoadingView];
-}
-
-- (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection
-{
-  [super traitCollectionDidChange:previousTraitCollection];
-  if (RCTSharedApplication().applicationState == UIApplicationStateBackground) {
-    return;
-  }
-
-  [[NSNotificationCenter defaultCenter]
-      postNotificationName:RCTUserInterfaceStyleDidChangeNotification
-                    object:self
-                  userInfo:@{
-                    RCTUserInterfaceStyleDidChangeNotificationTraitCollectionKey : self.traitCollection,
-                  }];
-}
-
-- (void)dealloc
-{
-#if TARGET_OS_TV
-  self.tvRemoteHandler = nil;
-  self.tvRemoteSelectHandler = nil;
-#endif
-  [_contentView invalidate];
-}
-
-#if TARGET_OS_TV
-
-#pragma mark -
-#pragma mark RCTTVRemoteSelectHandlerDelegate methods
-
-- (void)animatePressIn {
-}
-
-- (void)animatePressOut { 
-}
-
-- (void)emitPressInEvent { 
-}
-
-- (void)emitPressOutEvent { 
-}
-
-- (void)sendSelectNotification
-{
-    [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventSelect keyAction:RCTTVRemoteEventKeyActionUp tag:self.reactTag target:self.reactTag];
-}
-
-- (void)sendLongSelectBeganNotification
-{
-    [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventLongSelect keyAction:RCTTVRemoteEventKeyActionDown tag:self.reactTag target:self.reactTag];
-}
-
-- (void)sendLongSelectEndedNotification
-{
-    [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventLongSelect keyAction:RCTTVRemoteEventKeyActionUp tag:self.reactTag target:self.reactTag];
-}
-
-#endif
-
-@end
-
-@implementation RCTRootView (Deprecated)
-
-- (CGSize)intrinsicSize
-{
-  RCTLogWarn(@"Calling deprecated `[-RCTRootView intrinsicSize]`.");
-  return self.intrinsicContentSize;
-}
-
-- (void)cancelTouches
-{
-  RCTLogWarn(@"`-[RCTRootView cancelTouches]` is deprecated and will be deleted soon.");
-  [[_contentView touchHandler] cancel];
-}
-
-@end
-
-#else // RCT_REMOVE_LEGACY_ARCH
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-designated-initializers"
 
 @implementation RCTRootView
 - (nonnull instancetype)initWithFrame:(CGRect)frame
@@ -514,4 +56,4 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
 
 @end
 
-#endif // RCT_REMOVE_LEGACY_ARCH
+#pragma clang diagnostic pop

package/React/Base/RCTUtils.h

@@ -16,9 +16,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 // Whether the New Architecture is enabled or not
 RCT_EXTERN BOOL RCTIsNewArchEnabled(void);
-RCT_EXTERN void RCTSetNewArchEnabled(BOOL enabled) __attribute__((deprecated(
-    "This function is now no-op. You need to modify the Info.plist adding a RCTNewArchEnabled bool property to control whether the New Arch is enabled or not")));
-;
 
 // Whether React native should output logs for modules and components used
 // through the interop layers

package/React/Base/RCTUtils.mm

@@ -11,8 +11,8 @@
 #import <mach/mach_time.h>
 #import <objc/message.h>
 #import <objc/runtime.h>
-#import <react/featureflags/ReactNativeFeatureFlags.h>
 #import <zlib.h>
+#import <atomic>
 
 #import <UIKit/UIKit.h>
 
@@ -47,12 +47,6 @@ BOOL RCTIsNewArchEnabled(void)
 {
   return YES;
 }
-void RCTSetNewArchEnabled(BOOL enabled)
-{
-  // This function is now deprecated and will be removed in the future.
-  // This function is now no-op. You need to modify the Info.plist adding a `RCTNewArchEnabled` bool property to control
-  // whether the New Arch is enabled or not.
-}
 
 BOOL RCTAreLegacyLogsEnabled(void)
 {
@@ -312,15 +306,12 @@ void RCTUnsafeExecuteOnMainQueueSync(dispatch_block_t block)
   }
 
 #if !TARGET_OS_TV
-  if (ReactNativeFeatureFlags::enableMainQueueCoordinatorOnIOS()) {
-    unsafeExecuteOnMainThreadSync(block);
-    return;
-  }
-#endif
-
+  unsafeExecuteOnMainThreadSync(block);
+#else
   dispatch_sync(dispatch_get_main_queue(), ^{
     block();
   });
+#endif
 }
 
 static void RCTUnsafeExecuteOnMainQueueOnceSync(dispatch_once_t *onceToken, dispatch_block_t block)
@@ -342,13 +333,10 @@ static void RCTUnsafeExecuteOnMainQueueOnceSync(dispatch_once_t *onceToken, disp
   }
 
 #if !TARGET_OS_TV
-  if (ReactNativeFeatureFlags::enableMainQueueCoordinatorOnIOS()) {
-    unsafeExecuteOnMainThreadSync(block);
-    return;
-  }
-#endif
-
+  unsafeExecuteOnMainThreadSync(block);
+#else
   dispatch_sync(dispatch_get_main_queue(), executeOnce);
+#endif
 }
 
 CGFloat RCTScreenScale(void)
@@ -396,24 +384,26 @@ UIDeviceOrientation RCTDeviceOrientation(void)
 
 CGSize RCTScreenSize(void)
 {
-  static CGSize portraitSize;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
+  static std::atomic<CGSize> cachedSize;
+  __block CGSize size = cachedSize.load(std::memory_order_relaxed);
+
+  if (CGSizeEqualToSize(size, CGSizeZero)) {
     RCTUnsafeExecuteOnMainQueueSync(^{
       CGSize screenSize = [UIScreen mainScreen].bounds.size;
-      portraitSize = CGSizeMake(MIN(screenSize.width, screenSize.height), MAX(screenSize.width, screenSize.height));
+      size = CGSizeMake(MIN(screenSize.width, screenSize.height), MAX(screenSize.width, screenSize.height));
+      cachedSize.store(size, std::memory_order_relaxed);
     });
-  });
+  }
 
 #if !TARGET_OS_TV
   if (UIDeviceOrientationIsLandscape(RCTDeviceOrientation())) {
-    return CGSizeMake(portraitSize.height, portraitSize.width);
+    return CGSizeMake(size.height, size.width);
   } else {
-    return CGSizeMake(portraitSize.width, portraitSize.height);
+    return CGSizeMake(size.width, size.height);
   }
 #else
   // tvOS doesn't have device orientation, always return landscape size
-  return CGSizeMake(portraitSize.height, portraitSize.width);
+  return CGSizeMake(size.height, size.width);
 #endif
 }
 

package/React/Base/RCTVersion.m

@@ -22,9 +22,9 @@ NSDictionary* RCTGetReactNativeVersion(void)
   dispatch_once(&onceToken, ^(void){
     __rnVersion = @{
                   RCTVersionMajor: @(0),
-                  RCTVersionMinor: @(86),
+                  RCTVersionMinor: @(87),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"2",
+                  RCTVersionPrerelease: @"0",
                   };
   });
   return __rnVersion;

package/React/Base/RCTViewRegistry.m

@@ -13,18 +13,8 @@
 
 @implementation RCTViewRegistry {
   RCTBridgelessComponentViewProvider _bridgelessComponentViewProvider;
-#ifndef RCT_REMOVE_LEGACY_ARCH
-  __weak RCTBridge *_bridge;
-#endif // RCT_REMOVE_LEGACY_ARCH
 }
 
-#ifndef RCT_REMOVE_LEGACY_ARCH
-- (void)setBridge:(RCTBridge *)bridge
-{
-  _bridge = bridge;
-}
-#endif // RCT_REMOVE_LEGACY_ARCH
-
 - (void)setBridgelessComponentViewProvider:(RCTBridgelessComponentViewProvider)bridgelessComponentViewProvider
 {
   _bridgelessComponentViewProvider = bridgelessComponentViewProvider;
@@ -34,13 +24,6 @@
 {
   UIView *view = nil;
 
-#ifndef RCT_REMOVE_LEGACY_ARCH
-  RCTBridge *bridge = _bridge;
-  if (bridge) {
-    view = [bridge.uiManager viewForReactTag:reactTag];
-  }
-#endif // RCT_REMOVE_LEGACY_ARCH
-
   if (view == nil && _bridgelessComponentViewProvider) {
     view = _bridgelessComponentViewProvider(reactTag);
   }
@@ -55,24 +38,13 @@
   }
 
   __weak __typeof(self) weakSelf = self;
-#ifndef RCT_REMOVE_LEGACY_ARCH
-  if (_bridge) {
-    [_bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-      __typeof(self) strongSelf = weakSelf;
-      if (strongSelf) {
-        block(strongSelf);
-      }
-    }];
-    return;
-  }
-#endif
 
   RCTExecuteOnMainQueue(^{
     __typeof(self) strongSelf = weakSelf;
     if (strongSelf) {
       block(strongSelf);
     }
-  }); // RCT_REMOVE_LEGACY_ARCH
+  });
 }
 
 @end