react-native-navigation 7.34.0 → 7.35.0-snapshot.1115

package/autolink/postlink/applicationLinker.js

@@ -98,6 +98,11 @@ class ApplicationLinker {
   }
 
   _extendNavigationHost(applicationContent) {
+    if (this._hasAlreadyLinkedNavigationHost(applicationContent)) {
+      warnn('   NavigationReactNativeHost is already used, skipping.');
+      return applicationContent;
+    }
+
     if (this._doesExtendReactNativeHost(applicationContent)) {
       debugn('   Changing host implementation to NavigationReactNativeHost');
       return applicationContent
@@ -106,11 +111,14 @@ class ApplicationLinker {
           'import com.facebook.react.ReactNativeHost;',
           'import com.facebook.react.ReactNativeHost;\nimport com.reactnativenavigation.react.NavigationReactNativeHost;'
         );
-    }
-
-    if (this._hasAlreadyLinkedNavigationHost(applicationContent)) {
-      warnn('   NavigationReactNativeHost is already used, skipping.');
-      return applicationContent;
+    } else if (this._doesExtendDefaultReactNativeHost(applicationContent)) {
+      debugn('   Changing host implementation to NavigationReactNativeHost');
+      return applicationContent
+        .replace('new DefaultReactNativeHost(this)', 'new NavigationReactNativeHost(this)')
+        .replace(
+          'import com.facebook.react.defaults.DefaultReactNativeHost;',
+          'import com.facebook.react.defaults.DefaultReactNativeHost;\nimport com.reactnativenavigation.react.NavigationReactNativeHost;'
+        );
     }
 
     throw new Error('There was a problem extending NavigationReactNativeHost().');
@@ -120,6 +128,10 @@ class ApplicationLinker {
     return /\s*new ReactNativeHost\(this\)\s*/.test(applicationContent);
   }
 
+  _doesExtendDefaultReactNativeHost(applicationContent) {
+    return /\s*new DefaultReactNativeHost\(this\)\s*/.test(applicationContent);
+  }
+
   _hasAlreadyLinkedNavigationHost(applicationContent) {
     return /\s*new NavigationReactNativeHost\(this\)\s*/.test(applicationContent);
   }

package/autolink/postlink/gradleLinker.js

@@ -3,7 +3,7 @@ var path = require('./path');
 var fs = require('fs');
 var { warnn, errorn, logn, infon, debugn } = require('./log');
 var { insertString } = require('./stringUtils');
-var DEFAULT_KOTLIN_VERSION = '1.5.31';
+var DEFAULT_KOTLIN_VERSION = '1.7.10';
 // This should be the minSdkVersion required for RNN.
 var DEFAULT_MIN_SDK_VERSION = 21;
 
@@ -74,7 +74,7 @@ class GradleLinker {
       return contents;
     }
 
-    var match = /classpath\s*\(*["']com\.android\.tools\.build:gradle:/.exec(contents);
+    var match = /classpath\s*\(*["']com\.android\.tools\.build:gradle.*/.exec(contents);
     if (match) {
       debugn('   Adding Kotlin plugin');
       return insertString(

package/index.e2e.js

@@ -0,0 +1,4 @@
+import { LogBox } from 'react-native';
+LogBox.ignoreAllLogs();
+
+require('./playground/index');

package/jest-setup.js

@@ -29,6 +29,8 @@ beforeEach(() => {
   mockUILib();
 });
 
+setImmediate = (callback) => callback();
+
 const mockUILib = () => {
   const NativeModules = require('react-native').NativeModules;
   NativeModules.KeyboardTrackingViewTempManager = {};

package/lib/Mock/Layouts/ComponentNode.ts

@@ -13,7 +13,7 @@ export default class ComponentNode extends ParentNode {
 
   public componentDidMount() {
     this.componentDidMountOnce = true;
-    this.componentDidAppearPending && this.componentDidAppear();
+    this.componentDidAppearPending && setImmediate(() => this.componentDidAppear());
   }
 
   public componentDidAppear() {

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

@@ -3,11 +3,25 @@ package com.reactnativenavigation.utils
 import android.graphics.Rect
 import android.view.MotionEvent
 import android.view.View
+import android.view.ViewGroup
+import com.reactnativenavigation.BuildConfig
 
 val hitRect = Rect()
 
 fun MotionEvent.coordinatesInsideView(view: View?): Boolean {
-    view ?: return false
-    view.getHitRect(hitRect)
-    return hitRect.contains(x.toInt(), y.toInt())
+    if (BuildConfig.REACT_NATVE_VERSION_MINOR < 71) {
+        view ?: return false
+        view.getHitRect(hitRect)
+        return hitRect.contains(x.toInt(), y.toInt())
+    } else {
+        val viewGroup = (view as? ViewGroup)?.getChildAt(0) as? ViewGroup ?: return false
+
+        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/main/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleAndButtonsContainer.kt

@@ -153,6 +153,10 @@ class TitleAndButtonsContainer(context: Context) : ViewGroup(context) {
         val isCenter = titleComponentAlignment == Alignment.Center
         val titleHeightMeasureSpec = MeasureSpec.makeMeasureSpec(containerHeight, MeasureSpec.AT_MOST)
         val titleWidthMeasureSpec = makeTitleAtMostWidthMeasureSpec(containerWidth, rightBarWidth, leftBarWidth, isCenter)
+        if (titleComponent is TitleBarReactView) {
+            titleComponent.centered = isCenter
+        }
+
         titleComponent.measure(titleWidthMeasureSpec, titleHeightMeasureSpec)
     }
 

package/lib/android/app/src/reactNative51/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -9,6 +9,7 @@ import com.reactnativenavigation.react.ReactView
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+    var centered: Boolean = false
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         super.onMeasure(interceptReactRootViewMeasureSpec(widthMeasureSpec), heightMeasureSpec)
     }

package/lib/android/app/src/reactNative55/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -9,6 +9,7 @@ import com.reactnativenavigation.react.ReactView
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+    var centered: Boolean = false
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         super.onMeasure(interceptReactRootViewMeasureSpec(widthMeasureSpec), heightMeasureSpec)
     }

package/lib/android/app/src/reactNative56/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -9,6 +9,7 @@ import com.reactnativenavigation.react.ReactView
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+    var centered: Boolean = false
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         super.onMeasure(interceptReactRootViewMeasureSpec(widthMeasureSpec), heightMeasureSpec)
     }

package/lib/android/app/src/reactNative57/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -9,6 +9,7 @@ import com.reactnativenavigation.react.ReactView
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+    var centered: Boolean = false
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         super.onMeasure(interceptReactRootViewMeasureSpec(widthMeasureSpec), heightMeasureSpec)
     }

package/lib/android/app/src/reactNative57_5/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -9,6 +9,7 @@ import com.reactnativenavigation.react.ReactView
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+    var centered: Boolean = false
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         super.onMeasure(interceptReactRootViewMeasureSpec(widthMeasureSpec), heightMeasureSpec)
     }

package/lib/android/app/src/reactNative60/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -9,6 +9,7 @@ import com.reactnativenavigation.react.ReactView
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+    var centered: Boolean = false
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         super.onMeasure(interceptReactRootViewMeasureSpec(widthMeasureSpec), heightMeasureSpec)
     }

package/lib/android/app/src/reactNative62/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -9,6 +9,7 @@ import com.reactnativenavigation.react.ReactView
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+    var centered: Boolean = false
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         super.onMeasure(interceptReactRootViewMeasureSpec(widthMeasureSpec), heightMeasureSpec)
     }

package/lib/android/app/src/reactNative63/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -9,6 +9,7 @@ import com.reactnativenavigation.react.ReactView
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+    var centered: Boolean = false
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         super.onMeasure(interceptReactRootViewMeasureSpec(widthMeasureSpec), heightMeasureSpec)
     }

package/lib/android/app/src/reactNative68/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -9,6 +9,7 @@ import com.reactnativenavigation.react.ReactView
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+    var centered: Boolean = false
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         super.onMeasure(interceptReactRootViewMeasureSpec(widthMeasureSpec), heightMeasureSpec)
     }

package/lib/android/app/src/reactNative71/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -11,61 +11,17 @@ import com.reactnativenavigation.react.ReactView
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+    var centered: Boolean = false
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        super.onMeasure(interceptReactRootViewMeasureSpecWidth(widthMeasureSpec), interceptReactRootViewMeasureSpecHeight(heightMeasureSpec))
-    }
-
-    private fun interceptReactRootViewMeasureSpecWidth(widthMeasureSpec: Int): Int {
-        // This is a HACK.
-        // ReactRootView has problematic behavior when setting width to WRAP_CONTENT,
-        // It's causing infinite measurements, that hung up the UI.
-        // Intercepting largest child by width, and use its width as (parent) ReactRootView width fixed that.
-        // See for more details https://github.com/wix/react-native-navigation/pull/7096
-        val measuredWidth = this.getLastRootViewChildMaxWidth()
-
-        return MeasureSpec.makeMeasureSpec(measuredWidth, MeasureSpec.EXACTLY)
-    }
-
-    private fun interceptReactRootViewMeasureSpecHeight(heightMeasureSpec: Int): Int {
-        // This is a HACK.
-        // ReactRootView has problematic behavior when setting width to WRAP_CONTENT,
-        // It's causing infinite measurements, that hung up the UI.
-        // Intercepting largest child by height, and use its height as (parent) ReactRootView width fixed that.
-        // See for more details https://github.com/wix/react-native-navigation/pull/7096
-        val measuredHeight = this.getLastRootViewChild()?.height
-
-        return if (measuredHeight != null) MeasureSpec.makeMeasureSpec(measuredHeight, MeasureSpec.EXACTLY) else
-            heightMeasureSpec
-    }
-
-    private fun getLastRootViewChildMaxWidth(): Int {
-        if (rootViewGroup.children.count() == 0) {
-            return 0
-        }
-        var maxWidth = rootViewGroup.width
-        var next = rootViewGroup as Any
-        while(next is ViewGroup) { //try {
-            if (next.width > maxWidth) {
-                maxWidth = next.width
-            }
-            if (next.children.count() == 0) break
-            next.children.first().also { next = it }
-        }
-        return maxWidth
-    }
-
-    private fun getLastRootViewChild(): View? {
-        if (rootViewGroup.children.count() == 0) {
-            return null
-        }
-        var rootViewGroupLastChild: View = rootViewGroup
-        var next = rootViewGroup as Any
-        while(next is ViewGroup) { //try {
-            rootViewGroupLastChild = next
-            if (next.children.count() == 0) break
-            next.children.first().also { next = it }
+        var titleHeightMeasureSpec: Int
+        var titleWidthMeasureSpec: Int
+        if (centered) {
+            titleHeightMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)
+            titleWidthMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)
+        } else {
+            titleHeightMeasureSpec = heightMeasureSpec
+            titleWidthMeasureSpec = widthMeasureSpec
         }
-        @Suppress("UNREACHABLE_CODE")
-        return rootViewGroupLastChild
+        super.onMeasure(titleWidthMeasureSpec, titleHeightMeasureSpec)
     }
 }

