remove all obj-c old arch macros

Author: latekvo

packages/react-native-gesture-handler/apple/Handlers/RNNativeViewHandler.mm

@@ -13,13 +13,8 @@
 #endif
 
 #import <React/RCTConvert.h>
-#import <React/UIView+React.h>
-
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTScrollViewComponentView.h>
-#else
-#import <React/RCTScrollView.h>
-#endif // RCT_NEW_ARCH_ENABLED
+#import <React/UIView+React.h>
 
 #pragma mark RNDummyGestureRecognizer
 

packages/react-native-gesture-handler/apple/RNGestureHandler.h

@@ -76,9 +76,7 @@
 @property (nonatomic) BOOL needsPointerData;
 @property (nonatomic) BOOL manualActivation;
 
-#if RCT_NEW_ARCH_ENABLED
 - (BOOL)isViewParagraphComponent:(nullable RNGHUIView *)view;
-#endif
 - (nonnull RNGHUIView *)chooseViewForInteraction:(nonnull UIGestureRecognizer *)recognizer;
 - (void)bindToView:(nonnull RNGHUIView *)view;
 - (void)unbindFromView;

packages/react-native-gesture-handler/apple/RNGestureHandler.mm

@@ -10,12 +10,8 @@
 
 #import <React/UIView+React.h>
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTParagraphComponentView.h>
 #import <React/RCTScrollViewComponentView.h>
-#else
-#import <React/RCTScrollView.h>
-#endif
 
 @interface UIGestureRecognizer (GestureHandler)
 @property (nonatomic, readonly) RNGestureHandler *gestureHandler;
@@ -216,25 +212,19 @@ - (UITouchType)getPointerType
   return (UITouchType)_pointerType;
 }
 
-#if RCT_NEW_ARCH_ENABLED
 - (BOOL)isViewParagraphComponent:(RNGHUIView *)view
 {
   return [view isKindOfClass:[RCTParagraphComponentView class]];
 }
