Remove bridge mode from RCTComponentData (#59264)

Summary:

RCTComponentData always runs bridgeless, so delete the always-false isBridgeMode helper, merge the manager properties into one strong reference, and use the injected event dispatcher directly.

Changelog:
[Internal]

Reviewed By: shwanton

Differential Revision: D126575276

Author: christophpurrer

packages/react-native/React/Views/RCTComponentData.h

@@ -22,13 +22,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, readonly) Class managerClass;
 @property (nonatomic, copy, readonly) NSString *name;
-@property (nonatomic, weak, readonly) RCTViewManager *manager;
 /*
- * When running React Native with the bridge, view managers are retained by the
- * bridge. When running in bridgeless mode, allocate and retain view managers
- * in this class.
+ * The view manager for this component. In bridgeless mode, view managers
+ * are allocated and retained by this class.
  */
-@property (nonatomic, strong, readonly) RCTViewManager *bridgelessViewManager;
+@property (nonatomic, strong, readonly, nullable) RCTViewManager *manager;
 
 - (instancetype)initWithManagerClass:(Class)managerClass
                               bridge:(RCTBridge *)bridge

packages/react-native/React/Views/RCTComponentData.mm

@@ -44,7 +44,6 @@ @implementation RCTComponentData {
 }
 
 @synthesize manager = _manager;
-@synthesize bridgelessViewManager = _bridgelessViewManager;
 
 - (instancetype)initWithManagerClass:(Class)managerClass
                               bridge:(RCTBridge *)bridge
@@ -62,21 +61,12 @@ - (instancetype)initWithManagerClass:(Class)managerClass
   return self;
 }
 
-- (BOOL)isBridgeMode
-{
-  // If we are in bridge mode, the bridge is RCTBridge
-  // If we are bridgeless, the bridge is RCTBridgeProxy
-  return [_bridge isKindOfClass:[RCTBridge class]];
-}
-
 - (RCTViewManager *)manager
 {
-  if ((_manager == nullptr) && [self isBridgeMode]) {
+  if (_manager == nullptr) {
     _manager = [_bridge moduleForClass:_managerClass];
-  } else if ((_manager == nullptr) && (_bridgelessViewManager == nullptr)) {
-    _bridgelessViewManager = [_bridge moduleForClass:_managerClass];
   }
-  return (_manager != nullptr) ? _manager : _bridgelessViewManager;
+  return _manager;
 }
 
 RCT_NOT_IMPLEMENTED(-(instancetype)init)
@@ -272,8 +262,7 @@ - (RCTPropBlock)createPropBlock:(NSString *)name isShadowView:(BOOL)isShadowView
         type == NSSelectorFromString(@"RCTDirectEventBlock:") ||
         type == NSSelectorFromString(@"RCTCapturingEventBlock:")) {
       // Special case for event handlers
-      setterBlock = createEventSetter(
-          name, setter, self.eventInterceptor, [self isBridgeMode] ? _bridge.eventDispatcher : _eventDispatcher);
+      setterBlock = createEventSetter(name, setter, self.eventInterceptor, _eventDispatcher);
     } else {
       // Ordinary property handlers
       NSMethodSignature *typeSignature = [[RCTConvert class] methodSignatureForSelector:type];

scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api

@@ -805,8 +805,7 @@ interface RCTComponentData : public NSObject {
   public @property (assign, readonly) Class managerClass;
   public @property (copy) void(^eventInterceptor)(NSString* eventName, NSDictionary* event, NSNumber* reactTag);
   public @property (copy, readonly) NSString* name;
-  public @property (strong, readonly) RCTViewManager* bridgelessViewManager;
-  public @property (weak, readonly) RCTViewManager* manager;
+  public @property (strong, readonly) RCTViewManager* manager;
   public virtual NSDictionary<NSString*, id>* viewConfig();
   public virtual RCTShadowView* createShadowViewWithTag:(NSNumber* tag);
   public virtual UIView* createViewWithTag:rootTag:(_Nullable NSNumber* tag, _Nullable NSNumber* rootTag);

scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api

@@ -814,8 +814,7 @@ interface RCTComponentData : public NSObject {
   public @property (assign, readonly) Class managerClass;
   public @property (copy) void(^eventInterceptor)(NSString* eventName, NSDictionary* event, NSNumber* reactTag);
   public @property (copy, readonly) NSString* name;
-  public @property (strong, readonly) RCTViewManager* bridgelessViewManager;
-  public @property (weak, readonly) RCTViewManager* manager;
+  public @property (strong, readonly) RCTViewManager* manager;
   public virtual NSDictionary<NSString*, id>* viewConfig();
   public virtual RCTShadowView* createShadowViewWithTag:(NSNumber* tag);
   public virtual UIView* createViewWithTag:rootTag:(_Nullable NSNumber* tag, _Nullable NSNumber* rootTag);

scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api

@@ -805,8 +805,7 @@ interface RCTComponentData : public NSObject {
   public @property (assign, readonly) Class managerClass;
   public @property (copy) void(^eventInterceptor)(NSString* eventName, NSDictionary* event, NSNumber* reactTag);
   public @property (copy, readonly) NSString* name;
-  public @property (strong, readonly) RCTViewManager* bridgelessViewManager;
-  public @property (weak, readonly) RCTViewManager* manager;
+  public @property (strong, readonly) RCTViewManager* manager;
   public virtual NSDictionary<NSString*, id>* viewConfig();
   public virtual RCTShadowView* createShadowViewWithTag:(NSNumber* tag);
   public virtual UIView* createViewWithTag:rootTag:(_Nullable NSNumber* tag, _Nullable NSNumber* rootTag);

scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api

@@ -805,8 +805,7 @@ interface RCTComponentData : public NSObject {
   public @property (assign, readonly) Class managerClass;
   public @property (copy) void(^eventInterceptor)(NSString* eventName, NSDictionary* event, NSNumber* reactTag);
   public @property (copy, readonly) NSString* name;
-  public @property (strong, readonly) RCTViewManager* bridgelessViewManager;
-  public @property (weak, readonly) RCTViewManager* manager;
+  public @property (strong, readonly) RCTViewManager* manager;
   public virtual NSDictionary<NSString*, id>* viewConfig();
   public virtual RCTShadowView* createShadowViewWithTag:(NSNumber* tag);
   public virtual UIView* createViewWithTag:rootTag:(_Nullable NSNumber* tag, _Nullable NSNumber* rootTag);