react-native-navigation 8.1.0 → 8.1.1

package/ReactNativeNavigation.podspec

@@ -1,19 +1,26 @@
 require 'json'
+require 'find'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
 
 # Detect if this is a Swift project by looking for user AppDelegate.swift files
-dependency_paths = ['/node_modules/', '/Pods/', '/build/', '/Build/', '/DerivedData/']
-swift_project = Dir.glob('**/AppDelegate.swift')
-                   .reject { |file| dependency_paths.any? { |path| file.include?(path) } }
-                   .any?
+start_dir = File.expand_path('../../', __dir__)
+swift_delegate_path = nil
+Find.find(start_dir) do |path|
+  if path =~ /AppDelegate\.swift$/
+    swift_delegate_path = path
+    break
+  end
+end
+
+swift_project = swift_delegate_path && File.exist?(swift_delegate_path)
 
 # Debug output
 if swift_project
   puts "ReactNativeNavigation: Swift AppDelegate detected - enabling Swift-compatible configuration"
-else  
+else
   puts "ReactNativeNavigation: Objective-C AppDelegate detected - using standard configuration"
 end
 
@@ -43,19 +50,19 @@ Pod::Spec.new do |s|
   end
 
   folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DFOLLY_CFG_NO_COROUTINES=1'
-  
+
   # Base xcconfig settings
   xcconfig_settings = {
       'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native"  "$(PODS_ROOT)/RCT-Folly" "$(PODS_ROOT)/Headers/Private/React-Core" "$(PODS_ROOT)/Headers/Private/Yoga"',
       "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
       "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
   }
-  
+
   # Only add DEFINES_MODULE for Swift projects
   if swift_project
     xcconfig_settings["DEFINES_MODULE"] = "YES"
   end
-  
+
   s.pod_target_xcconfig = xcconfig_settings
 
   if fabric_enabled

package/autolink/postlink/__snapshots__/applicationLinker.test.js.snap

@@ -8,18 +8,18 @@ import com.facebook.react.PackageList
 import com.reactnativenavigation.NavigationApplication
 import com.facebook.react.ReactHost
 import com.facebook.react.ReactNativeHost