package/lib/dist/Mock/Layouts/ComponentNode.js

@@ -12,7 +12,7 @@ class ComponentNode extends ParentNode_1.default {
     }
     componentDidMount() {
         this.componentDidMountOnce = true;
-        this.componentDidAppearPending && this.componentDidAppear();
+        this.componentDidAppearPending && setImmediate(() => this.componentDidAppear());
     }
     componentDidAppear() {
         if (this.componentDidMountOnce) {

package/lib/dist/src/interfaces/NavigationComponent.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
 import { NavigationButtonPressedEvent, SearchBarUpdatedEvent, SearchBarCancelPressedEvent, PreviewCompletedEvent, ScreenPoppedEvent, ComponentWillAppearEvent, ComponentDidAppearEvent, ComponentDidDisappearEvent } from './ComponentEvents';
-import { NavigationComponentProps } from './NavigationComponentProps';
+import { NavigationProps } from './NavigationComponentProps';
 import { Options } from './Options';
-export declare class NavigationComponent<Props = {}, State = {}, Snapshot = any> extends React.Component<Props & NavigationComponentProps, State, Snapshot> {
+export declare class NavigationComponent<Props = {}, State = {}, Snapshot = any> extends React.Component<Props & NavigationProps, State, Snapshot> {
     /**
      * Options used to apply a style configuration when the screen appears.
      *

package/lib/dist/src/interfaces/NavigationComponentProps.d.ts

@@ -1,4 +1,10 @@
+/**
+ * @deprecated This type replaced with NavigationProps
+ */
 export interface NavigationComponentProps {
     componentId: string;
+}
+export interface NavigationProps {
+    componentId: string;
     componentName: string;
 }

package/lib/dist/src/interfaces/NavigationFunctionComponent.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import { NavigationComponentProps } from './NavigationComponentProps';
+import { NavigationProps } from './NavigationComponentProps';
 import { Options } from './Options';
-export interface NavigationFunctionComponent<Props = {}> extends React.FunctionComponent<Props & NavigationComponentProps> {
-    options?: ((props: Props & NavigationComponentProps) => Options) | Options;
+export interface NavigationFunctionComponent<Props = {}> extends React.FunctionComponent<Props & NavigationProps> {
+    options?: ((props: Props & NavigationProps) => Options) | Options;
 }

package/lib/ios/RNNBridgeModule.m

@@ -245,7 +245,11 @@ RCT_EXPORT_METHOD(getNavigationConstants
 }
 
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(getNavigationConstantsSync) {
-    return [Constants getConstants];
+    __block NSDictionary *c;
+    RCTUnsafeExecuteOnMainQueueSync(^{
+      c = [Constants getConstants];
+    });
+    return c;
 }
 
 @end

package/lib/src/interfaces/NavigationComponent.ts

@@ -9,11 +9,11 @@ import {
   ComponentDidAppearEvent,
   ComponentDidDisappearEvent,
 } from './ComponentEvents';
-import { NavigationComponentProps } from './NavigationComponentProps';
+import { NavigationProps } from './NavigationComponentProps';
 import { Options } from './Options';
 
 export class NavigationComponent<Props = {}, State = {}, Snapshot = any> extends React.Component<
-  Props & NavigationComponentProps,
+  Props & NavigationProps,
   State,
   Snapshot
 > {

package/lib/src/interfaces/NavigationComponentProps.ts

@@ -1,4 +1,11 @@
+/**
+ * @deprecated This type replaced with NavigationProps
+ */
 export interface NavigationComponentProps {
   componentId: string;
+}
+
+export interface NavigationProps {
+  componentId: string;
   componentName: string;
 }

package/lib/src/interfaces/NavigationFunctionComponent.ts

@@ -1,8 +1,8 @@
 import React from 'react';
-import { NavigationComponentProps } from './NavigationComponentProps';
+import { NavigationProps } from './NavigationComponentProps';
 import { Options } from './Options';
 
 export interface NavigationFunctionComponent<Props = {}>
-  extends React.FunctionComponent<Props & NavigationComponentProps> {
-  options?: ((props: Props & NavigationComponentProps) => Options) | Options;
+  extends React.FunctionComponent<Props & NavigationProps> {
+  options?: ((props: Props & NavigationProps) => Options) | Options;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "7.34.0",
+  "version": "7.35.0-snapshot.1115",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,
@@ -88,10 +88,10 @@
     "@types/react-test-renderer": "16.9.2",
     "@typescript-eslint/eslint-plugin": "4.33.0",
     "@typescript-eslint/parser": "4.33.0",
-    "babel-jest": "^29.5.0",
+    "babel-jest": "^27.0.0",
     "clang-format": "^1.4.0",
     "detox": "20.9.0",
-    "detox-testing-library-rnn-adapter": "2.x.x",
+    "detox-testing-library-rnn-adapter": "^2.0.3",
     "eslint": "7.32.0",
     "eslint-config-prettier": "6.11.0",
     "eslint-plugin-prettier": "3.1.4",
@@ -130,8 +130,11 @@
     "*.{h,m,mm}": "node ./scripts/check-clang-format"
   },
   "detox": {
-    "test-runner": "jest",
-    "specs": "",
+    "testRunner": {
+      "args": {
+        "config": "e2e/jest.config.js"
+      }
+    },
     "artifacts": {
       "plugins": {
         "log": "all",
@@ -168,7 +171,8 @@
       "ios.debug": {
         "type": "ios.app",
         "binaryPath": "playground/ios/DerivedData/playground/Build/Products/Debug-iphonesimulator/playground.app",
-        "build": ":"
+        "start": "npm start -- --e2e",
+        "build": "RCT_NO_LAUNCH_PACKAGER=true xcodebuild build -scheme playground -workspace playground/ios/playground.xcworkspace -sdk iphonesimulator -configuration Debug -derivedDataPath playground/ios/DerivedData/playground ONLY_ACTIVE_ARCH=YES -quiet -UseModernBuildSystem=YES"
       },
       "ios.release": {
         "type": "ios.app",
@@ -178,6 +182,7 @@
       "android.debug": {
         "type": "android.apk",
         "binaryPath": "playground/android/app/build/outputs/apk/debug/app-debug.apk",
+        "start": "npm start -- --e2e",
         "build": "cd playground/android && ./gradlew app:assembleDebug app:assembleAndroidTest -DtestBuildType=debug"
       },
       "android.release": {