react-native-tvos 0.74.0-0rc3 → 0.74.2-0

package/Libraries/AppDelegate/RCTAppDelegate+Protected.h

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#if defined(__cplusplus)
+
+#import <ReactCommon/RCTTurboModuleManager.h>
+#import "RCTAppDelegate.h"
+
+@interface RCTAppDelegate () <RCTTurboModuleManagerDelegate>
+@end
+
+#endif

package/Libraries/AppDelegate/RCTAppDelegate.mm

@@ -11,7 +11,11 @@
 #import <React/RCTRootView.h>
 #import <React/RCTSurfacePresenterBridgeAdapter.h>
 #import <React/RCTUtils.h>
-#import <react/renderer/runtimescheduler/RuntimeScheduler.h>
+#import <objc/runtime.h>
+#import <react/featureflags/ReactNativeFeatureFlags.h>
+#import <react/featureflags/ReactNativeFeatureFlagsDefaults.h>
+#import <react/renderer/graphics/ColorComponents.h>
+#import "RCTAppDelegate+Protected.h"
 #import "RCTAppSetupUtils.h"
 
 #if RN_DISABLE_OSS_PLUGIN_HEADER
@@ -46,6 +50,8 @@
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+  [self _setUpFeatureFlags];
+
   RCTSetNewArchEnabled([self newArchEnabled]);
   RCTAppSetupPrepareApp(application, self.turboModuleEnabled);
 
@@ -268,4 +274,29 @@
   return [[RCTRootViewFactory alloc] initWithConfiguration:configuration andTurboModuleManagerDelegate:self];
 }
 
+#pragma mark - Feature Flags
+
+class RCTAppDelegateBridgelessFeatureFlags : public facebook::react::ReactNativeFeatureFlagsDefaults {
+ public:
+  bool useModernRuntimeScheduler() override
+  {
+    return true;
+  }
+  bool enableMicrotasks() override
+  {
+    return true;
+  }
+  bool batchRenderingUpdatesInEventLoop() override
+  {
+    return true;
+  }
+};
+
+- (void)_setUpFeatureFlags
+{
+  if ([self bridgelessEnabled]) {
+    facebook::react::ReactNativeFeatureFlags::override(std::make_unique<RCTAppDelegateBridgelessFeatureFlags>());
+  }
+}
+
 @end

package/Libraries/AppDelegate/React-RCTAppDelegate.podspec

@@ -89,6 +89,7 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-utils")
   add_dependency(s, "React-debug")
   add_dependency(s, "React-rendererdebug")
+  add_dependency(s, "React-featureflags")
 
   if use_hermes
     s.dependency "React-hermes"

package/Libraries/Components/Pressable/Pressable.js

