react-native-navigation 7.30.6 → 7.31.0-snapshot.856

package/lib/Mock/Components/LayoutComponent.tsx

@@ -18,4 +18,11 @@ export const LayoutComponent = class extends Component<ComponentProps> {
 
     return <View />;
   }
+  componentDidCatch(error: Error, errorInfo: React.ErrorInfo) {
+    console.error(
+      `Error while trying to render layout ${this.props.layoutNode.nodeId} of type ${this.props.layoutNode.type}`,
+      error,
+      errorInfo
+    );
+  }
 };

package/lib/Mock/mocks/NativeCommandsSender.tsx

@@ -4,6 +4,7 @@ import { LayoutNode } from '../../src/commands/LayoutTreeCrawler';
 import { events } from '../Stores/EventsStore';
 import _ from 'lodash';
 import ComponentNode from '../Layouts/ComponentNode';
+import { Constants } from '../../src/adapters/Constants';
 
 export class NativeCommandsSender {
   constructor() {}
@@ -115,4 +116,22 @@ export class NativeCommandsSender {
   }
 
   getLaunchArgs(_commandId: string) {}
+
+  getNavigationConstants(): Promise<Constants> {
+    return Promise.resolve({
+      topBarHeight: 0,
+      backButtonId: 'RNN.back',
+      bottomTabsHeight: 0,
+      statusBarHeight: 0,
+    });
+  }
+
+  getNavigationConstantsSync(): Constants {
+    return {
+      topBarHeight: 0,
+      backButtonId: 'RNN.back',
+      bottomTabsHeight: 0,
+      statusBarHeight: 0,
+    };
+  }
 }

package/lib/android/app/build.gradle

@@ -110,6 +110,10 @@ android {
             dimension "RNN.reactNativeVersion"
             buildConfigField("int", "REACT_NATVE_VERSION_MINOR", "68")
         }
+        reactNative71 {
+            dimension "RNN.reactNativeVersion"
+            buildConfigField("int", "REACT_NATVE_VERSION_MINOR", "71")
+        }
     }
 
     def flavor = resolveFlavor()
