react-native-tvos 0.64.2-5 → 0.66.3-2

package/React/Fabric/Mounting/RCTComponentViewFactory.h

@@ -9,11 +9,13 @@
 
 #import <React/RCTComponentViewDescriptor.h>
 #import <React/RCTComponentViewProtocol.h>
-
+#import <jsi/jsi.h>
 #import <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
+void RCTInstallNativeComponentRegistryBinding(facebook::jsi::Runtime &runtime);
+
 /**
  * Registry of supported component view classes that can instantiate
  * view component instances by given component handle.
@@ -23,13 +25,19 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * Constructs and returns an instance of the class with a bunch of already registered standard components.
  */
-+ (RCTComponentViewFactory *)standardComponentViewFactory;
++ (RCTComponentViewFactory *)currentComponentViewFactory;
 
 /**
  * Registers a component view class in the factory.
  */
 - (void)registerComponentViewClass:(Class<RCTComponentViewProtocol>)componentViewClass;
 
+/**
+ * Registers component if there is a matching class. Returns true if it matching class is found or the component has
+ * already been registered, false otherwise.
+ */
+- (BOOL)registerComponentIfPossible:(std::string const &)componentName;
+
 /**
  * Creates a component view with given component handle.
  */

package/React/Fabric/Mounting/RCTComponentViewFactory.mm

@@ -12,8 +12,12 @@
 
 #import <better/map.h>
 #import <better/mutex.h>
+#import <better/set.h>
 
 #import <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#import <react/renderer/componentregistry/componentNameByReactViewName.h>
+#import <react/renderer/componentregistry/native/NativeComponentRegistryBinding.h>
+#import <react/renderer/core/PropsParserContext.h>
 #import <react/renderer/core/ReactPrimitives.h>
 
 #ifdef RN_DISABLE_OSS_PLUGIN_HEADER
@@ -26,6 +30,7 @@
 #import "RCTFabricComponentsPlugins.h"
 #import "RCTImageComponentView.h"
 #import "RCTLegacyViewManagerInteropComponentView.h"
+#import "RCTModalHostViewComponentView.h"
 #import "RCTMountingTransactionObserving.h"
 #import "RCTParagraphComponentView.h"
 #import "RCTRootComponentView.h"
@@ -37,6 +42,15 @@
 
 using namespace facebook::react;
 