-import com.reactnativenavigation.react.NavigationReactNativeHost
 import com.facebook.react.ReactPackage
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
+import com.reactnativenavigation.react.NavigationReactNativeHost
 import com.facebook.react.soloader.OpenSourceMergedSoMapping
 import com.facebook.soloader.SoLoader
 
 class MainApplication : NavigationApplication() {
 
   override val reactNativeHost: ReactNativeHost =
-      object : DefaultNavigationReactNativeHost(this) {
+      object : NavigationReactNativeHost(this) {
         override fun getPackages(): List<ReactPackage> =
             PackageList(this).packages.apply {
               // Packages that cannot be autolinked yet can be added manually here, for example:

package/autolink/postlink/applicationLinker.js

@@ -16,8 +16,8 @@ class ApplicationLinker {
     if (!this.applicationPath) {
       errorn(
         'MainApplication.kt not found! Does the file exist in the correct folder?\n' +
-        '   Please check the manual installation docs:\n' +
-        '   https://wix.github.io/react-native-navigation/docs/installing#3-update-mainapplicationjava'
+          '   Please check the manual installation docs:\n' +
+          '   https://wix.github.io/react-native-navigation/docs/installing#3-update-mainapplicationjava'
       );
     }
 
@@ -78,10 +78,7 @@ class ApplicationLinker {
     if (this._doesExtendApplication(applicationContent)) {
       debugn('   Extending NavigationApplication');
       return applicationContent
-        .replace(
-          /:\s*Application\(\)\s*,\s*ReactApplication/gi,
-          ': NavigationApplication()'
-        )
+        .replace(/:\s*Application\(\)\s*,\s*ReactApplication/gi, ': NavigationApplication()')
         .replace(
           'import com.facebook.react.ReactApplication',
           'import com.reactnativenavigation.NavigationApplication'
@@ -114,21 +111,21 @@ class ApplicationLinker {
       return applicationContent;
     }
 
-    if (this._doesExtendReactNativeHost(applicationContent)) {
+    if (this._doesExtendDefaultReactNativeHost(applicationContent)) {
       debugn('   Changing host implementation to NavigationReactNativeHost');
       return applicationContent
-        .replace('ReactNativeHost(this)', 'NavigationReactNativeHost(this)')
+        .replace('DefaultReactNativeHost(this)', 'NavigationReactNativeHost(this)')
         .replace(
-          'import com.facebook.react.ReactNativeHost',
-          'import com.facebook.react.ReactNativeHost\nimport com.reactnativenavigation.react.NavigationReactNativeHost'
+          'import com.facebook.react.defaults.DefaultReactNativeHost',
+          'import com.facebook.react.defaults.DefaultReactNativeHost\nimport com.reactnativenavigation.react.NavigationReactNativeHost'
         );
-    } else if (this._doesExtendDefaultReactNativeHost(applicationContent)) {
+    } else if (this._doesExtendReactNativeHost(applicationContent)) {
       debugn('   Changing host implementation to NavigationReactNativeHost');
       return applicationContent
-        .replace('DefaultReactNativeHost(this)', 'NavigationReactNativeHost(this)')
+        .replace('ReactNativeHost(this)', 'NavigationReactNativeHost(this)')
         .replace(
-          'import com.facebook.react.defaults.DefaultReactNativeHost',
-          'import com.facebook.react.defaults.DefaultReactNativeHost\nimport com.reactnativenavigation.react.NavigationReactNativeHost'
+          'import com.facebook.react.ReactNativeHost',
+          'import com.facebook.react.ReactNativeHost\nimport com.reactnativenavigation.react.NavigationReactNativeHost'
         );
     }
 
@@ -160,7 +157,9 @@ class ApplicationLinker {
   }
 
   _isSOLoaderInitCalled(applicationContent) {
-    return /SoLoader\.init\(\s*this\s*,\s*OpenSourceMergedSoMapping\s*\);?/.test(applicationContent);
+    return /SoLoader\.init\(\s*this\s*,\s*OpenSourceMergedSoMapping\s*\);?/.test(
+      applicationContent
+    );
   }
 
   _removeNewArchEntryPointLoad(applicationContent) {
@@ -176,7 +175,9 @@ class ApplicationLinker {
   }
 
   _isNewArchEntryPointLoadCalled(applicationContent) {
-    return /if\s*\(\s*BuildConfig\.IS_NEW_ARCHITECTURE_ENABLED\s*\)\s*\{[\s\S]*?load\(\)\s*[\s}]*?\}/.test(applicationContent);
+    return /if\s*\(\s*BuildConfig\.IS_NEW_ARCHITECTURE_ENABLED\s*\)\s*\{[\s\S]*?load\(\)\s*[\s}]*?\}/.test(
+      applicationContent
+    );
   }
 }
 

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/navigator/Navigator.java

@@ -284,6 +284,9 @@ public class Navigator extends ParentController<ViewGroup> {
 
     public void onHostResume() {
         overlayManager.onHostResume();
+        if (root != null && root.getView() != null) {
+            root.getView().requestLayout();
+        }
         if (!modalStack.isEmpty()) {
             modalStack.onHostResume();
             if(modalStack.peekDisplayedOverCurrentContext()){

package/lib/ios/RNNAppDelegate.mm

@@ -1,6 +1,8 @@
 
 #import "RNNAppDelegate.h"
 #import <ReactNativeNavigation/ReactNativeNavigation.h>
+#import <react/featureflags/ReactNativeFeatureFlags.h>
+#import <react/featureflags/ReactNativeFeatureFlagsDefaults.h>
 
 
 #import "RCTAppSetupUtils.h"
@@ -31,6 +33,8 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
 - (BOOL)application:(UIApplication *)application
 	didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
 
+    [self _setUpFeatureFlags];
+    
 	// Copied from RCTAppDelegate, it private inside it
 	self.rootViewFactory = [self createRCTRootViewFactory];
 
@@ -94,4 +98,38 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
 	return true;
 }
 
+#pragma mark - Feature Flags
+
+class RCTAppDelegateBridgelessFeatureFlags : public facebook::react::ReactNativeFeatureFlagsDefaults {
+ public:
+  bool enableBridgelessArchitecture() override
+  {
+    return true;
+  }
+  bool enableFabricRenderer() override
+  {
+    return true;
+  }
+  bool useTurboModules() override
+  {
+    return true;
+  }
+  bool useNativeViewConfigsInBridgelessMode() override
+  {
+    return true;
+  }
+  bool enableFixForViewCommandRace() override
+  {
+    return true;
+  }
+};
+
+- (void)_setUpFeatureFlags
+{
+  if ([self bridgelessEnabled]) {
+      facebook::react::ReactNativeFeatureFlags::override(std::make_unique<RCTAppDelegateBridgelessFeatureFlags>());
+  }
+}
+
 @end
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "8.1.0",
+  "version": "8.1.1",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,