-#endif
 
 - (void)bindToView:(RNGHUIView *)view
 {
   self.recognizer.delegate = self;
 
-#if RCT_NEW_ARCH_ENABLED
-  // Starting from react-native 0.79 `RCTParagraphTextView` overrides `hitTest` method to return `nil`. This results in
-  // native `UIGestureRecognizer` not responding to gestures. To fix this issue, we attach recognizer to its parent,
-  // i.e. `RCTParagraphComponentView`.
+  // Starting from react-native 0.79 `RCTParagraphTextView` overrides `hitTest` method to return `nil`.
+  // This results in native `UIGestureRecognizer` not responding to gestures.
+  // To fix this issue, we attach recognizer to its parent, i.e. `RCTParagraphComponentView`.
   RNGHUIView *recognizerView = [self isViewParagraphComponent:view.superview] ? view.superview : view;
-#else
-  RNGHUIView *recognizerView = view;
-#endif
 
 #if !TARGET_OS_OSX
   recognizerView.userInteractionEnabled = YES;
@@ -273,11 +263,7 @@ - (RNGestureHandlerEventExtraData *)eventExtraData:(UIGestureRecognizer *)recogn
  */
 - (RNGHUIView *)chooseViewForInteraction:(UIGestureRecognizer *)recognizer
 {
-#if RCT_NEW_ARCH_ENABLED
   return [self isViewParagraphComponent:recognizer.view] ? recognizer.view.subviews[0] : recognizer.view;
-#else
-  return recognizer.view;
-#endif
 }
 
 - (void)handleGesture:(UIGestureRecognizer *)recognizer
@@ -595,20 +581,10 @@ - (BOOL)isUIScrollViewPanGestureRecognizer:(NSGestureRecognizer *)gestureRecogni
 
 - (RNGHUIScrollView *)retrieveScrollView:(RNGHUIView *)view
 {
-#ifdef RCT_NEW_ARCH_ENABLED
   if ([view isKindOfClass:[RCTScrollViewComponentView class]]) {
     RNGHUIScrollView *scrollView = ((RCTScrollViewComponentView *)view).scrollView;
     return scrollView;
   }
-#else
-  if ([view isKindOfClass:[RCTScrollView class]]) {
-    // This part of the code is coupled with RN implementation of ScrollView native wrapper and
-    // we expect for RCTScrollView component to contain a subclass of UIScrollview as the only
-    // subview
-    RNGHUIScrollView *scrollView = [view.subviews objectAtIndex:0];
-    return scrollView;
-  }
-#endif
 
   return nil;
 }

packages/react-native-gesture-handler/apple/RNGestureHandlerButton.h

@@ -10,26 +10,24 @@
 
 #if TARGET_OS_OSX
 
-#if RCT_NEW_ARCH_ENABLED
-
 #include <react/renderer/core/LayoutMetrics.h>
 
 @protocol RCTComponentViewProtocol;
 
-#endif // RCT_NEW_ARCH_ENABLED
-
 @interface RNGestureHandlerButton : NSControl
+
 #else
 @interface RNGestureHandlerButton : UIControl
 #endif // TARGET_OS_OSX
+
 /**
  *  Insets used when hit testing inside this view.
  */
 @property (nonatomic, assign) UIEdgeInsets hitTestEdgeInsets;
 @property (nonatomic, assign) CGFloat borderRadius;
 @property (nonatomic) BOOL userEnabled;
 
-#if TARGET_OS_OSX && RCT_NEW_ARCH_ENABLED
+#if TARGET_OS_OSX
 - (void)mountChildComponentView:(RNGHUIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index;
 - (void)unmountChildComponentView:(RNGHUIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index;
 - (void)updateLayoutMetrics:(const facebook::react::LayoutMetrics &)layoutMetrics

packages/react-native-gesture-handler/apple/RNGestureHandlerButton.mm

@@ -14,13 +14,9 @@
 #import <React/RCTUIKit.h>
 #endif
 
-#if RCT_NEW_ARCH_ENABLED
-
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 
-#endif
-
 /**
  * Gesture Handler Button components overrides standard mechanism used by RN
  * to determine touch target, which normally would reurn the UIView that is placed
@@ -156,7 +152,9 @@ - (NSString *)accessibilityLabel
 }
 #endif
 
-#if TARGET_OS_OSX && RCT_NEW_ARCH_ENABLED
+// TODO: Combine all "if TARGET_OS_OSX" macros in this file
+
+#if TARGET_OS_OSX
 - (void)mountChildComponentView:(RNGHUIView *)childComponentView index:(NSInteger)index
 {
   if (childComponentView.superview != nil) {

packages/react-native-gesture-handler/apple/RNGestureHandlerButtonComponentView.h

@@ -1,5 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-
 #if !TARGET_OS_OSX
 #import <UIKit/UIKit.h>
 #else
@@ -18,5 +16,3 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // RCT_NEW_ARCH_ENABLED

packages/react-native-gesture-handler/apple/RNGestureHandlerButtonComponentView.mm

@@ -1,5 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-
 #import "RNGestureHandlerButtonComponentView.h"
 
 #import <React/RCTConversions.h>
@@ -215,5 +213,3 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
 {
   return RNGestureHandlerButtonComponentView.class;
 }
-
-#endif // RCT_NEW_ARCH_ENABLED

packages/react-native-gesture-handler/apple/RNGestureHandlerManager.h

@@ -11,15 +11,10 @@
 
 @interface RNGestureHandlerManager : NSObject
 
-#ifdef RCT_NEW_ARCH_ENABLED
 @property (nonatomic, strong, readonly, nonnull) RNGestureHandlerRegistry *registry;
 
 - (nonnull instancetype)initWithModuleRegistry:(nonnull RCTModuleRegistry *)moduleRegistry
                                   viewRegistry:(nonnull RCTViewRegistry *)viewRegistry;
-#else
-- (nonnull instancetype)initWithUIManager:(nonnull RCTUIManager *)uiManager
-                          eventDispatcher:(nonnull id<RCTEventDispatcherProtocol>)eventDispatcher;
-#endif // RCT_NEW_ARCH_ENABLED
 
 - (void)createGestureHandler:(nonnull NSString *)handlerName
                          tag:(nonnull NSNumber *)handlerTag

packages/react-native-gesture-handler/apple/RNGestureHandlerManager.mm

@@ -15,14 +15,10 @@
 #import "RNGestureHandlerState.h"
 #import "RNRootViewGestureRecognizer.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTFabricModalHostViewController.h>
 #import <React/RCTSurfaceTouchHandler.h>
 #import <React/RCTSurfaceView.h>
 #import <React/RCTViewComponentView.h>
-#else
-#import <React/RCTTouchHandler.h>
-#endif // RCT_NEW_ARCH_ENABLED
 
 #import "Handlers/RNFlingHandler.h"
 #import "Handlers/RNForceTouchHandler.h"
@@ -52,17 +48,12 @@ @implementation RNGestureHandlerManager {
   NSHashTable<RNRootViewGestureRecognizer *> *_rootViewGestureRecognizers;
   NSMutableDictionary<NSNumber *, NSNumber *> *_attachRetryCounter;
   NSMutableSet *_droppedHandlers;
-#ifdef RCT_NEW_ARCH_ENABLED
   RCTModuleRegistry *_moduleRegistry;
   RCTViewRegistry *_viewRegistry;
-#else
-  RCTUIManager *_uiManager;
-#endif // RCT_NEW_ARCH_ENABLED
   id<RCTEventDispatcherProtocol> _eventDispatcher;
   id _reanimatedModule;
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
 - (RNGestureHandlerRegistry *)registry
 {
   return _registry;
@@ -78,18 +69,6 @@ - (instancetype)initWithModuleRegistry:(RCTModuleRegistry *)moduleRegistry viewR
   }
   return self;
 }
-#else
-- (instancetype)initWithUIManager:(RCTUIManager *)uiManager
-                  eventDispatcher:(id<RCTEventDispatcherProtocol>)eventDispatcher
-{
-  if ((self = [super init])) {
-    _uiManager = uiManager;
-    _eventDispatcher = eventDispatcher;
-    [self initCommonProps];
-  }
-  return self;
-}
-#endif // RCT_NEW_ARCH_ENABLED
 
 - (void)initCommonProps
 {
@@ -144,13 +123,8 @@ - (void)attachGestureHandler:(nonnull NSNumber *)handlerTag
                toViewWithTag:(nonnull NSNumber *)viewTag
               withActionType:(RNGestureHandlerActionType)actionType
 {
-#ifdef RCT_NEW_ARCH_ENABLED
   RNGHUIView *view = [_viewRegistry viewForReactTag:viewTag];
-#else
-  RNGHUIView *view = [_uiManager viewForReactTag:viewTag];
-#endif // RCT_NEW_ARCH_ENABLED
 
-#ifdef RCT_NEW_ARCH_ENABLED
   if (view == nil || view.superview == nil) {
     // There are a few reasons we could end up here:
     // - the native view corresponding to the viewtag hasn't yet been created
@@ -197,7 +171,6 @@ - (void)attachGestureHandler:(nonnull NSNumber *)handlerTag
 
   view.reactTag = viewTag; // necessary for RNReanimated eventHash (e.g. "42onGestureHandlerEvent"), also will be
                            // returned as event.target
-#endif // RCT_NEW_ARCH_ENABLED
 
   [_registry attachHandlerWithTag:handlerTag toView:view withActionType:actionType];
 
@@ -245,7 +218,6 @@ - (id)handlerWithTag:(NSNumber *)handlerTag
 
 - (void)registerViewWithGestureRecognizerAttachedIfNeeded:(RNGHUIView *)childView
 {
-#ifdef RCT_NEW_ARCH_ENABLED
   RNGHUIView *touchHandlerView = childView;
 
 #if !TARGET_OS_OSX
@@ -262,31 +234,6 @@ - (void)registerViewWithGestureRecognizerAttachedIfNeeded:(RNGHUIView *)childVie
   }
 #endif // !TARGET_OS_OSX
 
-#else
-  RNGHUIView *touchHandlerView = nil;
-
-#if !TARGET_OS_OSX
-  if ([[childView reactViewController] isKindOfClass:[RCTModalHostViewController class]]) {
-    touchHandlerView = [childView reactViewController].view.subviews[0];
-  } else {
-    UIView *parent = childView;
-    while (parent != nil && ![parent respondsToSelector:@selector(touchHandler)]) {
-      parent = parent.superview;
-    }
-
-    touchHandlerView = [[parent performSelector:@selector(touchHandler)] view];
-  }
-#else
-  NSView *parent = childView;
-  while (parent != nil && ![parent respondsToSelector:@selector(touchHandler)]) {
-    parent = parent.superview;
-  }
-
-  touchHandlerView = [[parent performSelector:@selector(touchHandler)] view];
-#endif // !TARGET_OS_OSX
-
-#endif // RCT_NEW_ARCH_ENABLED
-
   if (touchHandlerView == nil) {
     return;
   }
@@ -337,11 +284,7 @@ - (void)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
 
   // this way we can extract the touch handler on both architectures relatively easily
   for (UIGestureRecognizer *recognizer in [viewWithTouchHandler gestureRecognizers]) {
-#ifdef RCT_NEW_ARCH_ENABLED
     if ([recognizer isKindOfClass:[RCTSurfaceTouchHandler class]]) {
-#else
-    if ([recognizer isKindOfClass:[RCTTouchHandler class]]) {
-#endif // RCT_NEW_ARCH_ENABLED
       touchHandler = recognizer;
       break;
     }
@@ -439,18 +382,11 @@ - (void)sendNativeTouchEventForGestureHandler:(RNGestureHandler *)handler withPo
 - (void)sendEventForReanimated:(RNGestureHandlerStateChange *)event
 {
   // Delivers the event to Reanimated.
-#ifdef RCT_NEW_ARCH_ENABLED
-  // Send event directly to Reanimated
   if (_reanimatedModule == nil) {
     _reanimatedModule = [_moduleRegistry moduleForName:"ReanimatedModule"];
   }
 
   [_reanimatedModule eventDispatcherWillDispatchEvent:event];
-#else
-  // In the old architecture, Reanimated overwrites RCTEventDispatcher
-  // with REAEventDispatcher and intercepts all direct events.
-  [self sendEventForDirectEvent:event];
-#endif // RCT_NEW_ARCH_ENABLED
 }
 
 - (void)sendEventForNativeAnimatedEvent:(RNGestureHandlerStateChange *)event
@@ -465,11 +401,7 @@ - (void)sendEventForNativeAnimatedEvent:(RNGestureHandlerStateChange *)event
 - (void)sendEventForJSFunctionOldAPI:(RNGestureHandlerStateChange *)event
 {
   // Delivers the event to JS (old RNGH API).
-#ifdef RCT_NEW_ARCH_ENABLED
   [self sendEventForDeviceEvent:event];
-#else
-  [self sendEventForDirectEvent:event];
-#endif // RCT_NEW_ARCH_ENABLED
 }
 
 - (void)sendEventForJSFunctionNewAPI:(RNGestureHandlerStateChange *)event

packages/react-native-gesture-handler/apple/RNGestureHandlerModule.h

@@ -1,23 +1,13 @@
-#import <React/RCTEventEmitter.h>
-#import <React/RCTUIManager.h>
-
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTEventDispatcherProtocol.h>
+#import <React/RCTEventEmitter.h>
 #import <React/RCTInitializing.h>
+#import <React/RCTUIManager.h>
 #import <rngesturehandler_codegen/rngesturehandler_codegen.h>
-#else
-#import <React/RCTBridgeModule.h>
-#endif
 
 #import "RNGestureHandlerManager.h"
 
-@interface RNGestureHandlerModule : RCTEventEmitter
-#ifdef RCT_NEW_ARCH_ENABLED
-                                    <NativeRNGestureHandlerModuleSpec, RCTJSDispatcherModule, RCTInitializing>
+@interface RNGestureHandlerModule : RCTEventEmitter<NativeRNGestureHandlerModuleSpec, RCTJSDispatcherModule, RCTInitializing>
 
 + (RNGestureHandlerManager *)handlerManagerForModuleId:(int)moduleId;
-#else
-                                    <RCTBridgeModule>
-#endif
 
 @end