react-native-navigation 7.36.0-rc.1 → 7.36.0-rc.2

package/ReactNativeNavigation.podspec

@@ -2,8 +2,6 @@ require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
-fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
-
 Pod::Spec.new do |s|
   s.name         = "ReactNativeNavigation"
   s.version      = package['version']
@@ -19,34 +17,19 @@ Pod::Spec.new do |s|
   
   s.subspec 'Core' do |ss|
     s.source              = { :git => "https://github.com/wix/react-native-navigation.git", :tag => "#{s.version}" }
-    s.source_files    = 'lib/ios/**/*.{h,m,mm,cpp}'
+    s.source_files        = "lib/ios/**/*.{h,m,mm}"
     s.exclude_files       = "lib/ios/ReactNativeNavigationTests/**/*.*", "lib/ios/OCMock/**/*.*"
   end
+  
+  # s.subspec 'Fabric' do |ss|
+  #   ss.xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RCT-Folly\"",
+  #                   "OTHER_CFLAGS" => "$(inherited) -DRN_FABRIC_ENABLED -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1" }
+  #   ss.dependency 'React-RCTFabric'
+  #   ss.dependency 'React-Fabric'
+  #   ss.dependency 'RCT-Folly/Fabric'
+  # end
 
-  if fabric_enabled
-    folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-    fabric_flags = fabric_enabled ? '-DRCT_NEW_ARCH_ENABLED' : ''
-    s.pod_target_xcconfig = {
-    'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native"  "$(PODS_ROOT)/RCT-Folly" "$(PODS_ROOT)/Headers/Private/React-Core"',
-      "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
-    }
-    s.compiler_flags  = folly_compiler_flags + ' ' + '-DRCT_NEW_ARCH_ENABLED'
-    s.requires_arc    = true
-
-    s.dependency "React"
-    s.dependency "React-RCTFabric"
-    s.dependency "React-cxxreact"
-    s.dependency "React-Fabric"
-    s.dependency "React-Codegen"
-    s.dependency "RCT-Folly"
-    s.dependency "RCTRequired"
-    s.dependency "RCTTypeSafety"
-    s.dependency "ReactCommon/turbomodule/core"
-    s.dependency "React-runtimeexecutor"
-    s.dependency "React-rncore"
-  end
   s.dependency 'React-Core'
-  s.dependency 'React-CoreModules'
   s.dependency 'React-RCTImage'
   s.dependency 'React-RCTText'
   s.dependency 'HMSegmentedControl'

package/lib/android/app/src/main/java/com/reactnativenavigation/react/ReactView.java

@@ -8,7 +8,6 @@ import android.view.MotionEvent;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
 import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.uimanager.JSTouchDispatcher;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.EventDispatcher;
@@ -35,7 +34,6 @@ public class ReactView extends ReactRootView implements IReactView, Renderable {
         this.componentId = componentId;
         this.componentName = componentName;
         jsTouchDispatcher = new JSTouchDispatcher(this);
-        setIsFabric(ReactFeatureFlags.enableFabricRenderer);
     }
 
     @Override

package/lib/android/app/src/main/java/com/reactnativenavigation/utils/MotionEvent.kt

@@ -14,9 +14,14 @@ fun MotionEvent.coordinatesInsideView(view: View?): Boolean {
         view.getHitRect(hitRect)
         return hitRect.contains(x.toInt(), y.toInt())
     } else {
-        val viewGroup = (view as? ViewGroup)?.getChildAt(0) as? ViewGroup ?: view
+        val viewGroup = (view as? ViewGroup)?.getChildAt(0) as? ViewGroup ?: return false
 
-        viewGroup?.getHitRect(hitRect)
-        return hitRect.contains(x.toInt(), y.toInt())
+        return if (viewGroup.childCount > 0) {
+            val content = viewGroup.getChildAt(0)
+            content.getHitRect(hitRect)
+            hitRect.contains(x.toInt(), y.toInt())
+        } else {
+            false
+        }
     }
 }

package/lib/android/app/src/reactNative71/java/com/reactnativenavigation/react/NavigationReactNativeHost.java