@@ -275,6 +275,9 @@ function Pressable(props: Props, forwardedRef): React.Node {
 
   const [focused, setFocused] = useState(false);
 
+  const shouldUpdatePressed =
+    typeof children === 'function' || typeof style === 'function';
+
   let _accessibilityState = {
     busy: ariaBusy ?? accessibilityState?.busy,
     checked: ariaChecked ?? accessibilityState?.checked,
@@ -334,7 +337,7 @@ function Pressable(props: Props, forwardedRef): React.Node {
         if (android_rippleConfig != null) {
           android_rippleConfig.onPressIn(event);
         }
-        setPressed(true);
+        shouldUpdatePressed && setPressed(true);
         if (onPressIn != null) {
           onPressIn(event);
         }
@@ -344,7 +347,7 @@ function Pressable(props: Props, forwardedRef): React.Node {
         if (android_rippleConfig != null) {
           android_rippleConfig.onPressOut(event);
         }
-        setPressed(false);
+        shouldUpdatePressed && setPressed(false);
         if (onPressOut != null) {
           onPressOut(event);
         }
@@ -369,6 +372,7 @@ function Pressable(props: Props, forwardedRef): React.Node {
       onPressOut,
       pressRetentionOffset,
       setPressed,
+      shouldUpdatePressed,
       unstable_pressDelay,
     ],
   );
@@ -380,12 +384,12 @@ function Pressable(props: Props, forwardedRef): React.Node {
       if (isTVSelectable !== false || focusable !== false) {
         // $FlowFixMe[prop-missing]
         if (evt?.eventType === 'focus') {
-          setFocused(true);
+          shouldUpdatePressed && setFocused(true);
           onFocus && onFocus(evt);
           // $FlowFixMe[prop-missing]
         } else if (evt.eventType === 'blur') {
           onBlur && onBlur(evt);
-          setFocused(false);
+          shouldUpdatePressed && setFocused(false);
         }
       }
       // $FlowFixMe[prop-missing]
@@ -399,7 +403,7 @@ function Pressable(props: Props, forwardedRef): React.Node {
         onLongPress && onLongPress(evt);
       }
     },
-    [focused, onBlur, onFocus, onLongPress, onPress, focusable, isTVSelectable],
+    [focused, onBlur, onFocus, onLongPress, onPress, focusable, isTVSelectable, shouldUpdatePressed],
   );
 
   React.useEffect(() => {

package/Libraries/Components/TextInput/TextInput.js

@@ -1136,12 +1136,14 @@ function InternalTextInput(props: Props): React.Node {
         };
 
   const [mostRecentEventCount, setMostRecentEventCount] = useState<number>(0);
-
   const [lastNativeText, setLastNativeText] = useState<?Stringish>(props.value);
   const [lastNativeSelectionState, setLastNativeSelection] = useState<{|
-    selection: ?Selection,
+    selection: Selection,
     mostRecentEventCount: number,
-  |}>({selection, mostRecentEventCount});
+  |}>({
+    selection: {start: -1, end: -1},
+    mostRecentEventCount: mostRecentEventCount,
+  });
 
   const lastNativeSelection = lastNativeSelectionState.selection;
 
@@ -1506,6 +1508,7 @@ function InternalTextInput(props: Props): React.Node {
         onSelectionChange={_onSelectionChange}
         onSelectionChangeShouldSetResponder={emptyFunctionThatReturnsTrue}
         selection={selection}
+        selectionColor={selectionColor}
         style={StyleSheet.compose(
           useMultilineDefaultStyle ? styles.multilineDefault : null,
           style,

package/Libraries/Components/Touchable/TouchableBounce.js

@@ -245,6 +245,7 @@ class TouchableBounce extends React.Component<Props, State> {
       }
     }
     this.state.pressability.reset();
+    this.state.scale.resetAnimation();
   }
 }
 

package/Libraries/Components/Touchable/TouchableOpacity.js

@@ -364,6 +364,7 @@ class TouchableOpacity extends React.Component<Props, State> {
       }
     }
     this.state.pressability.reset();
+    this.state.anim.resetAnimation();
   }
 }
 

package/Libraries/Core/ReactNativeVersion.js

@@ -16,8 +16,8 @@ const version: $ReadOnly<{
 }> = {
   major: 0,
   minor: 74,
-  patch: 0,
-  prerelease: '0rc3',
+  patch: 2,
+  prerelease: '0',
 };
 
 module.exports = {version};

package/Libraries/ReactNative/RendererImplementation.js