@@ -126,7 +130,9 @@ String resolveFlavor() {
     Integer reactNativeMinorComponent = reactNativeVersionComponents[1].toInteger()
     Integer reactNativePatchComponent = reactNativeVersionComponents[2].toInteger()
 
-    if (reactNativeMinorComponent >= 68) {
+    if (reactNativeMinorComponent >= 71) {
+        return "reactNative71"
+    } else if (reactNativeMinorComponent >= 68) {
         return "reactNative68"
     } else if (reactNativeMinorComponent >= 63) {
         return "reactNative63"
@@ -167,27 +173,6 @@ List reactNativeVersionComponents(rnPackageJsonFile) {
     return reactNativeVersion.tokenize('-')[0].tokenize('.')
 }
 
-task installBuildToolsAndRenameD8IfNeeded {
-    def buildToolsVersion = android.getBuildToolsVersion()
-    def sdkDir = android.sdkDirectory
-    def buildToolsDir = new File(sdkDir, "/build-tools/" + buildToolsVersion)
-
-    if (!buildToolsDir.exists()) {
-        def command = sdkDir.absolutePath + "/cmdline-tools/latest/bin/sdkmanager build-tools;" + buildToolsVersion
-        command.execute().waitForProcessOutput(System.out, System.err)
-    }
-
-    def d8File = new File(buildToolsDir, "d8")
-    def dxFile = new File(buildToolsDir, "dx")
-    d8File.renameTo(dxFile)
-
-    def buildToolsLibDir = new File(buildToolsDir, "lib")
-    d8File = new File(buildToolsLibDir, "d8.jar")
-    dxFile = new File(buildToolsLibDir, "dx.jar")
-    d8File.renameTo(dxFile)
-}
-build.dependsOn installBuildToolsAndRenameD8IfNeeded
-
 dependencies {
 
     implementation "androidx.core:core-ktx:1.6.0"

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

@@ -81,7 +81,11 @@ public class UiUtils {
     }
 
     public static void runOnMainThread(Runnable runnable) {
-        new Handler(Looper.getMainLooper()).post(runnable);
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            new Handler(Looper.getMainLooper()).postAtFrontOfQueue(runnable);
+        } else {
+            new Handler(Looper.getMainLooper()).post(runnable);
+        }
     }
 
     public static float getWindowHeight(Context context) {

package/lib/android/app/src/reactNative71/java/com/reactnativenavigation/options/parsers/ColorParser.kt

@@ -0,0 +1,38 @@
+package com.reactnativenavigation.options.parsers
+
+import android.content.Context
+import com.facebook.react.bridge.ColorPropConverter
+import com.reactnativenavigation.options.params.Colour
+import com.reactnativenavigation.options.params.DontApplyColour
+import com.reactnativenavigation.options.params.NullColor
+import com.reactnativenavigation.options.params.ReactPlatformColor
+import org.json.JSONObject
+
+object ColorParser {
+    private const val KEY_RESOURCE_PATHS = "resource_paths"
+    private const val VAL_NO_COLOR = "NoColor"
+
+    @JvmStatic
+    fun parse(context: Context?, json: JSONObject, colorName: String?): Colour {
+        if (json.has(KEY_RESOURCE_PATHS)) {
+            return ReactPlatformColor(JSONParser.convert(json))
+        }
+        return when (val color = json.opt(colorName)) {
+            null, VAL_NO_COLOR -> {
+                DontApplyColour()
+            }
+            is Int -> {
+                Colour(json.optInt(colorName))
+            }
+            is JSONObject -> {
+                ColorPropConverter.getColor(color, context)?.let {
+                    Colour(it)
+                } ?: NullColor()
+            }
+            else -> {
+                NullColor()
+            }
+        }
+
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.reactnativenavigation.react;
+
+import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
+
+import javax.annotation.Nullable;
+
+public class DevBundleDownloadListenerAdapter implements DevBundleDownloadListener, NavigationDevBundleDownloadListener {
+    @Override
+    public void onSuccess() {
+        onSuccess();
+    }
+
+    @Override
+    public void onProgress(@Nullable String status, @Nullable Integer done, @Nullable Integer total) {
+
+    }
+
+    @Override
+    public void onFailure(Exception cause) {
+
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.reactnativenavigation.react;
+
+import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
+
+import javax.annotation.Nullable;
+
+public class JsDevReloadHandlerFacade implements DevBundleDownloadListener, NavigationDevBundleDownloadListener {
+    @Override
+    public void onSuccess() {
+        onSuccess();
+    }
+
+    @Override
+    public void onProgress(@Nullable String status, @Nullable Integer done, @Nullable Integer total) {
+
+    }
+
+    @Override
+    public void onFailure(Exception cause) {
+
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.reactnativenavigation.react;
+
+import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.ReactInstanceManager;
+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.devsupport.interfaces.DevBundleDownloadListener;
+import com.reactnativenavigation.NavigationApplication;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public abstract class NavigationReactNativeHost extends ReactNativeHost implements BundleDownloadListenerProvider {
+
+    private @Nullable NavigationDevBundleDownloadListener bundleListener;
+    private final DevBundleDownloadListener bundleListenerMediator = new DevBundleDownloadListenerAdapter() {
+        @Override
+        public void onSuccess() {
+            if (bundleListener != null) {
+                bundleListener.onSuccess();
+            }
+        }
+    };
+
+    public NavigationReactNativeHost(NavigationApplication application) {
+        super(application);
+    }
+
+    @Override
+    public void setBundleLoaderListener(NavigationDevBundleDownloadListener listener) {
+        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() {
+        return bundleListenerMediator;
+    }
+}

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

@@ -0,0 +1,72 @@
+package com.reactnativenavigation.react;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.res.Configuration;
+
+import com.facebook.react.ReactNativeHost;
+import com.reactnativenavigation.NavigationActivity;
+
+import androidx.annotation.NonNull;
+
+public class ReactGateway {
+
+	private final ReactNativeHost host;
+	private final NavigationReactInitializer initializer;
+	private final JsDevReloadHandler jsDevReloadHandler;
+
+    public ReactGateway(ReactNativeHost host) {
+        this.host = host;
+        initializer = new NavigationReactInitializer(host.getReactInstanceManager(), host.getUseDeveloperSupport());
+        jsDevReloadHandler = new JsDevReloadHandler(host.getReactInstanceManager().getDevSupportManager());
+        if (host instanceof BundleDownloadListenerProvider) {
+            ((BundleDownloadListenerProvider) host).setBundleLoaderListener(jsDevReloadHandler);
+        }
+    }
+
+	public void onActivityCreated(NavigationActivity activity) {
+		initializer.onActivityCreated();
+        jsDevReloadHandler.setReloadListener(activity);
+	}
+
+	public void onActivityResumed(NavigationActivity activity) {
+		initializer.onActivityResumed(activity);
+		jsDevReloadHandler.onActivityResumed(activity);
+	}
+
+    public boolean onNewIntent(Intent intent) {
+        if (host.hasInstance()) {
+            host.getReactInstanceManager().onNewIntent(intent);
+            return true;
+        }
+        return false;
+    }
+
+    public void onConfigurationChanged(NavigationActivity activity, @NonNull Configuration newConfig) {
+        if (host.hasInstance()) {
+            host.getReactInstanceManager().onConfigurationChanged(activity, newConfig);
+        }
+    }
+
+	public void onActivityPaused(NavigationActivity activity) {
+		initializer.onActivityPaused(activity);
+		jsDevReloadHandler.onActivityPaused(activity);
+	}
+
+	public void onActivityDestroyed(NavigationActivity activity) {
+        jsDevReloadHandler.removeReloadListener(activity);
+		initializer.onActivityDestroyed(activity);
+	}
+
+	public boolean onKeyUp(Activity activity, int keyCode) {
+		return jsDevReloadHandler.onKeyUp(activity, keyCode);
+	}
+
+    public void onBackPressed() {
+	    host.getReactInstanceManager().onBackPressed();
+    }
+
+    public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
+        host.getReactInstanceManager().onActivityResult(activity, requestCode, resultCode, data);
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.reactnativenavigation.react;
+
+import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
+
+import javax.annotation.Nullable;
+
+public abstract class ReloadHandlerFacade implements DevBundleDownloadListener {
+    @Override
+    public void onSuccess() {
+
+    }
+
+    @Override
+    public void onProgress(@Nullable String status, @Nullable Integer done, @Nullable Integer total) {
+
+    }
+
+    @Override
+    public void onFailure(Exception cause) {
+
+    }
+}

package/lib/android/app/src/reactNative71/java/com/reactnativenavigation/react/modal/ModalContentLayout.kt

@@ -0,0 +1,87 @@
+package com.reactnativenavigation.react.modal
+
+import android.content.Context
+import android.view.MotionEvent
+import android.view.View
+import com.facebook.react.bridge.*
+import com.facebook.react.uimanager.*
+import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.views.view.ReactViewGroup
+
+
+class ModalContentLayout(context: Context?) : ReactViewGroup(context), RootView{
+    private var hasAdjustedSize = false
+    private var viewWidth = 0
+    private var viewHeight = 0
+    private val mJSTouchDispatcher = JSTouchDispatcher(this)
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        viewWidth = w
+        viewHeight = h
+        this.updateFirstChildView()
+    }
+    private fun updateFirstChildView() {
+        if (this.childCount > 0) {
+            hasAdjustedSize = false
+            val viewTag = getChildAt(0).id
+            val reactContext: ReactContext = this.getReactContext()
+            reactContext.runOnNativeModulesQueueThread(object : GuardedRunnable(reactContext) {
+                override fun runGuarded() {
+                    val uiManager = this@ModalContentLayout.getReactContext().getNativeModule(
+                            UIManagerModule::class.java
+                    ) as UIManagerModule
+                    uiManager.updateNodeSize(
+                            viewTag,
+                            this@ModalContentLayout.viewWidth,
+                            this@ModalContentLayout.viewHeight
+                    )
+                }
+            })
+        } else {
+            hasAdjustedSize = true
+        }
+    }
+
+    override fun addView(child: View?, index: Int, params: LayoutParams?) {
+        super.addView(child, index, params)
+        if (hasAdjustedSize) {
+            updateFirstChildView()
+        }
+    }
+    override fun onChildStartedNativeGesture(child: View, androidEvent: MotionEvent?) {
+        mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
+    }
+    override fun onChildStartedNativeGesture(androidEvent: MotionEvent?) {
+        mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
+    }
+    override fun onChildEndedNativeGesture(child: View, androidEvent: MotionEvent?) {
+        mJSTouchDispatcher.onChildEndedNativeGesture(androidEvent, this.getEventDispatcher())
+    }
+    override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {}
+    private fun getEventDispatcher(): EventDispatcher? {
+        val reactContext: ReactContext = this.getReactContext()
+        return reactContext.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher
+    }
+
+
+    override fun handleException(t: Throwable?) {
+        getReactContext().handleException(RuntimeException(t))
+    }
+
+    private fun getReactContext(): ReactContext {
+        return this.context as ReactContext
+    }
+
+    override fun onInterceptTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        return super.onInterceptTouchEvent(event)
+    }
+
+    override fun onTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        super.onTouchEvent(event)
+        return true
+    }
+
+}

package/lib/android/app/src/reactNative71/java/com/reactnativenavigation/viewcontrollers/viewcontroller/YellowBoxHelper.java

@@ -0,0 +1,12 @@
+package com.reactnativenavigation.viewcontrollers.viewcontroller;
+
+import android.view.View;
+import android.view.ViewGroup;
+
+public class YellowBoxHelper {
+    boolean isYellowBox(View parent, View child) {
+        return parent instanceof ViewGroup &&
+               child instanceof ViewGroup &&
+               ((ViewGroup) parent).indexOfChild(child) >= 1;
+    }
+}

package/lib/dist/Mock/Components/LayoutComponent.d.ts

@@ -3,6 +3,7 @@ import { ComponentProps } from '../ComponentProps';
 export declare const LayoutComponent: {
     new (props: Readonly<ComponentProps>): {
         render(): JSX.Element;
+        componentDidCatch(error: Error, errorInfo: React.ErrorInfo): void;
         context: any;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<ComponentProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
@@ -16,7 +17,6 @@ export declare const LayoutComponent: {
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
-        componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
         getSnapshotBeforeUpdate?(prevProps: Readonly<ComponentProps>, prevState: Readonly<{}>): any;
         componentDidUpdate?(prevProps: Readonly<ComponentProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
@@ -28,6 +28,7 @@ export declare const LayoutComponent: {
     };
     new (props: ComponentProps, context?: any): {
         render(): JSX.Element;
+        componentDidCatch(error: Error, errorInfo: React.ErrorInfo): void;
         context: any;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<ComponentProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
@@ -41,7 +42,6 @@ export declare const LayoutComponent: {
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<ComponentProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
-        componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
         getSnapshotBeforeUpdate?(prevProps: Readonly<ComponentProps>, prevState: Readonly<{}>): any;
         componentDidUpdate?(prevProps: Readonly<ComponentProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;

package/lib/dist/Mock/Components/LayoutComponent.js

@@ -19,5 +19,8 @@ const LayoutComponent = class extends react_1.Component {
         }
         return react_1.default.createElement(react_native_1.View, null);
     }
+    componentDidCatch(error, errorInfo) {
+        console.error(`Error while trying to render layout ${this.props.layoutNode.nodeId} of type ${this.props.layoutNode.type}`, error, errorInfo);
+    }
 };
 exports.LayoutComponent = LayoutComponent;

package/lib/dist/Mock/mocks/NativeCommandsSender.d.ts

@@ -1,4 +1,5 @@
 import { LayoutNode } from '../../src/commands/LayoutTreeCrawler';
+import { Constants } from '../../src/adapters/Constants';
 export declare class NativeCommandsSender {
     constructor();
     setRoot(_commandId: string, layout: {
@@ -20,4 +21,6 @@ export declare class NativeCommandsSender {
     dismissOverlay(_commandId: string, componentId: string): void;
     dismissAllOverlays(_commandId: string): void;
     getLaunchArgs(_commandId: string): void;
+    getNavigationConstants(): Promise<Constants>;
+    getNavigationConstantsSync(): Constants;
 }

package/lib/dist/Mock/mocks/NativeCommandsSender.js

@@ -99,5 +99,21 @@ class NativeCommandsSender {
         LayoutStore_1.LayoutStore.dismissAllOverlays();
     }
     getLaunchArgs(_commandId) { }
+    getNavigationConstants() {
+        return Promise.resolve({
+            topBarHeight: 0,
+            backButtonId: 'RNN.back',
+            bottomTabsHeight: 0,
+            statusBarHeight: 0,
+        });
+    }
+    getNavigationConstantsSync() {
+        return {
+            topBarHeight: 0,
+            backButtonId: 'RNN.back',
+            bottomTabsHeight: 0,
+            statusBarHeight: 0,
+        };
+    }
 }
 exports.NativeCommandsSender = NativeCommandsSender;

package/lib/dist/src/Navigation.js

@@ -200,13 +200,13 @@ class NavigationRoot {
      * Constants coming from native
      */
     async constants() {
-        return await Constants_1.Constants.get();
+        return await Constants_1.Constants.get(this.nativeCommandsSender);
     }
     /**
      * Constants coming from native (synchronized call)
      */
     constantsSync() {
-        return Constants_1.Constants.getSync();
+        return Constants_1.Constants.getSync(this.nativeCommandsSender);
     }
 }
 exports.NavigationRoot = NavigationRoot;

package/lib/dist/src/adapters/Constants.d.ts

@@ -1,3 +1,4 @@
+import { NativeCommandsSender } from './NativeCommandsSender';
 export interface NavigationConstants {
     statusBarHeight: number;
     backButtonId: string;
@@ -5,8 +6,8 @@ export interface NavigationConstants {
     bottomTabsHeight: number;
 }
 export declare class Constants {
-    static get(): Promise<NavigationConstants>;
-    static getSync(): NavigationConstants;
+    static get(nativeCommandSender: NativeCommandsSender): Promise<NavigationConstants>;
+    static getSync(nativeCommandSender: NativeCommandsSender): NavigationConstants;
     readonly statusBarHeight: number;
     readonly backButtonId: string;
     readonly topBarHeight: number;

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

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Constants = void 0;
-const react_native_1 = require("react-native");
 class Constants {
-    static async get() {
-        const constants = await react_native_1.NativeModules.RNNBridgeModule.getNavigationConstants();
+    static async get(nativeCommandSender) {
+        const constants = await nativeCommandSender.getNavigationConstants();
         return new Constants(constants);
     }
-    static getSync() {
-        return new Constants(react_native_1.NativeModules.RNNBridgeModule.getNavigationConstantsSync());
+    static getSync(nativeCommandSender) {
+        const constants = nativeCommandSender.getNavigationConstantsSync();
+        return new Constants(constants);
     }
     statusBarHeight;
     backButtonId;

package/lib/dist/src/adapters/NativeCommandsSender.d.ts

@@ -1,3 +1,4 @@
+import { NavigationConstants } from './Constants';
 export declare class NativeCommandsSender {
     private readonly nativeCommandsModule;
     constructor();
@@ -20,4 +21,6 @@ export declare class NativeCommandsSender {
     dismissOverlay(commandId: string, componentId: string): Promise<any>;
     dismissAllOverlays(commandId: string): Promise<any>;
     getLaunchArgs(commandId: string): Promise<any>;
+    getNavigationConstants(): Promise<NavigationConstants>;
+    getNavigationConstantsSync(): NavigationConstants;
 }

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

@@ -52,5 +52,11 @@ class NativeCommandsSender {
     getLaunchArgs(commandId) {
         return this.nativeCommandsModule.getLaunchArgs(commandId);
     }
+    getNavigationConstants() {
+        return this.nativeCommandsModule.getNavigationConstants();
+    }
+    getNavigationConstantsSync() {
+        return this.nativeCommandsModule.getNavigationConstantsSync();
+    }
 }
 exports.NativeCommandsSender = NativeCommandsSender;

package/lib/dist/src/commands/Commands.d.ts

@@ -24,15 +24,15 @@ export declare class Commands {
     setDefaultOptions(options: Options): void;
     mergeOptions(componentId: string, options: Options): void;
     updateProps(componentId: string, props: object, callback?: () => void): void;
-    showModal(layout: Layout): Promise<any>;
+    showModal<P>(layout: Layout<P>): Promise<any>;
     dismissModal(componentId: string, mergeOptions?: Options): Promise<any>;
     dismissAllModals(mergeOptions?: Options): Promise<any>;
-    push(componentId: string, simpleApi: Layout): Promise<any>;
+    push<P>(componentId: string, simpleApi: Layout<P>): Promise<any>;
     pop(componentId: string, mergeOptions?: Options): Promise<any>;
     popTo(componentId: string, mergeOptions?: Options): Promise<any>;
     popToRoot(componentId: string, mergeOptions?: Options): Promise<any>;
-    setStackRoot(componentId: string, children: Layout[]): Promise<any>;
-    showOverlay(simpleApi: Layout): Promise<any>;
+    setStackRoot<P>(componentId: string, children: Layout<P>[]): Promise<any>;
+    showOverlay<P>(simpleApi: Layout<P>): Promise<any>;
     dismissOverlay(componentId: string): Promise<any>;
     dismissAllOverlays(): Promise<any>;
     getLaunchArgs(): Promise<any>;

package/lib/dist/src/commands/OptionsCrawler.d.ts

@@ -5,7 +5,7 @@ export declare class OptionsCrawler {
     readonly store: Store;
     readonly uniqueIdProvider: UniqueIdProvider;
     constructor(store: Store, uniqueIdProvider: UniqueIdProvider);
-    crawl(api?: Layout): void;
+    crawl(api?: Layout<any>): void;
     private topTabs;
     private sideMenu;
     private bottomTabs;

package/lib/dist/src/processors/LayoutProcessor.d.ts

@@ -4,5 +4,5 @@ import { CommandName } from '../interfaces/CommandName';
 export declare class LayoutProcessor {
     private layoutProcessorsStore;
     constructor(layoutProcessorsStore: LayoutProcessorsStore);
-    process(layout: Layout, commandName: CommandName): Layout;
+    process(layout: Layout<any>, commandName: CommandName): Layout;
 }

package/lib/ios/SharedElementAnimator.m

@@ -39,7 +39,7 @@
             [RNNElementFinder findElementForId:transitionOptions.toId
                                         inView:_toVC.presentedComponentViewController.reactView];
         if (fromView == nil || toView == nil) {
-            break;
+            continue;
         }
 
         SharedElementTransition *sharedElementAnimator =

package/lib/src/Navigation.ts

@@ -248,7 +248,7 @@ export class NavigationRoot {
     componentId: string,
     layout: Layout<P> | Array<Layout<P>>
   ): Promise<string> {
-    const children: Layout[] = isArray(layout) ? layout : [layout];
+    const children: Layout<P | []>[] = isArray(layout) ? layout : [layout];
     return this.commands.setStackRoot(componentId, children);
   }
 
@@ -291,13 +291,13 @@ export class NavigationRoot {
    * Constants coming from native
    */
   public async constants(): Promise<NavigationConstants> {
-    return await Constants.get();
+    return await Constants.get(this.nativeCommandsSender);
   }
 
   /**
    * Constants coming from native (synchronized call)
    */
   public constantsSync(): NavigationConstants {
-    return Constants.getSync();
+    return Constants.getSync(this.nativeCommandsSender);
   }
 }

package/lib/src/adapters/Constants.ts

@@ -1,4 +1,4 @@
-import { NativeModules } from 'react-native';
+import { NativeCommandsSender } from './NativeCommandsSender';
 
 export interface NavigationConstants {
   statusBarHeight: number;
@@ -8,13 +8,14 @@ export interface NavigationConstants {
 }
 
 export class Constants {
-  static async get(): Promise<NavigationConstants> {
-    const constants: NavigationConstants = await NativeModules.RNNBridgeModule.getNavigationConstants();
+  static async get(nativeCommandSender: NativeCommandsSender): Promise<NavigationConstants> {
+    const constants: NavigationConstants = await nativeCommandSender.getNavigationConstants();
     return new Constants(constants);
   }
 
-  static getSync(): NavigationConstants {
-    return new Constants(NativeModules.RNNBridgeModule.getNavigationConstantsSync());
+  static getSync(nativeCommandSender: NativeCommandsSender): NavigationConstants {
+    const constants: NavigationConstants = nativeCommandSender.getNavigationConstantsSync();
+    return new Constants(constants);
   }
 
   public readonly statusBarHeight: number;

package/lib/src/adapters/NativeCommandsSender.ts

@@ -1,4 +1,5 @@
 import { NativeModules } from 'react-native';
+import { NavigationConstants } from './Constants';
 
 interface NativeCommandsModule {
   setRoot(commandId: string, layout: { root: any; modals: any[]; overlays: any[] }): Promise<any>;
@@ -16,6 +17,8 @@ interface NativeCommandsModule {
   dismissOverlay(commandId: string, componentId: string): Promise<any>;
   dismissAllOverlays(commandId: string): Promise<any>;
   getLaunchArgs(commandId: string): Promise<any>;
+  getNavigationConstants(): Promise<NavigationConstants>;
+  getNavigationConstantsSync(): NavigationConstants;
 }
 
 export class NativeCommandsSender {
@@ -83,4 +86,12 @@ export class NativeCommandsSender {
   getLaunchArgs(commandId: string) {
     return this.nativeCommandsModule.getLaunchArgs(commandId);
   }
+
+  getNavigationConstants() {
+    return this.nativeCommandsModule.getNavigationConstants();
+  }
+
+  getNavigationConstantsSync() {
+    return this.nativeCommandsModule.getNavigationConstantsSync();
+  }
 }

package/lib/src/commands/Commands.ts

@@ -91,7 +91,7 @@ export class Commands {
     this.commandsObserver.notify(CommandName.UpdateProps, { componentId, props });
   }
 
-  public showModal(layout: Layout) {
+  public showModal<P>(layout: Layout<P>) {
     const layoutCloned = cloneLayout(layout);
     this.optionsCrawler.crawl(layoutCloned);
     const layoutProcessed = this.layoutProcessor.process(layoutCloned, CommandName.ShowModal);
@@ -125,7 +125,7 @@ export class Commands {
     return result;
   }
 
-  public push(componentId: string, simpleApi: Layout) {
+  public push<P>(componentId: string, simpleApi: Layout<P>) {
     const input = cloneLayout(simpleApi);
     this.optionsCrawler.crawl(input);
     const layoutProcessed = this.layoutProcessor.process(input, CommandName.Push);
@@ -163,7 +163,7 @@ export class Commands {
     return result;
   }
 
-  public setStackRoot(componentId: string, children: Layout[]) {
+  public setStackRoot<P>(componentId: string, children: Layout<P>[]) {
     const input = map(cloneLayout(children), (simpleApi) => {
       this.optionsCrawler.crawl(simpleApi);
       const layoutProcessed = this.layoutProcessor.process(simpleApi, CommandName.SetStackRoot);
@@ -185,7 +185,7 @@ export class Commands {
     return result;
   }
 
-  public showOverlay(simpleApi: Layout) {
+  public showOverlay<P>(simpleApi: Layout<P>) {
     const input = cloneLayout(simpleApi);
     this.optionsCrawler.crawl(input);
     const layoutProcessed = this.layoutProcessor.process(input, CommandName.ShowOverlay);

package/lib/src/commands/OptionsCrawler.ts

@@ -22,7 +22,7 @@ export class OptionsCrawler {
     this.crawl = this.crawl.bind(this);
   }
 
-  crawl(api?: Layout): void {
+  crawl(api?: Layout<any>): void {
     if (!api) return;
     if (api.topTabs) {
       this.topTabs(api.topTabs);

package/lib/src/processors/LayoutProcessor.ts

@@ -6,7 +6,7 @@ import { CommandName } from '../interfaces/CommandName';
 export class LayoutProcessor {
   constructor(private layoutProcessorsStore: LayoutProcessorsStore) {}
 
-  public process(layout: Layout, commandName: CommandName): Layout {
+  public process(layout: Layout<any>, commandName: CommandName): Layout {
     const processors: ILayoutProcessor[] = this.layoutProcessorsStore.getProcessors();
     processors.forEach((processor) => {
       layout = processor(layout, commandName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "7.30.6",
+  "version": "7.31.0-snapshot.856",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,