+void RCTInstallNativeComponentRegistryBinding(facebook::jsi::Runtime &runtime)
+{
+  auto hasComponentProvider = [](std::string const &name) -> bool {
+    return [[RCTComponentViewFactory currentComponentViewFactory]
+        registerComponentIfPossible:componentNameByReactViewName(name)];
+  };
+  NativeComponentRegistryBinding::install(runtime, std::move(hasComponentProvider));
+}
+
 static Class<RCTComponentViewProtocol> RCTComponentViewClassWithName(const char *componentName)
 {
   return RCTFabricComponentsProvider(componentName);
@@ -44,58 +58,32 @@ static Class<RCTComponentViewProtocol> RCTComponentViewClassWithName(const char
 
 @implementation RCTComponentViewFactory {
   better::map<ComponentHandle, RCTComponentViewClassDescriptor> _componentViewClasses;
+  better::set<std::string> _registeredComponentsNames;
   ComponentDescriptorProviderRegistry _providerRegistry;
   better::shared_mutex _mutex;
 }
 
-+ (RCTComponentViewFactory *)standardComponentViewFactory
++ (RCTComponentViewFactory *)currentComponentViewFactory
 {
-  RCTComponentViewFactory *componentViewFactory = [[RCTComponentViewFactory alloc] init];
-
-  [componentViewFactory registerComponentViewClass:[RCTRootComponentView class]];
-  [componentViewFactory registerComponentViewClass:[RCTViewComponentView class]];
-  [componentViewFactory registerComponentViewClass:[RCTParagraphComponentView class]];
-  [componentViewFactory registerComponentViewClass:[RCTTextInputComponentView class]];
-
-  Class<RCTComponentViewProtocol> imageClass = RCTComponentViewClassWithName("Image");
-  [componentViewFactory registerComponentViewClass:imageClass];
-
-  auto providerRegistry = &componentViewFactory->_providerRegistry;
-
-  providerRegistry->setComponentDescriptorProviderRequest(
-      [providerRegistry, componentViewFactory](ComponentName requestedComponentName) {
-        // Fallback 1: Call provider function for component view class.
-        Class<RCTComponentViewProtocol> klass = RCTComponentViewClassWithName(requestedComponentName);
-        if (klass) {
-          [componentViewFactory registerComponentViewClass:klass];
-          return;
-        }
-
-        // Fallback 2: Try to use Paper Interop.
-        if ([RCTLegacyViewManagerInteropComponentView isSupported:RCTNSStringFromString(requestedComponentName)]) {
-          auto flavor = std::make_shared<std::string const>(requestedComponentName);
-          auto componentName = ComponentName{flavor->c_str()};
-          auto componentHandle = reinterpret_cast<ComponentHandle>(componentName);
-          auto constructor = [RCTLegacyViewManagerInteropComponentView componentDescriptorProvider].constructor;
-
-          providerRegistry->add(ComponentDescriptorProvider{componentHandle, componentName, flavor, constructor});
-
-          componentViewFactory->_componentViewClasses[componentHandle] = [componentViewFactory
-              _componentViewClassDescriptorFromClass:[RCTLegacyViewManagerInteropComponentView class]];
-          return;
-        }
-
-        // Fallback 3: Finally use <UnimplementedView>.
-        auto flavor = std::make_shared<std::string const>(requestedComponentName);
-        auto componentName = ComponentName{flavor->c_str()};
-        auto componentHandle = reinterpret_cast<ComponentHandle>(componentName);
-        auto constructor = [RCTUnimplementedViewComponentView componentDescriptorProvider].constructor;
-
-        providerRegistry->add(ComponentDescriptorProvider{componentHandle, componentName, flavor, constructor});
-
-        componentViewFactory->_componentViewClasses[componentHandle] =
-            [componentViewFactory _componentViewClassDescriptorFromClass:[RCTUnimplementedViewComponentView class]];
-      });
+  static dispatch_once_t onceToken;
+  static RCTComponentViewFactory *componentViewFactory;
+
+  dispatch_once(&onceToken, ^{
+    componentViewFactory = [[RCTComponentViewFactory alloc] init];
+    [componentViewFactory registerComponentViewClass:[RCTRootComponentView class]];
+    [componentViewFactory registerComponentViewClass:[RCTViewComponentView class]];
+    [componentViewFactory registerComponentViewClass:[RCTParagraphComponentView class]];
+    [componentViewFactory registerComponentViewClass:[RCTTextInputComponentView class]];
+    [componentViewFactory registerComponentViewClass:[RCTModalHostViewComponentView class]];
+
+    Class<RCTComponentViewProtocol> imageClass = RCTComponentViewClassWithName("Image");
+    [componentViewFactory registerComponentViewClass:imageClass];
+
+    componentViewFactory->_providerRegistry.setComponentDescriptorProviderRequest(
+        [](ComponentName requestedComponentName) {
+          [componentViewFactory registerComponentIfPossible:requestedComponentName];
+        });
+  });
 
   return componentViewFactory;
 }
@@ -115,6 +103,51 @@ static Class<RCTComponentViewProtocol> RCTComponentViewClassWithName(const char
 #pragma clang diagnostic pop
 }
 
+- (BOOL)registerComponentIfPossible:(std::string const &)name
+{
+  if (_registeredComponentsNames.find(name) != _registeredComponentsNames.end()) {
+    // Component has already been registered.
+    return YES;
+  }
+
+  // Fallback 1: Call provider function for component view class.
+  Class<RCTComponentViewProtocol> klass = RCTComponentViewClassWithName(name.c_str());
+  if (klass) {
+    [self registerComponentViewClass:klass];
+    return YES;
+  }
+
+  // Fallback 2: Try to use Paper Interop.
+  if ([RCTLegacyViewManagerInteropComponentView isSupported:RCTNSStringFromString(name)]) {
+    auto flavor = std::make_shared<std::string const>(name);
+    auto componentName = ComponentName{flavor->c_str()};
+    auto componentHandle = reinterpret_cast<ComponentHandle>(componentName);
+    auto constructor = [RCTLegacyViewManagerInteropComponentView componentDescriptorProvider].constructor;
+
+    [self _addDescriptorToProviderRegistry:ComponentDescriptorProvider{
+                                               componentHandle, componentName, flavor, constructor}];
+
+    _componentViewClasses[componentHandle] =
+        [self _componentViewClassDescriptorFromClass:[RCTLegacyViewManagerInteropComponentView class]];
+    return YES;
+  }
+
+  // Fallback 3: use <UnimplementedView> if component doesn't exist.
+  auto flavor = std::make_shared<std::string const>(name);
+  auto componentName = ComponentName{flavor->c_str()};
+  auto componentHandle = reinterpret_cast<ComponentHandle>(componentName);
+  auto constructor = [RCTUnimplementedViewComponentView componentDescriptorProvider].constructor;
+
+  [self _addDescriptorToProviderRegistry:ComponentDescriptorProvider{
+                                             componentHandle, componentName, flavor, constructor}];
+
+  _componentViewClasses[componentHandle] =
+      [self _componentViewClassDescriptorFromClass:[RCTUnimplementedViewComponentView class]];
+
+  // No matching class exists for `name`.
+  return NO;
+}
+
 - (void)registerComponentViewClass:(Class<RCTComponentViewProtocol>)componentViewClass
 {
   RCTAssert(componentViewClass, @"RCTComponentViewFactory: Provided `componentViewClass` is `nil`.");
@@ -123,14 +156,20 @@ static Class<RCTComponentViewProtocol> RCTComponentViewClassWithName(const char
   auto componentDescriptorProvider = [componentViewClass componentDescriptorProvider];
   _componentViewClasses[componentDescriptorProvider.handle] =
       [self _componentViewClassDescriptorFromClass:componentViewClass];
-  _providerRegistry.add(componentDescriptorProvider);
+  [self _addDescriptorToProviderRegistry:componentDescriptorProvider];
 
   auto supplementalComponentDescriptorProviders = [componentViewClass supplementalComponentDescriptorProviders];
   for (const auto &provider : supplementalComponentDescriptorProviders) {
-    _providerRegistry.add(provider);
+    [self _addDescriptorToProviderRegistry:provider];
   }
 }
 
+- (void)_addDescriptorToProviderRegistry:(ComponentDescriptorProvider const &)provider
+{
+  _registeredComponentsNames.insert(provider.name);
+  _providerRegistry.add(provider);
+}
+
 - (RCTComponentViewDescriptor)createComponentViewWithComponentHandle:(facebook::react::ComponentHandle)componentHandle
 {
   RCTAssertMainQueue();

package/React/Fabric/Mounting/RCTComponentViewProtocol.h

@@ -116,6 +116,9 @@ typedef NS_OPTIONS(NSInteger, RNComponentViewUpdateMask) {
  */
 - (facebook::react::SharedProps)props;
 
+- (BOOL)isJSResponder;
+- (void)setIsJSResponder:(BOOL)isJSResponder;
+
 /*
  * This is broken. Do not use.
  */

package/React/Fabric/Mounting/RCTComponentViewRegistry.mm

@@ -29,7 +29,7 @@ const NSInteger RCTComponentViewRegistryRecyclePoolMaxSize = 1024;
 - (instancetype)init
 {
   if (self = [super init]) {
-    _componentViewFactory = [RCTComponentViewFactory standardComponentViewFactory];
+    _componentViewFactory = [RCTComponentViewFactory currentComponentViewFactory];
 
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(handleApplicationDidReceiveMemoryWarningNotification)

package/React/Fabric/Mounting/RCTMountingManager.h

@@ -13,6 +13,7 @@
 #import <react/renderer/core/ReactPrimitives.h>
 #import <react/renderer/mounting/MountingCoordinator.h>
 #import <react/renderer/mounting/ShadowView.h>
+#import <react/utils/ContextContainer.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -26,6 +27,22 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, weak) id<RCTMountingManagerDelegate> delegate;
 @property (nonatomic, strong) RCTComponentViewRegistry *componentViewRegistry;
 
+- (void)setContextContainer:(facebook::react::ContextContainer::Shared)contextContainer;
+
+/**
+ * Designates the view as a rendering viewport of a React Native surface.
+ * The provided view must not have any subviews, and the caller is not supposed to interact with the view hierarchy
+ * inside the provided view. The view hierarchy created by mounting infrastructure inside the provided view does not
+ * influence the intrinsic size of the view and cannot be measured using UIView/UIKit layout API.
+ * Must be called on the main thead.
+ */
+- (void)attachSurfaceToView:(UIView *)view surfaceId:(facebook::react::SurfaceId)surfaceId;
+
+/**
+ * Stops designating the view as a rendering viewport of a React Native surface.
+ */
+- (void)detachSurfaceFromView:(UIView *)view surfaceId:(facebook::react::SurfaceId)surfaceId;
+
 /**
  * Schedule a mounting transaction to be performed on the main thread.
  * Can be called from any thread.
@@ -38,9 +55,19 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)dispatchCommand:(ReactTag)reactTag commandName:(NSString *)commandName args:(NSArray *)args;
 
+/**
+ * Dispatch an accessibility event to be performed on the main thread.
+ * Can be called from any thread.
+ */
+- (void)sendAccessibilityEvent:(ReactTag)reactTag eventType:(NSString *)eventType;
+
+- (void)setIsJSResponder:(BOOL)isJSResponder
+    blockNativeResponder:(BOOL)blockNativeResponder
+           forShadowView:(facebook::react::ShadowView)shadowView;
+
 - (void)synchronouslyUpdateViewOnUIThread:(ReactTag)reactTag
                              changedProps:(NSDictionary *)props
-                      componentDescriptor:(const facebook::react::ComponentDescriptor &)componentDescriptor;
+                      componentDescriptor:(facebook::react::ComponentDescriptor const &)componentDescriptor;
 @end
 
 NS_ASSUME_NONNULL_END

package/React/Fabric/Mounting/RCTMountingManager.mm

@@ -13,6 +13,7 @@
 #import <React/RCTFollyConvert.h>
 #import <React/RCTLog.h>
 #import <React/RCTUtils.h>
+#import <react/renderer/components/root/RootShadowNode.h>
 #import <react/renderer/core/LayoutableShadowNode.h>
 #import <react/renderer/core/RawProps.h>
 #import <react/renderer/debug/SystraceSection.h>
@@ -67,6 +68,8 @@ static void RCTPerformMountInstructions(
 
         UIView<RCTComponentViewProtocol> *newChildComponentView = newChildViewDescriptor.view;
 
+        RCTAssert(newChildShadowView.props, @"`newChildShadowView.props` must not be null.");
+
         [newChildComponentView updateProps:newChildShadowView.props oldProps:oldChildShadowView.props];
         [newChildComponentView updateEventEmitter:newChildShadowView.eventEmitter];
         [newChildComponentView updateState:newChildShadowView.state oldState:oldChildShadowView.state];
@@ -95,6 +98,8 @@ static void RCTPerformMountInstructions(
 
         auto mask = RNComponentViewUpdateMask{};
 
+        RCTAssert(newChildShadowView.props, @"`newChildShadowView.props` must not be null.");
+
         if (oldChildShadowView.props != newChildShadowView.props) {
           [newChildComponentView updateProps:newChildShadowView.props oldProps:oldChildShadowView.props];
           mask |= RNComponentViewUpdateMaskProps;
@@ -131,6 +136,7 @@ static void RCTPerformMountInstructions(
   RCTMountingTransactionObserverCoordinator _observerCoordinator;
   BOOL _transactionInFlight;
   BOOL _followUpTransactionRequired;
+  ContextContainer::Shared _contextContainer;
 }
 
 - (instancetype)init
@@ -142,6 +148,34 @@ static void RCTPerformMountInstructions(
   return self;
 }
 
+- (void)setContextContainer:(ContextContainer::Shared)contextContainer
+{
+  _contextContainer = contextContainer;
+}
+
+- (void)attachSurfaceToView:(UIView *)view surfaceId:(SurfaceId)surfaceId
+{
+  RCTAssertMainQueue();
+
+  RCTAssert(view.subviews.count == 0, @"The view must not have any subviews.");
+
+  RCTComponentViewDescriptor rootViewDescriptor =
+      [_componentViewRegistry dequeueComponentViewWithComponentHandle:RootShadowNode::Handle() tag:surfaceId];
+  [view addSubview:rootViewDescriptor.view];
+}
+
+- (void)detachSurfaceFromView:(UIView *)view surfaceId:(SurfaceId)surfaceId
+{
+  RCTAssertMainQueue();
+  RCTComponentViewDescriptor rootViewDescriptor = [_componentViewRegistry componentViewDescriptorWithTag:surfaceId];
+
+  [rootViewDescriptor.view removeFromSuperview];
+
+  [_componentViewRegistry enqueueComponentViewWithComponentHandle:RootShadowNode::Handle()
+                                                              tag:surfaceId
+                                          componentViewDescriptor:rootViewDescriptor];
+}
+
 - (void)scheduleTransaction:(MountingCoordinator::Shared const &)mountingCoordinator
 {
   if (RCTIsMainQueue()) {
@@ -176,6 +210,22 @@ static void RCTPerformMountInstructions(
   });
 }
 
+- (void)sendAccessibilityEvent:(ReactTag)reactTag eventType:(NSString *)eventType
+{
+  if (RCTIsMainQueue()) {
+    // Already on the proper thread, so:
+    // * No need to do a thread jump;
+    // * No need to allocate a block.
+    [self synchronouslyDispatchAccessbilityEventOnUIThread:reactTag eventType:eventType];
+    return;
+  }
+
+  RCTExecuteOnMainQueue(^{
+    RCTAssertMainQueue();
+    [self synchronouslyDispatchAccessbilityEventOnUIThread:reactTag eventType:eventType];
+  });
+}
+
 - (void)initiateTransaction:(MountingCoordinator::Shared const &)mountingCoordinator
 {
   SystraceSection s("-[RCTMountingManager initiateTransaction:]");
@@ -215,6 +265,17 @@ static void RCTPerformMountInstructions(
       });
 }
 
+- (void)setIsJSResponder:(BOOL)isJSResponder
+    blockNativeResponder:(BOOL)blockNativeResponder
+           forShadowView:(facebook::react::ShadowView)shadowView
+{
+  RCTExecuteOnMainQueue(^{
+    UIView<RCTComponentViewProtocol> *componentView =
+        [self->_componentViewRegistry findComponentViewWithTag:shadowView.tag];
+    [componentView setIsJSResponder:isJSResponder];
+  });
+}
+
 - (void)synchronouslyUpdateViewOnUIThread:(ReactTag)reactTag
                              changedProps:(NSDictionary *)props
                       componentDescriptor:(const ComponentDescriptor &)componentDescriptor
@@ -222,7 +283,8 @@ static void RCTPerformMountInstructions(
   RCTAssertMainQueue();
   UIView<RCTComponentViewProtocol> *componentView = [_componentViewRegistry findComponentViewWithTag:reactTag];
   SharedProps oldProps = [componentView props];
-  SharedProps newProps = componentDescriptor.cloneProps(oldProps, RawProps(convertIdToFollyDynamic(props)));
+  SharedProps newProps = componentDescriptor.cloneProps(
+      PropsParserContext{-1, *_contextContainer.get()}, oldProps, RawProps(convertIdToFollyDynamic(props)));
 
   NSSet<NSString *> *propKeys = componentView.propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN ?: [NSSet new];
   propKeys = [propKeys setByAddingObjectsFromArray:props.allKeys];
@@ -235,11 +297,9 @@ static void RCTPerformMountInstructions(
   if (props[@"transform"] &&
       !CATransform3DEqualToTransform(
           RCTCATransform3DFromTransformMatrix(newViewProps.transform), componentView.layer.transform)) {
-    RCTLogWarn(@"transform was not applied during [RCTViewComponentView updateProps:oldProps:]");
     componentView.layer.transform = RCTCATransform3DFromTransformMatrix(newViewProps.transform);
   }
   if (props[@"opacity"] && componentView.layer.opacity != (float)newViewProps.opacity) {
-    RCTLogWarn(@"opacity was not applied during [RCTViewComponentView updateProps:oldProps:]");
     componentView.layer.opacity = newViewProps.opacity;
   }
 }
@@ -253,4 +313,12 @@ static void RCTPerformMountInstructions(
   [componentView handleCommand:commandName args:args];
 }
 
+- (void)synchronouslyDispatchAccessbilityEventOnUIThread:(ReactTag)reactTag eventType:(NSString *)eventType
+{
+  if ([@"focus" isEqualToString:eventType]) {
+    UIView<RCTComponentViewProtocol> *componentView = [_componentViewRegistry findComponentViewWithTag:reactTag];
+    UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, componentView);
+  }
+}
+
 @end

package/React/Fabric/Mounting/UIView+ComponentViewProtocol.h

@@ -39,9 +39,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (facebook::react::SharedProps)props;
 
+- (void)setIsJSResponder:(BOOL)isJSResponder;
+
 - (void)setPropKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN:(nullable NSSet<NSString *> *)props;
 - (nullable NSSet<NSString *> *)propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN;
 
+- (void)updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(UIView *)clipView;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm

@@ -32,10 +32,11 @@ using namespace facebook::react;
 {
   RCTAssert(
       childComponentView.superview == nil,
-      @"Attempt to mount already mounted component view. (parent: %@, child: %@, index: %@)",
+      @"Attempt to mount already mounted component view. (parent: %@, child: %@, index: %@, existing parent: %@)",
       self,
       childComponentView,
-      @(index));
+      @(index),
+      @([childComponentView.superview tag]));
   [self insertSubview:childComponentView atIndex:index];
 }
 
@@ -49,10 +50,12 @@ using namespace facebook::react;
       @(index));
   RCTAssert(
       (self.subviews.count > index) && [self.subviews objectAtIndex:index] == childComponentView,
-      @"Attempt to unmount a view which has a different index. (parent: %@, child: %@, index: %@)",
+      @"Attempt to unmount a view which has a different index. (parent: %@, child: %@, index: %@, actual index: %@, tag at index: %@)",
       self,
       childComponentView,
-      @(index));
+      @(index),
+      @([self.subviews indexOfObject:childComponentView]),
+      @([[self.subviews objectAtIndex:index] tag]));
 
   [childComponentView removeFromSuperview];
 }
@@ -132,6 +135,17 @@ using namespace facebook::react;
   return nullptr;
 }
 
+- (BOOL)isJSResponder
+{
+  // Default implementation always returns `NO`.
+  return NO;
+}
+
+- (void)setIsJSResponder:(BOOL)isJSResponder
+{
+  // Default implementation does nothing.
+}
+
 - (void)setPropKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN:(nullable NSSet<NSString *> *)propKeys
 {
   // Default implementation does nothing.
@@ -142,4 +156,16 @@ using namespace facebook::react;
   return nil;
 }
 
+- (void)updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(UIView *)clipView
+{
+  clipRect = [clipView convertRect:clipRect toView:self];
+
+  // Normal views don't support unmounting, so all
+  // this does is forward message to our subviews,
+  // in case any of those do support it
+  for (UIView *subview in self.subviews) {
+    [subview updateClippedSubviewsWithClipRect:clipRect relativeToView:self];
+  }
+}
+
 @end

package/React/Fabric/RCTConversions.h

@@ -141,27 +141,31 @@ inline UIAccessibilityTraits RCTUIAccessibilityTraitsFromAccessibilityTraits(
   if ((accessibilityTraits & AccessibilityTraits::Switch) != AccessibilityTraits::None) {
     result |= AccessibilityTraitSwitch;
   }
+  if ((accessibilityTraits & AccessibilityTraits::TabBar) != AccessibilityTraits::None) {
+    result |= UIAccessibilityTraitTabBar;
+  }
   return result;
 };
 
 inline CATransform3D RCTCATransform3DFromTransformMatrix(const facebook::react::Transform &transformMatrix)
 {
-  return {(CGFloat)transformMatrix.matrix[0],
-          (CGFloat)transformMatrix.matrix[1],
-          (CGFloat)transformMatrix.matrix[2],
-          (CGFloat)transformMatrix.matrix[3],
-          (CGFloat)transformMatrix.matrix[4],
-          (CGFloat)transformMatrix.matrix[5],
-          (CGFloat)transformMatrix.matrix[6],
-          (CGFloat)transformMatrix.matrix[7],
-          (CGFloat)transformMatrix.matrix[8],
-          (CGFloat)transformMatrix.matrix[9],
-          (CGFloat)transformMatrix.matrix[10],
-          (CGFloat)transformMatrix.matrix[11],
-          (CGFloat)transformMatrix.matrix[12],
-          (CGFloat)transformMatrix.matrix[13],
-          (CGFloat)transformMatrix.matrix[14],
-          (CGFloat)transformMatrix.matrix[15]};
+  return {
+      (CGFloat)transformMatrix.matrix[0],
+      (CGFloat)transformMatrix.matrix[1],
+      (CGFloat)transformMatrix.matrix[2],
+      (CGFloat)transformMatrix.matrix[3],
+      (CGFloat)transformMatrix.matrix[4],
+      (CGFloat)transformMatrix.matrix[5],
+      (CGFloat)transformMatrix.matrix[6],
+      (CGFloat)transformMatrix.matrix[7],
+      (CGFloat)transformMatrix.matrix[8],
+      (CGFloat)transformMatrix.matrix[9],
+      (CGFloat)transformMatrix.matrix[10],
+      (CGFloat)transformMatrix.matrix[11],
+      (CGFloat)transformMatrix.matrix[12],
+      (CGFloat)transformMatrix.matrix[13],
+      (CGFloat)transformMatrix.matrix[14],
+      (CGFloat)transformMatrix.matrix[15]};
 }
 
 inline facebook::react::Point RCTPointFromCGPoint(const CGPoint &point)

package/React/Fabric/RCTScheduler.h

@@ -14,6 +14,7 @@
 #import <react/renderer/core/LayoutContext.h>
 #import <react/renderer/mounting/MountingCoordinator.h>
 #import <react/renderer/scheduler/SchedulerToolbox.h>
+#import <react/renderer/scheduler/SurfaceHandler.h>
 #import <react/utils/ContextContainer.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -31,6 +32,13 @@ NS_ASSUME_NONNULL_BEGIN
                         commandName:(std::string const &)commandName
                                args:(folly::dynamic const)args;
 
+- (void)schedulerDidSendAccessibilityEvent:(facebook::react::ShadowView const &)shadowView
+                                 eventType:(std::string const &)eventType;
+
+- (void)schedulerDidSetIsJSResponder:(BOOL)isJSResponder
+                blockNativeResponder:(BOOL)blockNativeResponder
+                       forShadowView:(facebook::react::ShadowView const &)shadowView;
+
 @end
 
 /**
@@ -42,26 +50,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)initWithToolbox:(facebook::react::SchedulerToolbox)toolbox;
 
-- (void)startSurfaceWithSurfaceId:(facebook::react::SurfaceId)surfaceId
-                       moduleName:(NSString *)moduleName
-                     initialProps:(NSDictionary *)initialProps
-                layoutConstraints:(facebook::react::LayoutConstraints)layoutConstraints
-                    layoutContext:(facebook::react::LayoutContext)layoutContext;
-
-- (void)stopSurfaceWithSurfaceId:(facebook::react::SurfaceId)surfaceId;
-
-- (CGSize)measureSurfaceWithLayoutConstraints:(facebook::react::LayoutConstraints)layoutConstraints
-                                layoutContext:(facebook::react::LayoutContext)layoutContext
-                                    surfaceId:(facebook::react::SurfaceId)surfaceId;
-
-- (void)constraintSurfaceLayoutWithLayoutConstraints:(facebook::react::LayoutConstraints)layoutConstraints
-                                       layoutContext:(facebook::react::LayoutContext)layoutContext
-                                           surfaceId:(facebook::react::SurfaceId)surfaceId;
+- (void)registerSurface:(facebook::react::SurfaceHandler const &)surfaceHandler;
+- (void)unregisterSurface:(facebook::react::SurfaceHandler const &)surfaceHandler;
 
 - (facebook::react::ComponentDescriptor const *)findComponentDescriptorByHandle_DO_NOT_USE_THIS_IS_BROKEN:
     (facebook::react::ComponentHandle)handle;
 
-- (facebook::react::MountingCoordinator::Shared)mountingCoordinatorWithSurfaceId:(facebook::react::SurfaceId)surfaceId;
+- (void)setupAnimationDriver:(facebook::react::SurfaceHandler const &)surfaceHandler;
 
 - (void)onAnimationStarted;