remove RCTViewController

Author: hannojg

packages/react-native/Libraries/AppDelegate/RCTDefaultReactNativeFactoryDelegate.mm

@@ -7,7 +7,6 @@
 
 #import "RCTDefaultReactNativeFactoryDelegate.h"
 #import <ReactCommon/RCTHost.h>
-#import <React/RCTViewController.h>
 #import "RCTAppSetupUtils.h"
 #import "RCTDependencyProvider.h"
 #if USE_THIRD_PARTY_JSC != 1
@@ -29,7 +28,7 @@ - (NSURL *_Nullable)sourceURLForBridge:(nonnull RCTBridge *)bridge
 
 - (UIViewController *)createRootViewController
 {
-  return [RCTViewController new];
+  return [UIViewController new];
 }
 
 - (RCTBridge *)createBridgeWithDelegate:(id<RCTBridgeDelegate>)delegate launchOptions:(NSDictionary *)launchOptions

packages/react-native/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.h

@@ -5,13 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <React/RCTViewController.h>
+#import <UIKit/UIKit.h>
 
 @protocol RCTFabricModalHostViewControllerDelegate <NSObject>
 - (void)boundsDidChange:(CGRect)newBounds;
 @end
 
-@interface RCTFabricModalHostViewController : RCTViewController
+@interface RCTFabricModalHostViewController : UIViewController
 
 @property (nonatomic, weak) id<RCTFabricModalHostViewControllerDelegate> delegate;
 

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

@@ -5,12 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <React/RCTViewController.h>
+#import <UIKit/UIKit.h>
 
 #ifndef RCT_REMOVE_LEGACY_ARCH
 
 __attribute__((deprecated("This API will be removed along with the legacy architecture.")))
-@interface RCTModalHostViewController : RCTViewController
+@interface RCTModalHostViewController : UIViewController
 
 @property (nonatomic, copy) void (^boundsDidChangeBlock)(CGRect newBounds);
 

packages/react-native/React/Views/RCTViewController.m

@@ -5,11 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <React/RCTViewController.h>
+#import <UIKit/UIKit.h>
 
 @class RCTWrapperViewController;
 
-@interface RCTWrapperViewController : RCTViewController
+@interface RCTWrapperViewController : UIViewController
 
 - (instancetype)initWithContentView:(UIView *)contentView NS_DESIGNATED_INITIALIZER;
 

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

@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-@interface UIViewController (RCTViewControllerAppearance)
+@interface UIViewController (React)
 
 @property (nonatomic, assign, readonly) BOOL reactViewControllerIsVisible;
 
@@ -26,17 +26,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**
  * Call from `viewDidAppear:` / `viewDidDisappear:` in UIViewController subclasses
- * that cannot inherit from RCTViewController.
+ * that want to notify registered React Native appearance listeners.
  */
 - (void)reactNotifyViewControllerDidAppear:(BOOL)animated;
 - (void)reactNotifyViewControllerDidDisappear:(BOOL)animated;
 
 @end
 
-/**
- * UIViewController subclass that forwards appearance events to registered listeners.
- */
-@interface RCTViewController : UIViewController
-@end
-
 NS_ASSUME_NONNULL_END

…t-native/React/Views/RCTViewController.h …ive/React/Views/UIViewController+React.hpackages/react-native/React/Views/RCTViewController.h renamed to packages/react-native/React/Views/UIViewController+React.h packages/react-native/React/Views/RCTViewController.h renamed to packages/react-native/React/Views/UIViewController+React.h

@@ -0,0 +1,89 @@
+/*
+ * 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.
+ */
+
+#import "UIViewController+React.h"
+
+#import <objc/runtime.h>
+
+@interface RCTViewControllerAppearanceState : NSObject
+
+@property (nonatomic, strong, readonly) NSHashTable<id<RCTViewControllerAppearanceListener>> *listeners;
+@property (nonatomic, assign) BOOL visible;
+
+@end
+
+@implementation RCTViewControllerAppearanceState
+
+- (instancetype)init
+{
+  if (self = [super init]) {
+    _listeners = [NSHashTable weakObjectsHashTable];
+  }
+  return self;
+}
+
+@end
+
+@implementation UIViewController (React)
+
+- (RCTViewControllerAppearanceState *)reactViewControllerAppearanceState
+{
+  RCTViewControllerAppearanceState *state =
+      objc_getAssociatedObject(self, @selector(reactViewControllerAppearanceState));
+  if (!state) {
+    state = [RCTViewControllerAppearanceState new];
+    objc_setAssociatedObject(
+        self, @selector(reactViewControllerAppearanceState), state, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+  }
+  return state;
+}
+
+- (BOOL)reactViewControllerIsVisible
+{
+  return [self reactViewControllerAppearanceState].visible;
+}
+
+- (void)reactAddViewControllerAppearanceListener:(id<RCTViewControllerAppearanceListener>)listener
+{
+  RCTViewControllerAppearanceState *state = [self reactViewControllerAppearanceState];
+  [state.listeners addObject:listener];
+
+  if (state.visible && [listener respondsToSelector:@selector(reactViewControllerDidAppear:animated:)]) {
+    [listener reactViewControllerDidAppear:self animated:NO];
+  }
+}
+
+- (void)reactRemoveViewControllerAppearanceListener:(id<RCTViewControllerAppearanceListener>)listener
+{
+  [[self reactViewControllerAppearanceState].listeners removeObject:listener];
+}
+
+- (void)reactNotifyViewControllerDidAppear:(BOOL)animated
+{
+  RCTViewControllerAppearanceState *state = [self reactViewControllerAppearanceState];
+  state.visible = YES;
+
+  for (id<RCTViewControllerAppearanceListener> listener in state.listeners.allObjects) {
+    if ([listener respondsToSelector:@selector(reactViewControllerDidAppear:animated:)]) {
+      [listener reactViewControllerDidAppear:self animated:animated];
+    }
+  }
+}
+
+- (void)reactNotifyViewControllerDidDisappear:(BOOL)animated
+{
+  RCTViewControllerAppearanceState *state = [self reactViewControllerAppearanceState];
+  state.visible = NO;
+
+  for (id<RCTViewControllerAppearanceListener> listener in state.listeners.allObjects) {
+    if ([listener respondsToSelector:@selector(reactViewControllerDidDisappear:animated:)]) {
+      [listener reactViewControllerDidDisappear:self animated:animated];
+    }
+  }
+}
+
+@end

packages/react-native/React/Views/UIViewController+React.m

@@ -274,7 +274,6 @@
 #import <React/RCTVibration.h>
 #import <React/RCTVibrationPlugins.h>
 #import <React/RCTView.h>
-#import <React/RCTViewController.h>
 #import <React/RCTViewManager.h>
 #import <React/RCTViewUtils.h>
 #import <React/RCTVirtualTextShadowView.h>
@@ -284,6 +283,7 @@
 #import <React/RCTWrapperViewController.h>
 #import <React/UIView+Private.h>
 #import <React/UIView+React.h>
+#import <React/UIViewController+React.h>
 
 FOUNDATION_EXPORT double ReactVersionNumber;
 FOUNDATION_EXPORT const unsigned char ReactVersionString[];