react-native-navigation 8.5.0 → 8.6.0-snapshot.2091

package/ReactNativeNavigation.podspec

@@ -1,31 +1,11 @@
 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
-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
-  puts "ReactNativeNavigation: Objective-C AppDelegate detected - using standard configuration"
-end
-
 Pod::Spec.new do |s|
   s.name         = "ReactNativeNavigation"
+  s.prepare_command = 'node autolink/postlink/__helpers__/generate_version_header.js'
   s.version      = package['version']
   s.summary      = package['description']
 
@@ -40,13 +20,12 @@ 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        = 'ios/**/*.{h,m,mm,cpp}'
-    s.exclude_files       = "ios/ReactNativeNavigationTests/**/*.*", "lib/ios/OCMock/**/*.*"
-    # Only expose headers for Swift projects
-    if swift_project
-      s.public_header_files = [
-          'ios/RNNAppDelegate.h'
-        ]
-    end
+    s.exclude_files       = "ios/ReactNativeNavigationTests/**/*.*", "ios/OCMock/**/*.*"
+    
+    s.public_header_files = [
+      'ios/RNNAppDelegate.h',
+      'ios/ReactNativeVersionExtracted.h'
+    ]
   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'
@@ -58,11 +37,8 @@ Pod::Spec.new do |s|
       "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
-
+  xcconfig_settings["DEFINES_MODULE"] = "YES"
+  
   s.pod_target_xcconfig = xcconfig_settings
 
   if fabric_enabled

package/android/src/androidTest/java/com/reactnativenavigation/TestApplication.kt

@@ -3,10 +3,8 @@ package com.reactnativenavigation
 import com.facebook.react.ReactHost
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.shell.MainReactPackage
-import com.reactnativenavigation.NavigationPackage
 import com.reactnativenavigation.react.NavigationReactNativeHost
 
 class TestApplication : NavigationApplication() {

package/android/src/main/java/com/reactnativenavigation/views/touch/OverlayTouchDelegate.kt

@@ -4,7 +4,6 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.VisibleForTesting
-import com.facebook.react.views.debuggingoverlay.DebuggingOverlay
 import com.reactnativenavigation.options.params.Bool
 import com.reactnativenavigation.options.params.NullBool
 import com.reactnativenavigation.react.ReactView
@@ -57,7 +56,19 @@ open class OverlayTouchDelegate(
         return false
     }
 
-    private fun debuggingOverlay(childItem: View?): Boolean =
-        childItem is ViewGroup && childItem.getChildAt(0) is DebuggingOverlay
+    private fun debuggingOverlay(childItem: View?): Boolean {
+        if (childItem !is ViewGroup) return false
+        val firstChild = childItem.getChildAt(0) ?: return false
+        return isDebuggingOverlay(firstChild)
+    }
+
+    private fun isDebuggingOverlay(view: View): Boolean {
+        return try {
+            val className = view.javaClass.name
+            className == "com.facebook.react.views.debuggingoverlay.DebuggingOverlay"
+        } catch (e: Exception) {
+            false
+        }
+    }
 
 }

package/android/src/test/java/com/reactnativenavigation/TestApplication.kt

@@ -0,0 +1,29 @@
+package com.reactnativenavigation
+
+import android.app.Application
+import androidx.appcompat.R
+import com.facebook.react.ReactApplication
+import com.facebook.react.ReactHost
+import com.facebook.react.ReactNativeHost
+import com.facebook.react.ReactPackage
+import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
+
+class TestApplication : Application(), ReactApplication {
+    override val reactNativeHost: ReactNativeHost = object : ReactNativeHost(this) {
+        override fun getUseDeveloperSupport(): Boolean {
+            return true
+        }
+
+        override fun getPackages(): MutableList<ReactPackage> {
+            return mutableListOf()
+        }
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        setTheme(R.style.Theme_AppCompat)
+    }
+
+    override val reactHost: ReactHost
+        get() = getDefaultReactHost(this, reactNativeHost)
+}

package/autolink/fixtures/rn79/AppDelegate.swift.template

