react-native-navigation 7.30.5 → 7.30.6-snapshot.792

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/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/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/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.5",
+  "version": "7.30.6-snapshot.792",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,