@@ -47,9 +47,11 @@ export function findHostInstance_DEPRECATED<TElementType: ElementType>(
 
 export function findNodeHandle<TElementType: ElementType>(
   componentOrHandle: ?(ElementRef<TElementType> | number),
+  suppressWarning: ?Boolean,
 ): ?number {
   return require('../Renderer/shims/ReactNative').findNodeHandle(
     componentOrHandle,
+    suppressWarning,
   );
 }
 

package/README.md

@@ -2,7 +2,7 @@
 
 Apple TV and Android TV support for React Native are maintained here and in the corresponding `react-native-tvos` NPM package, and not in the [core repo](https://github.com/facebook/react-native/).  This is a full fork of the main repository, with only the changes needed to support Apple TV and Android TV.
 
-Releases of `react-native-tvos` will be based on a public release of `react-native`; e.g. the 0.72.4-0 release of this package will be derived from the 0.72.4 release of `react-native`. All releases of this repo will follow the 0.xx.x-y format, where x digits are from a specific RN core release, and y represents the additional versioning from this repo.
+Releases of `react-native-tvos` will be based on a public release of `react-native`; e.g. the 0.74.0-0 release of this package will be derived from the 0.74.0 release of `react-native`. All releases of this repo will follow the 0.xx.x-y format, where x digits are from a specific RN core release, and y represents the additional versioning from this repo.
 
 Releases will be published on npmjs.org and you may find the latest release version here: https://www.npmjs.com/package/react-native-tvos?activeTab=versions or use the tag `@latest`
 
@@ -16,6 +16,11 @@ To build your project for Apple TV, you should change your `package.json` import
 
 You cannot use this package and the core react-native package simultaneously in a project.
 
+This README covers only TV-specific features. For more general documentation and for changes between versions, you should also see these resources:
+
+- React Native documentation: https://reactnative.dev
+- The React Native changelog: https://github.com/facebook/react-native/blob/main/CHANGELOG.md
+
 ### Hermes JS support
 
 As of the 0.71 release, Hermes is fully working on both Apple TV and Android TV, and is enabled by default.
@@ -25,6 +30,17 @@ As of the 0.71 release, Hermes is fully working on both Apple TV and Android TV,
 - _Apple TV_: Modify your app's Podfile to set the `:fabric_enabled` value to `true` in both iOS and tvOS targets. After that, run `pod install` to pick up the additional pods needed for the new architecture. Some components (TVTextScrollView, TabBarIOS) have not been reimplemented in the new architecture so they will show up as an "unimplemented component".
 - _Android TV_: To enable Fabric, modify `android/gradle.properties` in your app and set `newArchEnabled=true`, then rebuild your app.
 
+As of the 0.74 release, bridgeless is the default when Fabric is enabled.
+
+Known issue: The `TVFocusGuide` `autofocus` API has problems on Apple TV when bridgeless is enabled. If you need to use Fabric without bridgeless on Apple TV, you can override the default by adding the method below in `AppDelegate.mm`:
+
+```objc
+- (BOOL)bridgelessEnabled
+{
+  return false;
+}
+```
+
 ### Typescript
 
 Typescript types for TV-specific components and APIs have been added to `types/public`.
@@ -33,21 +49,26 @@ Typescript types for TV-specific components and APIs have been added to `types/p
 
 TV device support has been implemented with the intention of making existing React Native applications "just work" on TV, with few or no changes needed in the JavaScript code for the applications.
 
-The RNTester app supports Apple TV and Android TV.  In this repo, `RNTester/Podfile` and `RNTester/RNTesterPods.xcodeproj` have been modified to work for tvOS.  Run `pod install`, then open `RNTesterPods.xcworkspace` and build.
+The RNTester app supports Apple TV and Android TV.  In this repo, `RNTester/Podfile` and `RNTester/RNTesterPods.xcodeproj` have been modified to work for tvOS.
 
+Minimum operating system versions:
 
-You should also install `yarn` globally, as it should be used instead of `npm` for working in React Native projects.
+- Apple TV: tvOS 13.4
+- Android TV:
+  - API level 21 (for the 0.73 releases)
+  - API level 23 (for the 0.74 release)
 
 ## Build changes
 
 - _Native layer for Apple TV_: React Native Xcode projects all now have Apple TV build targets, with names ending in the string '-tvOS'.  Changes in the React Native podspecs in 0.73 now require that your application `Podfile` only have one target. This repo supports either an iOS target or a tvOS target, but both targets should not be active at the same time. The new app template now has the iOS target commented out.
-- _Maven artifacts for Android TV_: In 0.71, the React Native Android prebuilt archives are published to Maven instead of being included in the NPM. We are following the same model, except that the Maven artifacts will be in group `io.github.react-native-tvos` instead of `com.facebook.react`. The `@react-native/gradle-plugin` module has been upgraded so that the Android dependencies will be detected correctly during build.
+- _Maven artifacts for Android TV_: In 0.71 and later releases, the React Native Android prebuilt archives are published to Maven instead of being included in the NPM. We are following the same model, except that the Maven artifacts will be in group `io.github.react-native-tvos` instead of `com.facebook.react`. The `@react-native/gradle-plugin` module has been upgraded so that the Android dependencies will be detected correctly during build.
 
 ## _(New)_ Project creation using the Expo CLI
 
 > _Pitfall:_ Make sure you do not globally install `react-native` or `react-native-tvos`. If you have done this the wrong way, you may get error messages like `ld: library not found for -lPods-TestApp-tvOS`.
 
 We strongly recommend [Yarn](https://classic.yarnpkg.com/en/docs/install) as the package manager.
+You should install `yarn` globally, as it should be used instead of `npm` for working in React Native projects.
 
 To create a new project, use `yarn create react-native-app` as shown below. (This will install the Expo tool `create-react-native-app` for you if it is not already present.)
 
@@ -104,8 +125,6 @@ var running_on_tv = Platform.isTV;
 var running_on_apple_tv = Platform.isTVOS;
 ```
 
-
-
 - _Common codebase for iOS and tvOS_: Since tvOS and iOS share most Objective-C and JavaScript code in common, most documentation for iOS applies equally to tvOS. Apple TV specific changes in native code are all wrapped by the TARGET_OS_TV define. These include changes to suppress APIs that are not supported on tvOS (e.g. web views, sliders, switches, status bar, etc.), and changes to support user input from the TV remote or keyboard.
 
 - _Common codebase for Android phone and Android TV_: Apps built for Android using this repo will run on both Android phone and Android TV. Most of the changes for TV are specific to handling focus-based navigation on a TV using the D-Pad on the remote control.
@@ -114,9 +133,10 @@ var running_on_apple_tv = Platform.isTVOS;
 
   - `onFocus` will be executed when the touchable view goes into focus
   - `onBlur` will be executed when the touchable view goes out of focus
-  - `onPress` will be executed when the touchable view is actually selected by pressing the "select" button on the TV remote.
+  - `onPress` will be executed when the touchable view is actually selected by pressing the "select" button on the TV remote (center button on Apple TV remote, or center button on Android TV DPad).
+  - `onLongPress` will be executed twice if the "select" button is held down for a length of time. The two events passed into `onLongPress()` will have different values for their `eventKeyAction` property, 0 for key down (start) and 1 for key up (end).
 
-- _Pressable controls_: The `Pressable` API works with TV.  Additional `onFocus` and `onBlur` props are provided to allow you to customize behavior when a Pressable enters or leaves focus. Similar to the `pressed` state that is true while a user is pressing the component on a touchscreen, the `focused` state will be true when it is focused on TV.  `PressableExample` in RNTester has been modified appropriately.
+- _Pressable controls_: The `Pressable` API works with TV.  Additional `onFocus` and `onBlur` props are provided to allow you to customize behavior when a Pressable enters or leaves focus. Similar to the `pressed` state that is true while a user is pressing the component on a touchscreen, the `focused` state will be true when it is focused on TV.  `PressableExample` in RNTester has been modified appropriately. The `onPress()` and `onLongPress()` methods work the same way as with `Touchable` components.
 
 - _TV remote/keyboard input_: Application code that needs to implement custom handling of TV remote events can create an instance of `TVEventHandler` and listen for these events.  For a more convenient API, we provide `useTVEventHandler`.
 
@@ -189,7 +209,7 @@ class Game2048 extends React.Component {
 
 - _Flipper_: We do not support Flipper.
 
-- _LogBox_: The new LogBox error/warning display (which replaced YellowBox in 0.63) is working as expected on TV platforms, after a few adjustments to make the controls accessible to the focus engine.
+- _LogBox_: The LogBox error/warning display (which replaced YellowBox in 0.63) is working as expected on TV platforms, after a few adjustments to make the controls accessible to the focus engine.
 
 - _Dev Menu support_: On the Apple TV simulator, cmd-D will bring up the developer menu, just like on iOS. To bring it up on a real Apple TV device, make a long press on the play/pause button on the remote. (Please do not shake the Apple TV device, that will not work :) ). Android TV dev menu behavior is the same as on Android phone.
 

package/React/Base/RCTUtils.m

@@ -562,17 +562,37 @@ UIWindow *__nullable RCTKeyWindow(void)
     return nil;
   }
 
-  for (UIScene *scene in RCTSharedApplication().connectedScenes) {
-    if (scene.activationState != UISceneActivationStateForegroundActive ||
-        ![scene isKindOfClass:[UIWindowScene class]]) {
+  NSSet<UIScene *> *connectedScenes = RCTSharedApplication().connectedScenes;
+
+  UIScene *foregroundActiveScene;
+  UIScene *foregroundInactiveScene;
+
+  for (UIScene *scene in connectedScenes) {
+    if (![scene isKindOfClass:[UIWindowScene class]]) {
       continue;
     }
-    UIWindowScene *windowScene = (UIWindowScene *)scene;
 
-    for (UIWindow *window in windowScene.windows) {
-      if (window.isKeyWindow) {
-        return window;
-      }
+    if (scene.activationState == UISceneActivationStateForegroundActive) {
+      foregroundActiveScene = scene;
+      break;
+    }
+
+    if (!foregroundInactiveScene && scene.activationState == UISceneActivationStateForegroundInactive) {
+      foregroundInactiveScene = scene;
+      // no break, we can have the active scene later in the set.
+    }
+  }
+
+  UIScene *sceneToUse = foregroundActiveScene ? foregroundActiveScene : foregroundInactiveScene;
+  UIWindowScene *windowScene = (UIWindowScene *)sceneToUse;
+
+  if (@available(iOS 15.0, *)) {
+    return windowScene.keyWindow;
+  }
+
+  for (UIWindow *window in windowScene.windows) {
+    if (window.isKeyWindow) {
+      return window;
     }
   }
 

package/React/Base/RCTVersion.m

@@ -23,8 +23,8 @@ NSDictionary* RCTGetReactNativeVersion(void)
     __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(74),
-                  RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"0rc3",
+                  RCTVersionPatch: @(2),
+                  RCTVersionPrerelease: @"0",
                   };
   });
   return __rnVersion;

package/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm

@@ -146,13 +146,11 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
   [super surface:surface didChangeStage:stage];
   if (RCTSurfaceStageIsRunning(stage)) {
     [_bridge.performanceLogger markStopForTag:RCTPLTTI];
-    dispatch_async(dispatch_get_main_queue(), ^{
 #if TARGET_OS_TV
+    dispatch_async(dispatch_get_main_queue(), ^{
      self.tvRemoteHandler = [[RCTTVRemoteHandler alloc] initWithView:[self contentView]];
-#endif
-
-      [[NSNotificationCenter defaultCenter] postNotificationName:RCTContentDidAppearNotification object:self];
     });
+#endif
   }
 }
 

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

@@ -7,19 +7,22 @@
 
 #import "RCTRootComponentView.h"
 
+#import <React/RCTRootView.h>
 #import <react/renderer/components/root/RootComponentDescriptor.h>
 #import <react/renderer/components/root/RootProps.h>
 #import "RCTConversions.h"
 
 using namespace facebook::react;
 
-@implementation RCTRootComponentView
+@implementation RCTRootComponentView {
+  BOOL _contentHasAppeared;
+}
 
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
     _props = RootShadowNode::defaultSharedProps();
-
+    _contentHasAppeared = NO;
   }
 
   return self;
@@ -48,6 +51,23 @@ using namespace facebook::react;
 
 #pragma mark - RCTComponentViewProtocol
 
+- (void)prepareForRecycle
+{
+  [super prepareForRecycle];
+  _contentHasAppeared = NO;
+}
+
+- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+  [super mountChildComponentView:childComponentView index:index];
+  if (!self->_contentHasAppeared) {
+    self->_contentHasAppeared = YES;
+    dispatch_async(dispatch_get_main_queue(), ^{
+      [[NSNotificationCenter defaultCenter] postNotificationName:RCTContentDidAppearNotification object:self];
+    });
+  }
+}
+
 + (ComponentDescriptorProvider)componentDescriptorProvider
 {
   return concreteComponentDescriptorProvider<RootComponentDescriptor>();

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

@@ -437,6 +437,11 @@ static void RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrol
 
 - (void)prepareForRecycle
 {
+  [super prepareForRecycle];
+  // Must invalidate state before setting contentOffset on ScrollView.
+  // Otherwise the state will be propagated to shadow tree.
+  _state.reset();
+
   const auto &props = static_cast<const ScrollViewProps &>(*_props);
   _scrollView.contentOffset = RCTCGPointFromPoint(props.contentOffset);
   // We set the default behavior to "never" so that iOS
@@ -444,7 +449,6 @@ static void RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrol
   // and keeps it as an opt-in behavior.
   _scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
   _shouldUpdateContentInsetAdjustmentBehavior = YES;
-  _state.reset();
   _isUserTriggeredScrolling = NO;
   CGRect oldFrame = self.frame;
   self.frame = CGRectZero;

package/React/Fabric/RCTScheduler.h

@@ -30,6 +30,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)schedulerDidFinishTransaction:(facebook::react::MountingCoordinator::Shared)mountingCoordinator;
 
+- (void)schedulerShouldRenderTransactions:(facebook::react::MountingCoordinator::Shared)mountingCoordinator;
+
 - (void)schedulerDidDispatchCommand:(const facebook::react::ShadowView &)shadowView
                         commandName:(const std::string &)commandName
                                args:(const folly::dynamic &)args;

package/React/Fabric/RCTScheduler.mm

@@ -30,6 +30,12 @@ class SchedulerDelegateProxy : public SchedulerDelegate {
     [scheduler.delegate schedulerDidFinishTransaction:mountingCoordinator];
   }
 
+  void schedulerShouldRenderTransactions(const MountingCoordinator::Shared &mountingCoordinator) override
+  {
+    RCTScheduler *scheduler = (__bridge RCTScheduler *)scheduler_;
+    [scheduler.delegate schedulerShouldRenderTransactions:mountingCoordinator];
+  }
+
   void schedulerDidRequestPreliminaryViewAllocation(SurfaceId surfaceId, const ShadowNode &shadowNode) override
   {
     // Does nothing.

package/React/Fabric/RCTSurfacePresenter.mm

@@ -354,6 +354,11 @@ static BackgroundExecutor RCTGetBackgroundExecutor()
 #pragma mark - RCTSchedulerDelegate
 
 - (void)schedulerDidFinishTransaction:(MountingCoordinator::Shared)mountingCoordinator
+{
+  // no-op, we will flush the transaction from schedulerShouldRenderTransactions
+}
+
+- (void)schedulerShouldRenderTransactions:(MountingCoordinator::Shared)mountingCoordinator
 {
   [_mountingManager scheduleTransaction:mountingCoordinator];
 }

package/React/Modules/RCTUIManager.m

@@ -1678,8 +1678,8 @@ static UIView *_jsResponder;
 {
   self = [super init];
   if (self) {
-    self->_uiManager = uiManager;
-    self->_registry = registry;
+    _uiManager = uiManager;
+    _registry = registry;
   }
   return self;
 }
@@ -1697,26 +1697,27 @@ static UIView *_jsResponder;
 - (id)objectForKey:(id)key
 {
   if (![key isKindOfClass:[NSNumber class]]) {
-    return [super objectForKeyedSubscript:key];
+    return NULL;
   }
 
   NSNumber *index = (NSNumber *)key;
-  UIView *view = [_uiManager viewForReactTag:index];
+  UIView *view = _registry[index];
   if (view) {
     return [RCTUIManager paperViewOrCurrentView:view];
   }
-  view = _registry[index];
+  view = [_uiManager viewForReactTag:index];
   if (view) {
     return [RCTUIManager paperViewOrCurrentView:view];
   }
-  return [super objectForKeyedSubscript:key];
+  return NULL;
 }
 
 - (void)removeObjectForKey:(id)key
 {
   if (![key isKindOfClass:[NSNumber class]]) {
-    return [super removeObjectForKey:key];
+    return;
   }
+
   NSNumber *tag = (NSNumber *)key;
 
   if (_registry[key]) {
@@ -1724,8 +1725,6 @@ static UIView *_jsResponder;
     [mutableRegistry removeObjectForKey:tag];
   } else if ([_uiManager viewForReactTag:tag]) {
     [_uiManager removeViewFromRegistry:tag];
-  } else {
-    [super removeObjectForKey:key];
   }
 }
 

package/React/Views/RCTComponentData.m

@@ -418,7 +418,20 @@ static RCTPropBlock createNSInvocationSetter(NSMethodSignature *typeSignature, S
 + (NSDictionary<NSString *, id> *)constantsForViewMangerClass:(Class)managerClass
 {
   if ([managerClass instancesRespondToSelector:@selector(constantsToExport)]) {
-    return [[managerClass new] constantsToExport];
+    BOOL shouldRunOnMainThread = NO;
+
+    if ([managerClass respondsToSelector:@selector(requiresMainQueueSetup)]) {
+      shouldRunOnMainThread = [managerClass requiresMainQueueSetup];
+    }
+    if (shouldRunOnMainThread) {
+      __block NSDictionary<NSString *, id> *constants;
+      RCTUnsafeExecuteOnMainQueueSync(^{
+        constants = [[managerClass new] constantsToExport];
+      });
+      return constants;
+    } else {
+      return [[managerClass new] constantsToExport];
+    }
   }
   return @{};
 }

package/React/Views/ScrollView/RCTScrollView.m

@@ -1002,13 +1002,13 @@ RCT_SCROLL_EVENT_HANDLER(scrollViewDidScrollToTop, onScrollToTop)
         // scroll to bottom
         // Similarly for left and right
         if (context.focusHeading == UIFocusHeadingUp && self.snapToStart) {
-            [self swipeVerticalScrollToOffset:0.0];
+            [self scrollToVerticalOffset:0.0];
         } else if(context.focusHeading == UIFocusHeadingDown && self.snapToEnd) {
-            [self swipeVerticalScrollToOffset:self.scrollView.contentSize.height];
+            [self scrollToVerticalOffset:self.scrollView.contentSize.height];
         } else if(context.focusHeading == UIFocusHeadingLeft && self.snapToStart) {
-            [self swipeHorizontalScrollToOffset:0.0];
+            [self scrollToHorizontalOffset:0.0];
         } else if(context.focusHeading == UIFocusHeadingRight && self.snapToEnd) {
-            [self swipeHorizontalScrollToOffset:self.scrollView.contentSize.width];
+            [self scrollToHorizontalOffset:self.scrollView.contentSize.width];
         }
 
     }
@@ -1119,7 +1119,7 @@ RCT_SCROLL_EVENT_HANDLER(scrollViewDidScrollToTop, onScrollToTop)
     return duration;
 }
 
-- (void)swipeVerticalScrollToOffset:(CGFloat)yOffset
+- (void)scrollToVerticalOffset:(CGFloat)yOffset
 {
     _blockFirstTouch = NO;
     dispatch_async(dispatch_get_main_queue(), ^{
@@ -1133,7 +1133,7 @@ RCT_SCROLL_EVENT_HANDLER(scrollViewDidScrollToTop, onScrollToTop)
     });
 }
 
-- (void)swipeHorizontalScrollToOffset:(CGFloat)xOffset
+- (void)scrollToHorizontalOffset:(CGFloat)xOffset
 {
     _blockFirstTouch = NO;
     dispatch_async(dispatch_get_main_queue(), ^{
@@ -1149,30 +1149,46 @@ RCT_SCROLL_EVENT_HANDLER(scrollViewDidScrollToTop, onScrollToTop)
 
 - (void)swipedUp
 {
+    if (!self.scrollView.scrollEnabled) {
+        return;
+    }
+
     CGFloat newOffset = self.scrollView.contentOffset.y - [self swipeVerticalInterval];
     NSLog(@"Swiped up to %f", newOffset);
-    [self swipeVerticalScrollToOffset:newOffset];
+    [self scrollToVerticalOffset:newOffset];
 }
 
 - (void)swipedDown
 {
+    if (!self.scrollView.scrollEnabled) {
+        return;
+    }
+
     CGFloat newOffset = self.scrollView.contentOffset.y + [self swipeVerticalInterval];
     NSLog(@"Swiped down to %f", newOffset);
-    [self swipeVerticalScrollToOffset:newOffset];
+    [self scrollToVerticalOffset:newOffset];
 }
 
 - (void)swipedLeft
 {
-  CGFloat newOffset = self.scrollView.contentOffset.x - [self swipeHorizontalInterval];
-  NSLog(@"Swiped left to %f", newOffset);
-  [self swipeHorizontalScrollToOffset:newOffset];
+    if (!self.scrollView.scrollEnabled) {
+        return;
+    }
+
+    CGFloat newOffset = self.scrollView.contentOffset.x - [self swipeHorizontalInterval];
+    NSLog(@"Swiped left to %f", newOffset);
+    [self scrollToHorizontalOffset:newOffset];
 }
 
 - (void)swipedRight
 {
-  CGFloat newOffset = self.scrollView.contentOffset.x + [self swipeHorizontalInterval];
-  NSLog(@"Swiped right to %f", newOffset);
-  [self swipeHorizontalScrollToOffset:newOffset];
+    if (!self.scrollView.scrollEnabled) {
+        return;
+    }
+
+    CGFloat newOffset = self.scrollView.contentOffset.x + [self swipeHorizontalInterval];
+    NSLog(@"Swiped right to %f", newOffset);
+    [self scrollToHorizontalOffset:newOffset];
 }
 
 - (void)addSwipeGestureRecognizers