@@ -0,0 +1,48 @@
+import UIKit
+import React
+import React_RCTAppDelegate
+import ReactAppDependencyProvider
+
+@main
+class AppDelegate: UIResponder, UIApplicationDelegate {
+  var window: UIWindow?
+
+  var reactNativeDelegate: ReactNativeDelegate?
+  var reactNativeFactory: RCTReactNativeFactory?
+
+  func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
+  ) -> Bool {
+    let delegate = ReactNativeDelegate()
+    let factory = RCTReactNativeFactory(delegate: delegate)
+    delegate.dependencyProvider = RCTAppDependencyProvider()
+
+    reactNativeDelegate = delegate
+    reactNativeFactory = factory
+
+    window = UIWindow(frame: UIScreen.main.bounds)
+
+    factory.startReactNative(
+      withModuleName: "RN79",
+      in: window,
+      launchOptions: launchOptions
+    )
+
+    return true
+  }
+}
+
+class ReactNativeDelegate: RCTDefaultReactNativeFactoryDelegate {
+  override func sourceURL(for bridge: RCTBridge) -> URL? {
+    self.bundleURL()
+  }
+
+  override func bundleURL() -> URL? {
+#if DEBUG
+    RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
+#else
+    Bundle.main.url(forResource: "main", withExtension: "jsbundle")
+#endif
+  }
+}

package/autolink/fixtures/rn79/MainActivity.kt.template

@@ -0,0 +1,22 @@
+package com.app
+
+import com.facebook.react.ReactActivity
+import com.facebook.react.ReactActivityDelegate
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
+import com.facebook.react.defaults.DefaultReactActivityDelegate
+
+class MainActivity : ReactActivity() {
+
+  /**
+   * Returns the name of the main component registered from JavaScript. This is used to schedule
+   * rendering of the component.
+   */
+  override fun getMainComponentName(): String = "rn770"
+
+  /**
+   * Returns the instance of the [ReactActivityDelegate]. We use [DefaultReactActivityDelegate]
+   * which allows you to enable New Architecture with a single boolean flags [fabricEnabled]
+   */
+  override fun createReactActivityDelegate(): ReactActivityDelegate =
+      DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled)
+}

package/autolink/fixtures/rn79/MainApplication.kt.template

@@ -0,0 +1,44 @@
+package com.app
+
+import android.app.Application
+import com.facebook.react.PackageList
+import com.facebook.react.ReactApplication
+import com.facebook.react.ReactHost
+import com.facebook.react.ReactNativeHost
+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.facebook.react.soloader.OpenSourceMergedSoMapping
+import com.facebook.soloader.SoLoader
+
+class MainApplication : Application(), ReactApplication {
+
+  override val reactNativeHost: ReactNativeHost =
+      object : DefaultReactNativeHost(this) {
+        override fun getPackages(): List<ReactPackage> =
+            PackageList(this).packages.apply {
+              // Packages that cannot be autolinked yet can be added manually here, for example:
+              // add(MyReactNativePackage())
+            }
+
+        override fun getJSMainModuleName(): String = "index"
+
+        override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
+
+        override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+        override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
+      }
+
+  override val reactHost: ReactHost
+    get() = getDefaultReactHost(applicationContext, reactNativeHost)
+
+  override fun onCreate() {
+    super.onCreate()
+    SoLoader.init(this, OpenSourceMergedSoMapping)
+    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+      // If you opted-in for the New Architecture, we load the native entry point for this app.
+      load()
+    }
+  }
+}

package/autolink/fixtures/rn79/build.gradle.template

@@ -0,0 +1,21 @@
+buildscript {
+    ext {
+        buildToolsVersion = "35.0.0"
+        minSdkVersion = 24
+        compileSdkVersion = 35
+        targetSdkVersion = 35
+        ndkVersion = "27.1.12297006"
+        kotlinVersion = "2.0.21"
+    }
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath("com.android.tools.build:gradle")
+        classpath("com.facebook.react:react-native-gradle-plugin")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
+    }
+}
+
+apply plugin: "com.facebook.react.rootproject"

package/autolink/postlink/__helpers__/fixtures.js

@@ -21,4 +21,6 @@ module.exports = {
   prepareFixtureDuplicate,
   prepareFixtureDuplicate77: ({ userFixtureFileName, patchedFixtureFileName }) =>
     prepareFixtureDuplicate({ rnVersion: '77', userFixtureFileName, patchedFixtureFileName }),
+  prepareFixtureDuplicate79: ({ userFixtureFileName, patchedFixtureFileName }) =>
+    prepareFixtureDuplicate({ rnVersion: '79', userFixtureFileName, patchedFixtureFileName }),
 };