@@ -6,14 +6,13 @@ import com.facebook.react.ReactInstanceManagerBuilder;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.common.LifecycleState;
-import com.facebook.react.defaults.DefaultReactNativeHost;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
 import com.reactnativenavigation.NavigationApplication;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-public abstract class NavigationReactNativeHost extends DefaultReactNativeHost implements BundleDownloadListenerProvider {
+public abstract class NavigationReactNativeHost extends ReactNativeHost implements BundleDownloadListenerProvider {
 
     private @Nullable NavigationDevBundleDownloadListener bundleListener;
     private final DevBundleDownloadListener bundleListenerMediator = new DevBundleDownloadListenerAdapter() {
@@ -34,6 +33,30 @@ public abstract class NavigationReactNativeHost extends DefaultReactNativeHost i
         bundleListener = listener;
     }
 
+    protected ReactInstanceManager createReactInstanceManager() {
+        ReactInstanceManagerBuilder builder = ReactInstanceManager.builder()
+                .setApplication(getApplication())
+                .setJSMainModulePath(getJSMainModuleName())
+                .setUseDeveloperSupport(getUseDeveloperSupport())
+                .setRedBoxHandler(getRedBoxHandler())
+                .setJavaScriptExecutorFactory(getJavaScriptExecutorFactory())
+                .setInitialLifecycleState(LifecycleState.BEFORE_CREATE)
+                .setJSIModulesPackage(getJSIModulePackage())
+                .setDevBundleDownloadListener(getDevBundleDownloadListener());
+
+        for (ReactPackage reactPackage : getPackages()) {
+            builder.addPackage(reactPackage);
+        }
+
+        String jsBundleFile = getJSBundleFile();
+        if (jsBundleFile != null) {
+            builder.setJSBundleFile(jsBundleFile);
+        } else {
+            builder.setBundleAssetName(Assertions.assertNotNull(getBundleAssetName()));
+        }
+        return builder.build();
+    }
+
     @SuppressWarnings("WeakerAccess")
     @NonNull
     protected DevBundleDownloadListener getDevBundleDownloadListener() {

package/lib/dist/src/adapters/NativeEventsReceiver.js

@@ -5,6 +5,8 @@ const react_native_1 = require("react-native");
 class NativeEventsReceiver {
     emitter;
     constructor() {
+        // NOTE: This try catch is workaround for integration tests
+        // TODO: mock NativeEventEmitter in integration tests rather done adding try catch in source code
         try {
             this.emitter = new react_native_1.NativeEventEmitter(react_native_1.NativeModules.RNNEventEmitter);
         }

package/lib/ios/RNNComponentRootView.m

@@ -2,11 +2,19 @@
 
 @implementation RNNComponentRootView
 
-- (instancetype)init {
-    self = [super init];
-    self.sizeFlexibility = RCTRootViewSizeFlexibilityWidthAndHeight;
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                    moduleName:(NSString *)moduleName
+             initialProperties:(NSDictionary *)initialProperties
+                  eventEmitter:(RNNEventEmitter *)eventEmitter
+           reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock {
+    self = [super initWithBridge:bridge
+                      moduleName:moduleName
+               initialProperties:initialProperties
+                    eventEmitter:eventEmitter
+             reactViewReadyBlock:reactViewReadyBlock];
     return self;
 }
+
 - (NSString *)componentType {
     return ComponentTypeScreen;
 }

package/lib/ios/RNNComponentViewController.m

@@ -94,8 +94,7 @@
                                                                }];
                                   }];
         self.reactView.backgroundColor = UIColor.clearColor;
-        self.reactView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
-        [self.reactView setFrame:self.view.frame];
+        self.reactView.translatesAutoresizingMaskIntoConstraints = NO;
         [self.view addSubview:self.reactView];
         [self updateReactViewConstraints];
     } else {
@@ -115,15 +114,24 @@
 - (void)viewDidLayoutSubviews {
     [super viewDidLayoutSubviews];
     [self.presenter applyOptionsOnViewDidLayoutSubviews:self.resolveOptions];
-    [self updateReactViewConstraints];
 }
 
 - (void)updateReactViewConstraints {
     if (self.isViewLoaded && self.reactView) {
-        CGFloat bottomInset = self.shouldDrawBehindBottomTabs ? 0 : self.view.safeAreaInsets.bottom;
-        CGFloat topInset = self.shouldDrawBehindTopBar ? 0 : self.view.safeAreaInsets.top;
-        [self.reactView setFrame:CGRectMake(0, topInset, self.view.frame.size.width,
-                                            self.view.frame.size.height - topInset - bottomInset)];
+        [NSLayoutConstraint deactivateConstraints:_reactViewConstraints];
+        _reactViewConstraints = @[
+            [self.reactView.topAnchor
+                constraintEqualToAnchor:self.shouldDrawBehindTopBar
+                                            ? self.view.topAnchor
+                                            : self.view.safeAreaLayoutGuide.topAnchor],
+            [self.reactView.bottomAnchor
+                constraintEqualToAnchor:self.shouldDrawBehindBottomTabs
+                                            ? self.view.bottomAnchor
+                                            : self.view.safeAreaLayoutGuide.bottomAnchor],
+            [self.reactView.leftAnchor constraintEqualToAnchor:self.view.leftAnchor],
+            [self.reactView.rightAnchor constraintEqualToAnchor:self.view.rightAnchor]
+        ];
+        [NSLayoutConstraint activateConstraints:_reactViewConstraints];
     }
 }
 

package/lib/ios/RNNOverlayWindow.m

@@ -9,8 +9,7 @@
 
     if ([hitTestResult isKindOfClass:[UIWindow class]] ||
         [hitTestResult.subviews.firstObject isKindOfClass:RNNReactView.class] ||
-        [hitTestResult isKindOfClass:[RCTModalHostView class]] ||
-        [hitTestResult isKindOfClass:NSClassFromString(@"RCTRootComponentView")]) {
+        [hitTestResult isKindOfClass:[RCTModalHostView class]]) {
         return nil;
     }
 

package/lib/ios/RNNReactButtonView.m

@@ -1,38 +1,6 @@
 #import "RNNReactButtonView.h"
 
 @implementation RNNReactButtonView
-#ifdef RCT_NEW_ARCH_ENABLED
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-                    moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties
-                  eventEmitter:(RNNEventEmitter *)eventEmitter
-               sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
-           reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock {
-    self = [super initWithBridge:bridge
-                      moduleName:moduleName
-               initialProperties:initialProperties
-                    eventEmitter:eventEmitter
-                 sizeMeasureMode:RCTSurfaceSizeMeasureModeWidthUndefined |
-                                 RCTSurfaceSizeMeasureModeHeightUndefined
-             reactViewReadyBlock:reactViewReadyBlock];
-
-    return self;
-}
-#else
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-                    moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties
-                  eventEmitter:(RNNEventEmitter *)eventEmitter
-           reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock {
-    self = [super initWithBridge:bridge
-                      moduleName:moduleName
-               initialProperties:initialProperties
-                    eventEmitter:eventEmitter
-             reactViewReadyBlock:reactViewReadyBlock];
-
-    return self;
-}
-#endif
 
 - (NSString *)componentType {
     return ComponentTypeButton;

package/lib/ios/RNNReactComponentRegistry.m

@@ -53,7 +53,7 @@
 
 - (NSMapTable *)componentsForParentId:(NSString *)parentComponentId {
     if (![_componentStore objectForKey:parentComponentId]) {
-        [_componentStore setObject:[NSMapTable strongToWeakObjectsMapTable]
+        [_componentStore setObject:[NSMapTable weakToStrongObjectsMapTable]
                             forKey:parentComponentId];
         ;
     }
@@ -64,6 +64,7 @@
 
 - (void)clearComponentsForParentId:(NSString *)parentComponentId {
     [_componentStore removeObjectForKey:parentComponentId];
+    ;
 }
 
 - (void)removeComponent:(NSString *)componentId {

package/lib/ios/RNNReactRootViewCreator.m

@@ -21,23 +21,12 @@
                           ofType:(RNNComponentType)componentType
              reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock {
     [self verifyRootViewId:rootViewId];
-#ifdef RCT_NEW_ARCH_ENABLED
     return [[[self resolveComponentViewClass:componentType] alloc]
              initWithBridge:_bridge
                  moduleName:name
           initialProperties:@{@"componentId" : rootViewId}
                eventEmitter:_eventEmitter
-            sizeMeasureMode:RCTSurfaceSizeMeasureModeWidthExact |
-                            RCTSurfaceSizeMeasureModeHeightExact
         reactViewReadyBlock:reactViewReadyBlock];
-#else
-    return [[[self resolveComponentViewClass:componentType] alloc]
-             initWithBridge:_bridge
-                 moduleName:name
-          initialProperties:@{@"componentId" : rootViewId}
-               eventEmitter:_eventEmitter
-        reactViewReadyBlock:reactViewReadyBlock];
-#endif
 }
 
 - (Class)resolveComponentViewClass:(RNNComponentType)componentType {

package/lib/ios/RNNReactView.h

@@ -1,4 +1,4 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef RN_FABRIC_ENABLED
 #import <React/RCTFabricSurfaceHostingProxyRootView.h>
 #else
 #import <React/RCTRootView.h>
@@ -30,27 +30,18 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
 
 @end
 
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef RN_FABRIC_ENABLED
 @interface RNNReactView
     : RCTFabricSurfaceHostingProxyRootView <RCTRootViewDelegate, RNNComponentProtocol>
 #else
 @interface RNNReactView : RCTRootView <RCTRootViewDelegate, RNNComponentProtocol>
 #endif
 
-#ifdef RCT_NEW_ARCH_ENABLED
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
              initialProperties:(NSDictionary *)initialProperties
                   eventEmitter:(RNNEventEmitter *)eventEmitter
-               sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
            reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock;
-#else
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-                    moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties
-                  eventEmitter:(RNNEventEmitter *)eventEmitter
-           reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock;
-#endif
 
 @property(nonatomic, copy) RNNReactViewReadyCompletionBlock reactViewReadyBlock;
 @property(nonatomic, strong) RNNEventEmitter *eventEmitter;

package/lib/ios/RNNReactView.m

@@ -4,26 +4,13 @@
 @implementation RNNReactView {
     BOOL _isAppeared;
 }
-#ifdef RCT_NEW_ARCH_ENABLED
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-                    moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties
-                  eventEmitter:(RNNEventEmitter *)eventEmitter
-               sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
-           reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock {
-    self = [super initWithBridge:bridge
-                      moduleName:moduleName
-               initialProperties:initialProperties
-                 sizeMeasureMode:sizeMeasureMode];
-#else
+
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
              initialProperties:(NSDictionary *)initialProperties
                   eventEmitter:(RNNEventEmitter *)eventEmitter
            reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock {
     self = [super initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
-#endif
-
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(contentDidAppear:)
                                                  name:RCTContentDidAppearNotification

package/lib/ios/RNNSideMenuChildVC.m

@@ -34,10 +34,17 @@
 
     [self addChildViewController:self.child];
     [self.child.view setFrame:self.view.bounds];
-    self.child.view.autoresizingMask =
-        UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     [self.view addSubview:self.child.view];
     [self.view bringSubviewToFront:self.child.view];
+    self.child.view.translatesAutoresizingMaskIntoConstraints = NO;
+
+    [NSLayoutConstraint activateConstraints:@[
+        [self.child.view.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor],
+        [self.child.view.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor],
+        [self.child.view.topAnchor constraintEqualToAnchor:self.view.topAnchor],
+        [self.child.view.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor]
+    ]];
+
     [self.child didMoveToParentViewController:self];
 }
 

package/lib/ios/RNNUIBarButtonItem.m

@@ -87,13 +87,31 @@
                      buttonOptions:(RNNButtonOptions *)buttonOptions
                            onPress:(RNNButtonPressCallback)onPress {
     self = [super initWithCustomView:reactView];
-    [reactView setFrame:CGRectMake(0, 0, 50, 50)];
     [self applyOptions:buttonOptions];
 
+    reactView.sizeFlexibility = RCTRootViewSizeFlexibilityWidthAndHeight;
     reactView.delegate = self;
-
     reactView.backgroundColor = [UIColor clearColor];
-
+    reactView.hidden = CGRectEqualToRect(reactView.frame, CGRectZero);
+
+    [NSLayoutConstraint deactivateConstraints:reactView.constraints];
+    self.widthConstraint =
+        [NSLayoutConstraint constraintWithItem:reactView
+                                     attribute:NSLayoutAttributeWidth
+                                     relatedBy:NSLayoutRelationEqual
+                                        toItem:nil
+                                     attribute:NSLayoutAttributeNotAnAttribute
+                                    multiplier:1.0
+                                      constant:reactView.intrinsicContentSize.width];
+    self.heightConstraint =
+        [NSLayoutConstraint constraintWithItem:reactView
+                                     attribute:NSLayoutAttributeHeight
+                                     relatedBy:NSLayoutRelationEqual
+                                        toItem:nil
+                                     attribute:NSLayoutAttributeNotAnAttribute
+                                    multiplier:1.0
+                                      constant:reactView.intrinsicContentSize.height];
+    [NSLayoutConstraint activateConstraints:@[ self.widthConstraint, self.heightConstraint ]];
     self.onPress = onPress;
     return self;
 }

package/lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -255,8 +255,6 @@
 		507ACB1223F44D1E00829911 /* RNNComponentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 507ACB1023F44D1E00829911 /* RNNComponentView.m */; };
 		507ACB1523F44E5200829911 /* RNNComponentRootView.h in Headers */ = {isa = PBXBuildFile; fileRef = 507ACB1323F44E5200829911 /* RNNComponentRootView.h */; };
 		507ACB1623F44E5200829911 /* RNNComponentRootView.m in Sources */ = {isa = PBXBuildFile; fileRef = 507ACB1423F44E5200829911 /* RNNComponentRootView.m */; };
-		507DBBDB2A31DE8400F1FC74 /* RNNAppDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 507DBBD92A31DE8400F1FC74 /* RNNAppDelegate.h */; };
-		507DBBDC2A31DE8400F1FC74 /* RNNAppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 507DBBDA2A31DE8400F1FC74 /* RNNAppDelegate.mm */; };
 		507E7D57201DDD3000444E6C /* RNNSharedElementAnimationOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 507E7D55201DDD3000444E6C /* RNNSharedElementAnimationOptions.h */; };
 		507E7D58201DDD3000444E6C /* RNNSharedElementAnimationOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 507E7D56201DDD3000444E6C /* RNNSharedElementAnimationOptions.m */; };
 		507F43C51FF4F17C00D9425B /* RNNTopTabsViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 507F43C31FF4F17C00D9425B /* RNNTopTabsViewController.h */; };
@@ -794,8 +792,6 @@
 		507ACB1023F44D1E00829911 /* RNNComponentView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNComponentView.m; sourceTree = "<group>"; };
 		507ACB1323F44E5200829911 /* RNNComponentRootView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNComponentRootView.h; sourceTree = "<group>"; };
 		507ACB1423F44E5200829911 /* RNNComponentRootView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNComponentRootView.m; sourceTree = "<group>"; };
-		507DBBD92A31DE8400F1FC74 /* RNNAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNAppDelegate.h; sourceTree = "<group>"; };
-		507DBBDA2A31DE8400F1FC74 /* RNNAppDelegate.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RNNAppDelegate.mm; sourceTree = "<group>"; };
 		507E7D55201DDD3000444E6C /* RNNSharedElementAnimationOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNSharedElementAnimationOptions.h; sourceTree = "<group>"; };
 		507E7D56201DDD3000444E6C /* RNNSharedElementAnimationOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNSharedElementAnimationOptions.m; sourceTree = "<group>"; };
 		507F43C31FF4F17C00D9425B /* RNNTopTabsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTopTabsViewController.h; sourceTree = "<group>"; };
@@ -1732,8 +1728,6 @@
 				50588B8723AA87E3001F6A5E /* Animations */,
 				7BA500731E2544B9001B9E1B /* ReactNativeNavigation.h */,
 				7BA500741E2544B9001B9E1B /* ReactNativeNavigation.m */,
-				507DBBD92A31DE8400F1FC74 /* RNNAppDelegate.h */,
-				507DBBDA2A31DE8400F1FC74 /* RNNAppDelegate.mm */,
 				5030B62023D5B4CA008F1642 /* Color+Interpolation.h */,
 				5030B61F23D5B4CA008F1642 /* Color+Interpolation.m */,
 				5030B62623D5B54D008F1642 /* LNInterpolable.h */,
@@ -2016,7 +2010,6 @@
 				50395593217485B000B0A663 /* Double.h in Headers */,
 				5050465421F8F4490035497A /* RNNReactComponentRegistry.h in Headers */,
 				506BF65C2600AE4200A22755 /* CenterTransition.h in Headers */,
-				507DBBDB2A31DE8400F1FC74 /* RNNAppDelegate.h in Headers */,
 				504AFE741FFFF0540076E904 /* RNNTopTabsOptions.h in Headers */,
 				50E38DD723A7A2BE009817F6 /* AnimatedViewFactory.h in Headers */,
 				E8E5182E1F83A48B000467AC /* RNNTransitionStateHolder.h in Headers */,
@@ -2361,7 +2354,6 @@
 				50BCB29223F2C7CD00D6C8E5 /* AnchorTransition.m in Sources */,
 				50344D2923A03DB4004B6A7C /* BottomTabsAttachMode.m in Sources */,
 				501224072173592D000F5F98 /* RNNBottomTabsPresenter.m in Sources */,
-				507DBBDC2A31DE8400F1FC74 /* RNNAppDelegate.mm in Sources */,
 				50A00C38200F84D6000F01A6 /* RNNOverlayOptions.m in Sources */,
 				50A5628B23DDAB5A0027C219 /* ScreenAnimationController.m in Sources */,
 				5039559C2174867000B0A663 /* DoubleParser.m in Sources */,

package/lib/src/adapters/NativeEventsReceiver.ts

@@ -1,4 +1,4 @@
-import { NativeModules, NativeEventEmitter, EmitterSubscription } from 'react-native';
+import { NativeModules, NativeEventEmitter, EventEmitter, EmitterSubscription } from 'react-native';
 import {
   ComponentWillAppearEvent,
   ComponentDidAppearEvent,
@@ -19,8 +19,10 @@ import {
 } from '../interfaces/Events';
 
 export class NativeEventsReceiver {
-  private emitter: NativeEventEmitter;
+  private emitter: EventEmitter;
   constructor() {
+    // NOTE: This try catch is workaround for integration tests
+    // TODO: mock NativeEventEmitter in integration tests rather done adding try catch in source code
     try {
       this.emitter = new NativeEventEmitter(NativeModules.RNNEventEmitter);
     } catch (e) {
@@ -30,7 +32,7 @@ export class NativeEventsReceiver {
             remove: () => undefined,
           };
         },
-      } as any) as NativeEventEmitter;
+      } as any) as EventEmitter;
     }
   }
 