package/autolink/postlink/__helpers__/generate_version_header.js

@@ -0,0 +1,117 @@
+#!/usr/bin/env node
+const fs = require('fs');
+const path = require('path');
+const { getReactNativeVersion, findProjectPackageJson } = require('./reactNativeVersion');
+
+// Logging helper that writes to both stderr and a log file
+function log(message) {
+  console.error(message);
+
+  // Also write to a log file for debugging if stderr is suppressed
+  try {
+    const logFile = path.join(__dirname, '../../../ios/rnn_version_detection.log');
+    const timestamp = new Date().toISOString();
+    fs.appendFileSync(logFile, `[${timestamp}] ${message}\n`, 'utf8');
+  } catch (e) {
+    // Ignore log file errors
+  }
+}
+
+function generateVersionHeader() {
+  const startDir = __dirname;
+
+  log(`[RNN] === React Native Version Detection ===`);
+  log(`[RNN] Script location (__dirname): ${startDir}`);
+  log(`[RNN] Working directory (cwd): ${process.cwd()}`);
+
+  const packageJsonPath = findProjectPackageJson();
+
+  if (!packageJsonPath) {
+    log('[RNN] ❌ ERROR: Project package.json not found');
+    log('[RNN] This usually means the script could not locate your React Native project.');
+    return;
+  }
+
+  log(`[RNN] ✓ Found package.json: ${packageJsonPath}`);
+
+  // Determine actual source of version
+  const projectRoot = path.dirname(packageJsonPath);
+  const rnPackageJsonPath = path.join(projectRoot, 'node_modules', 'react-native', 'package.json');
+  let versionSource = packageJsonPath;
+  let versionSourceType = 'package.json';
+
+  if (fs.existsSync(rnPackageJsonPath)) {
+    versionSource = rnPackageJsonPath;
+    versionSourceType = 'node_modules/react-native/package.json (installed version)';
+  }
+
+  const versionInfo = getReactNativeVersion();
+
+  if (!versionInfo) {
+    log('[RNN] ❌ ERROR: react-native not found in package.json or node_modules');
+    log('[RNN] Make sure react-native is installed and listed as a dependency.');
+    return;
+  }
+
+  log(`[RNN] ✓ React Native ${versionInfo.raw} (source: ${versionSourceType})`);
+
+  const { major, minor, patch } = versionInfo;
+
+  // Generate header content
+  const headerContent = `//
+  // ReactNativeVersionExtracted.h
+  // React Native version: ${versionInfo.raw}
+  // Generated on: ${new Date().toISOString()}
+  // Source: ${versionSource}
+  //
+  
+  #ifndef ReactNativeVersionExtracted_h
+  #define ReactNativeVersionExtracted_h
+  
+  static const int REACT_NATIVE_VERSION_MAJOR = ${major};
+  static const int REACT_NATIVE_VERSION_MINOR = ${minor};
+  static const int REACT_NATIVE_VERSION_PATCH = ${patch};
+  
+  #define RN_VERSION_MAJOR ${major}
+  #define RN_VERSION_MINOR ${minor}
+  #define RN_VERSION_PATCH ${patch}
+  
+  #endif
+  `;
+
+  // Find RNN root by looking upwards from script location for RNN's package.json
+  let currentDir = __dirname;
+  let rnnPackageJson = null;
+
+  for (let i = 0; i < 5; i++) {
+    const potential = path.join(currentDir, 'package.json');
+    if (fs.existsSync(potential)) {
+      const pkg = JSON.parse(fs.readFileSync(potential, 'utf8'));
+      // This is RNN's package.json if name matches
+      if (pkg.name === 'react-native-navigation') {
+        rnnPackageJson = currentDir;
+        break;
+      }
+    }
+    currentDir = path.resolve(currentDir, '..');
+  }
+
+  if (!rnnPackageJson) {
+    log('[RNN] ❌ ERROR: Could not find react-native-navigation root directory');
+    return;
+  }
+
+  const outputFile = path.join(rnnPackageJson, 'ios/ReactNativeVersionExtracted.h');
+
+  fs.writeFileSync(outputFile, headerContent, 'utf8');
+  log(`[RNN] ✅ Generated header: ${outputFile}`);
+  log(`[RNN] ✅ Version constants: ${major}.${minor}.${patch}`);
+  log(`[RNN] === Completed Successfully ===`);
+}
+
+// Run if called directly
+if (require.main === module) {
+  generateVersionHeader();
+}
+
+module.exports = { generateVersionHeader };