package/metro.config.js

@@ -1,8 +1,4 @@
-const { getDefaultConfig, mergeConfig } = require('@react-native/metro-config');
-
-const config = {
+module.exports = {
   projectRoot: `${__dirname}`,
   watchFolders: [__dirname],
 };
-
-module.exports = mergeConfig(getDefaultConfig(__dirname), config);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "7.36.0-rc.1",
+  "version": "7.36.0-rc.2",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,
@@ -33,8 +33,7 @@
     "start": "node ./scripts/start",
     "pretest-js": "npm run build",
     "test-js": "node ./scripts/test-js",
-    "pod-install-new-arch": "cd playground/ios && BUNDLE_GEMFILE=../../Gemfile BUNDLE_PATH=~/gems/ bundle install && RCT_NEW_ARCH_ENABLED=1 bundle exec pod install",
-    "pod-install": "cd playground/ios && pod install",
+    "pod-install": "pod install --project-directory=playground/ios",
     "test-unit-ios": "node ./scripts/test-unit --ios",
     "test-snapshot-ios": "node ./scripts/test-snapshot --ios",
     "test-unit-android": "node ./scripts/test-unit --android",
@@ -72,8 +71,7 @@
     "@babel/plugin-proposal-export-default-from": "7.10.1",
     "@babel/plugin-proposal-export-namespace-from": "7.10.1",
     "@babel/runtime": "^7.20.0",
-    "@babel/types": "7.22.5",
-    "@react-native/metro-config": "^0.73.0",
+    "@babel/types": "7.15.6",
     "@react-native-community/blur": "^3.6.0",
     "@react-native-community/datetimepicker": "^3.4.7",
     "@react-native-community/eslint-config": "2.0.0",
@@ -102,15 +100,15 @@
     "identity-obj-proxy": "3.0.0",
     "jest": "^27.5.1",
     "lint-staged": "10.2.11",
-    "metro-react-native-babel-preset": "^0.76.2",
+    "metro-react-native-babel-preset": "^0.70.3",
     "pixelmatch": "^5.2.1",
     "pngjs": "^6.0.0",
     "prettier": "2.1.2",
     "react": "18.2.0",
-    "react-native": "0.72.3",
+    "react-native": "0.71.8",
     "react-native-fast-image": "^8.6.3",
     "react-native-gesture-handler": "^2.10.1",
-    "react-native-reanimated": "3.4.1",
+    "react-native-reanimated": "2.14.1",
     "react-native-ui-lib": "7.3.6",
     "react-redux": "5.x.x",
     "react-test-renderer": "18.2.0",

package/Gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
-ruby '>= 2.6.10'
-
-gem 'cocoapods', '>= 1.11.3'

package/lib/ios/RNNAppDelegate.h

@@ -1,20 +0,0 @@
-#import <Foundation/Foundation.h>
-#import <React/RCTBridge.h>
-#import <React/RCTBridgeDelegate.h>
-
-@class RCTSurfacePresenterBridgeAdapter;
-@class RCTTurboModuleManager;
-
-@interface RNNAppDelegate : UIResponder <UIApplicationDelegate, RCTBridgeDelegate>
-
-@property(nonatomic, strong) UIWindow *window;
-
-#if RCT_NEW_ARCH_ENABLED
-
-/// The TurboModule manager
-@property(nonatomic, strong) RCTTurboModuleManager *turboModuleManager;
-@property(nonatomic, strong) RCTSurfacePresenterBridgeAdapter *bridgeAdapter;
-
-#endif
-
-@end

package/lib/ios/RNNAppDelegate.mm

@@ -1,135 +0,0 @@
-#import "RNNAppDelegate.h"
-#import <ReactNativeNavigation/ReactNativeNavigation.h>
-
-#if RCT_NEW_ARCH_ENABLED
-#import "RCTAppSetupUtils.h"
-#import "RCTLegacyInteropComponents.h"
-#import <React/CoreModulesPlugins.h>
-#import <React/RCTCxxBridgeDelegate.h>
-#import <React/RCTFabricSurfaceHostingProxyRootView.h>
-#import <React/RCTLegacyViewManagerInteropComponentView.h>
-#import <React/RCTRuntimeExecutorFromBridge.h>
-#import <React/RCTSurfacePresenter.h>
-#import <React/RCTSurfacePresenterBridgeAdapter.h>
-#import <ReactCommon/RCTTurboModuleManager.h>
-#import <react/config/ReactNativeConfig.h>
-#import <react/renderer/runtimescheduler/RuntimeScheduler.h>
-#import <react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h>
-
-static NSString *const kRNConcurrentRoot = @"concurrentRoot";
-
-@interface RNNAppDelegate () <RCTTurboModuleManagerDelegate, RCTCxxBridgeDelegate> {
-    std::shared_ptr<const facebook::react::ReactNativeConfig> _reactNativeConfig;
-    facebook::react::ContextContainer::Shared _contextContainer;
-    std::shared_ptr<facebook::react::RuntimeScheduler> _runtimeScheduler;
-}
-@end
-
-#endif
-
-@implementation RNNAppDelegate
-
-#if RCT_NEW_ARCH_ENABLED
-- (instancetype)init {
-    if (self = [super init]) {
-        _contextContainer = std::make_shared<facebook::react::ContextContainer const>();
-        _reactNativeConfig = std::make_shared<facebook::react::EmptyReactNativeConfig const>();
-        _contextContainer->insert("ReactNativeConfig", _reactNativeConfig);
-    }
-    return self;
-}
-#endif
-
-- (BOOL)application:(UIApplication *)application
-    didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-#if RCT_NEW_ARCH_ENABLED
-    RCTEnableTurboModule(true);
-#endif
-    RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
-#if RCT_NEW_ARCH_ENABLED
-    self.bridgeAdapter =
-        [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:bridge
-                                                contextContainer:_contextContainer];
-    bridge.surfacePresenter = self.bridgeAdapter.surfacePresenter;
-
-    [self unstable_registerLegacyComponents];
-#endif
-
-    [ReactNativeNavigation bootstrapWithBridge:bridge];
-
-    return YES;
-}
-
-- (NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge {
-    return [ReactNativeNavigation extraModulesForBridge:bridge];
-}
-
-#if RCT_NEW_ARCH_ENABLED
-#pragma mark - RCTCxxBridgeDelegate
-- (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:
-    (RCTBridge *)bridge {
-    _runtimeScheduler = _runtimeScheduler =
-        std::make_shared<facebook::react::RuntimeScheduler>(RCTRuntimeExecutorFromBridge(bridge));
-    std::shared_ptr<facebook::react::CallInvoker> callInvoker =
-        std::make_shared<facebook::react::RuntimeSchedulerCallInvoker>(_runtimeScheduler);
-    self.turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge
-                                                                   delegate:self
-                                                                  jsInvoker:callInvoker];
-    _contextContainer->erase("RuntimeScheduler");
-    _contextContainer->insert("RuntimeScheduler", _runtimeScheduler);
-    return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager, _runtimeScheduler);
-}
-
-#pragma mark RCTTurboModuleManagerDelegate
-
-- (Class)getModuleClassFromName:(const char *)name {
-    return RCTCoreModulesClassProvider(name);
-}
-
-- (std::shared_ptr<facebook::react::TurboModule>)
-    getTurboModule:(const std::string &)name
-         jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker {
-    return nullptr;
-}
-
-- (std::shared_ptr<facebook::react::TurboModule>)
-    getTurboModule:(const std::string &)name
-        initParams:(const facebook::react::ObjCTurboModule::InitParams &)params {
-    return nullptr;
-}
-
-- (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass {
-    return RCTAppSetupDefaultModuleFromClass(moduleClass);
-}
-
-#pragma mark - New Arch Enabled settings
-
-- (BOOL)turboModuleEnabled {
-    return YES;
-}
-
-- (BOOL)fabricEnabled {
-    return YES;
-}
-
-#pragma mark - New Arch Utilities
-
-- (void)unstable_registerLegacyComponents {
-    for (NSString *legacyComponent in [RCTLegacyInteropComponents legacyInteropComponents]) {
-        [RCTLegacyViewManagerInteropComponentView supportLegacyViewManagerWithName:legacyComponent];
-    }
-}
-
-#endif
-
-- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge {
-    [NSException raise:@"RCTBridgeDelegate::sourceURLForBridge not implemented"
-                format:@"Subclasses must implement a valid sourceURLForBridge method"];
-    return nil;
-}
-
-- (BOOL)concurrentRootEnabled {
-    return true;
-}
-
-@end