package/autolink/postlink/__helpers__/reactNativeVersion.js

@@ -0,0 +1,160 @@
+// @ts-check
+var fs = require('fs');
+var nodePath = require('path');
+var { warnn } = require('../log');
+
+/**
+ * Find the project root package.json
+ * @returns {string|null} Path to project's package.json or null if not found
+ */
+function findProjectPackageJson() {
+    var searchDirs = [process.cwd(), __dirname];
+
+    // PRIORITY: Check if we're in RNN's own directory structure (workspace/CI scenario)
+    // In this case, __dirname would be like: /path/to/rnn/autolink/postlink/__helpers__
+    // And we want to find: /path/to/rnn/playground/package.json
+    var currentPath = __dirname;
+
+    // Walk up to find RNN root (containing this autolink folder)
+    for (var k = 0; k < 5; k++) {
+        // Check if this looks like RNN root by checking for playground subdirectory
+        var playgroundPath = nodePath.join(currentPath, 'playground');
+        var playgroundPackageJson = nodePath.join(playgroundPath, 'package.json');
+
+        if (fs.existsSync(playgroundPackageJson)) {
+            try {
+                var pkg = JSON.parse(fs.readFileSync(playgroundPackageJson, 'utf8'));
+                if ((pkg.dependencies && pkg.dependencies['react-native']) ||
+                    (pkg.devDependencies && pkg.devDependencies['react-native'])) {
+                    // Found it! Prioritize this path
+                    searchDirs.unshift(playgroundPath);
+                    break;
+                }
+            } catch (e) { }
+        }
+
+        var parent = nodePath.dirname(currentPath);
+        if (parent === currentPath) break;
+        currentPath = parent;
+    }
+
+    // If we're inside a package (like in node_modules or a workspace), 
+    // also try searching from common project locations
+    currentPath = __dirname;
+    for (var k = 0; k < 10; k++) {
+        var basename = nodePath.basename(currentPath);
+
+        // If we're in node_modules, the parent is likely the project root
+        if (basename === 'node_modules') {
+            searchDirs.push(nodePath.dirname(currentPath));
+            break;
+        }
+
+        // If we find a workspace scenario (e.g., we're in the workspace root but project is in subdirectory)
+        // Check for common subdirectories like 'playground', 'example', 'app'
+        var commonProjectDirs = ['playground', 'example', 'app', 'demo'];
+        for (var m = 0; m < commonProjectDirs.length; m++) {
+            var potentialProjectDir = nodePath.join(currentPath, commonProjectDirs[m]);
+            if (fs.existsSync(potentialProjectDir)) {
+                searchDirs.push(potentialProjectDir);
+            }
+        }
+
+        var parent = nodePath.dirname(currentPath);
+        if (parent === currentPath) break;
+        currentPath = parent;
+    }
+
+    for (var j = 0; j < searchDirs.length; j++) {
+        var searchDir = searchDirs[j];
+        for (var i = 0; i < 10; i++) {
+            var packagePath = nodePath.join(searchDir, 'package.json');
+            if (fs.existsSync(packagePath)) {
+                try {
+                    var pkg = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
+                    if ((pkg.dependencies && pkg.dependencies['react-native']) ||
+                        (pkg.devDependencies && pkg.devDependencies['react-native'])) {
+                        // Exclude react-native-navigation's own package.json to avoid false positives
+                        // in workspace/monorepo scenarios
+                        if (pkg.name !== 'react-native-navigation') {
+                            return packagePath;
+                        }
+                    }
+                } catch (e) { }
+            }
+            var parent = nodePath.dirname(searchDir);
+            if (parent === searchDir) break;
+            searchDir = parent;
+        }
+    }
+
+    return null;
+}
+
+/**
+ * Get React Native version as parsed object from node_modules
+ * @returns {Object|null} { major, minor, patch, raw } or null
+ */
+function getReactNativeVersion() {
+    var projectPackageJsonPath = findProjectPackageJson();
+    if (!projectPackageJsonPath) {
+        warnn('Could not find package.json to detect React Native version');
+        return null;
+    }
+
+    var projectRoot = nodePath.dirname(projectPackageJsonPath);
+
+    // First, try to read from node_modules/react-native/package.json (actual installed version)
+    var rnPackageJsonPath = nodePath.join(projectRoot, 'node_modules', 'react-native', 'package.json');
+
+    try {
+        if (fs.existsSync(rnPackageJsonPath)) {
+            var rnPackageJson = JSON.parse(fs.readFileSync(rnPackageJsonPath, 'utf8'));
+            var rnVersion = rnPackageJson.version;
+
+            if (rnVersion) {
+                var parts = rnVersion.split('.');
+                return {
+                    major: parseInt(parts[0]) || 0,
+                    minor: parseInt(parts[1]) || 0,
+                    patch: parseInt(parts[2]) || 0,
+                    raw: rnVersion
+                };
+            }
+        }
+    } catch (e) {
+        // Fall through to backup method
+    }
+
+    // Fallback: read from project's package.json dependencies
+    try {
+        var packageJson = JSON.parse(fs.readFileSync(projectPackageJsonPath, 'utf8'));
+        var rnVersion = packageJson.dependencies && packageJson.dependencies['react-native'] ||
+            packageJson.devDependencies && packageJson.devDependencies['react-native'];
+
+        if (!rnVersion) {
+            warnn('React Native not found in package.json or node_modules');
+            return null;
+        }
+
+        // Parse version (remove ^, ~, >=, etc.)
+        var cleanVersion = rnVersion.replace(/^[\^~>=<]+/, '');
+        var parts = cleanVersion.split('.');
+
+        return {
+            major: parseInt(parts[0]) || 0,
+            minor: parseInt(parts[1]) || 0,
+            patch: parseInt(parts[2]) || 0,
+            raw: rnVersion
+        };
+    } catch (e) {
+        warnn('Error detecting React Native version: ' + e.message);
+        return null;
+    }
+}
+
+module.exports = {
+    findProjectPackageJson: findProjectPackageJson,
+    getReactNativeVersion: getReactNativeVersion
+};
+

package/autolink/postlink/__snapshots__/{appDelegateLinker.test.js.snap → appDelegateLinker77.test.js.snap}

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`appDelegateLinker should work for RN 0.77 with Objective-C 1`] = `
+exports[`appDelegateLinker should work for RN 0.77 & 0.78 with Objective-C 1`] = `
 "#import "AppDelegate.h"
 #import <ReactNativeNavigation/ReactNativeNavigation.h>
 
@@ -36,7 +36,7 @@ exports[`appDelegateLinker should work for RN 0.77 with Objective-C 1`] = `
 @end "
 `;
 
-exports[`appDelegateLinker should work for RN 0.77 with Swift 1`] = `
+exports[`appDelegateLinker should work for RN 0.77 & 0.78 with Swift 1`] = `
 "import UIKit
 import React
 import ReactNativeNavigation

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

@@ -0,0 +1,39 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`appDelegateLinker should work with Swift bridgeless RN 0.79 1`] = `
+"import UIKit
+import React
+import ReactNativeNavigation
+import ReactAppDependencyProvider
+
+@main
+class AppDelegate: RNNAppDelegate {
+
+  override func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
+  ) -> Bool {
+    self.reactNativeDelegate = ReactNativeDelegate()
+    super.application(application, didFinishLaunchingWithOptions: launchOptions)
+
+    
+
+    return true
+  }
+}
+
+class ReactNativeDelegate: RCTDefaultReactNativeFactoryDelegate {
+  override func sourceURL(for bridge: RCTBridge) -> URL? {
+    self.bundleURL()
+  }
+
+  override func bundleURL() -> URL? {
+#if DEBUG
+    RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
+#else
+    Bundle.main.url(forResource: "main", withExtension: "jsbundle")
+#endif
+  }
+}"
+`;
+