react-native-navigation 7.31.1 → 7.32.0-snapshot.884

package/lib/Mock/Stores/EventsStore.ts

@@ -4,7 +4,7 @@ import {
   ModalDismissedEvent,
 } from '../../src/interfaces/ComponentEvents';
 import { ComponentDidAppearEvent, NavigationButtonPressedEvent } from '../../src/index';
-import { BottomTabPressedEvent } from '../../src/interfaces/Events';
+import { BottomTabPressedEvent, CommandCompletedEvent } from '../../src/interfaces/Events';
 
 export const events = {
   navigationButtonPressed: [(_event: NavigationButtonPressedEvent) => {}],
@@ -13,6 +13,7 @@ export const events = {
   componentDidDisappear: [(_event: ComponentDidDisappearEvent) => {}],
   modalDismissed: [(_event: ModalDismissedEvent) => {}],
   bottomTabPressed: [(_event: BottomTabPressedEvent) => {}],
+  commandCompleted: [(_event: CommandCompletedEvent) => {}],
   invokeComponentWillAppear: (event: ComponentWillAppearEvent) => {
     events.componentWillAppear &&
       events.componentWillAppear.forEach((listener) => {
@@ -49,4 +50,10 @@ export const events = {
         listener(event);
       });
   },
+  invokeCommandCompleted: (event: CommandCompletedEvent) => {
+    events.commandCompleted &&
+      events.commandCompleted.forEach((listener) => {
+        listener(event);
+      });
+  },
 };

package/lib/Mock/mocks/NativeCommandsSender.tsx

@@ -5,11 +5,12 @@ import { events } from '../Stores/EventsStore';
 import _ from 'lodash';
 import ComponentNode from '../Layouts/ComponentNode';
 import { Constants } from '../../src/adapters/Constants';
+import { CommandName } from '../../src/interfaces/CommandName';
 
 export class NativeCommandsSender {
   constructor() {}
 
-  setRoot(_commandId: string, layout: { root: any; modals: any[]; overlays: any[] }) {
+  setRoot(commandId: string, layout: { root: any; modals: any[]; overlays: any[] }) {
     return new Promise((resolve) => {
       if (LayoutStore.getVisibleLayout()) {
         LayoutStore.getVisibleLayout().componentDidDisappear();
@@ -20,6 +21,7 @@ export class NativeCommandsSender {
       LayoutStore.setRoot(layoutNode);
       layoutNode.getVisibleLayout().componentDidAppear();
       resolve(layout.root.nodeId);
+      this.reportCommandCompletion(CommandName.SetRoot, commandId);
     });
   }
 
@@ -31,7 +33,7 @@ export class NativeCommandsSender {
     LayoutStore.mergeOptions(componentId, options);
   }
 
-  push(_commandId: string, onComponentId: string, layout: LayoutNode) {
+  push(commandId: string, onComponentId: string, layout: LayoutNode) {
     return new Promise((resolve) => {
       const stack = LayoutStore.getLayoutById(onComponentId).getStack();
       const layoutNode = LayoutNodeFactory.create(layout, stack);
@@ -39,45 +41,51 @@ export class NativeCommandsSender {
       LayoutStore.push(layoutNode, stack);
       stack.getVisibleLayout().componentDidAppear();
       resolve(stack.getVisibleLayout().nodeId);
+      this.reportCommandCompletion(CommandName.Push, commandId);
     });
   }
 
-  pop(_commandId: string, componentId: string, _options?: object) {
+  pop(commandId: string, componentId: string, _options?: object) {
     return new Promise((resolve) => {
       const poppedChild = _.last(
         LayoutStore.getLayoutById(componentId).getStack().children
       ) as ComponentNode;
       LayoutStore.pop(componentId);
       resolve(poppedChild.nodeId);
+      this.reportCommandCompletion(CommandName.Pop, commandId);
     });
   }
 
-  popTo(_commandId: string, componentId: string, _options?: object) {
+  popTo(commandId: string, componentId: string, _options?: object) {
     return new Promise((resolve) => {
       LayoutStore.popTo(componentId);
       resolve(componentId);
+      this.reportCommandCompletion(CommandName.PopTo, commandId);
     });
   }
 
-  popToRoot(_commandId: string, componentId: string, _options?: object) {
+  popToRoot(commandId: string, componentId: string, _options?: object) {
     LayoutStore.popToRoot(componentId);
+    this.reportCommandCompletion(CommandName.PopToRoot, commandId);
   }
 
-  setStackRoot(_commandId: string, onComponentId: string, layout: object) {
+  setStackRoot(commandId: string, onComponentId: string, layout: object) {
     LayoutStore.setStackRoot(onComponentId, layout);
+    this.reportCommandCompletion(CommandName.SetStackRoot, commandId);
   }
 
-  showModal(_commandId: string, layout: object) {
+  showModal(commandId: string, layout: object) {
     return new Promise((resolve) => {
       const layoutNode = LayoutNodeFactory.create(layout);
       LayoutStore.getVisibleLayout().componentDidDisappear();
       LayoutStore.showModal(layoutNode);
       layoutNode.componentDidAppear();
       resolve(layoutNode.nodeId);
+      this.reportCommandCompletion(CommandName.ShowModal, commandId);
     });
   }
 
-  dismissModal(_commandId: string, componentId: string, _options?: object) {
+  dismissModal(commandId: string, componentId: string, _options?: object) {
     return new Promise((resolve, reject) => {
       const modal = LayoutStore.getModalById(componentId);
       if (modal) {
@@ -91,31 +99,38 @@ export class NativeCommandsSender {
         });
         resolve(modalTopParent.nodeId);
         LayoutStore.getVisibleLayout().componentDidAppear();
+        this.reportCommandCompletion(CommandName.DismissModal, commandId);
       } else {
         reject(`component with id: ${componentId} is not a modal`);
       }
     });
   }
 
-  dismissAllModals(_commandId: string, _options?: object) {
+  dismissAllModals(commandId: string, _options?: object) {
     LayoutStore.dismissAllModals();
+    this.reportCommandCompletion(CommandName.DismissAllModals, commandId);
   }
 
-  showOverlay(_commandId: string, layout: object) {
+  showOverlay(commandId: string, layout: object) {
     const layoutNode = LayoutNodeFactory.create(layout);
     LayoutStore.showOverlay(layoutNode);
     layoutNode.componentDidAppear();
+    this.reportCommandCompletion(CommandName.ShowOverlay, commandId);
   }
 
-  dismissOverlay(_commandId: string, componentId: string) {
+  dismissOverlay(commandId: string, componentId: string) {
     LayoutStore.dismissOverlay(componentId);
+    this.reportCommandCompletion(CommandName.DismissOverlay, commandId);
   }
 
-  dismissAllOverlays(_commandId: string) {
+  dismissAllOverlays(commandId: string) {
     LayoutStore.dismissAllOverlays();
+    this.reportCommandCompletion(CommandName.DismissAllOverlays, commandId);
   }
 
-  getLaunchArgs(_commandId: string) {}
+  getLaunchArgs(commandId: string) {
+    this.reportCommandCompletion(CommandName.GetLaunchArgs, commandId);
+  }
 
   getNavigationConstants(): Promise<Constants> {
     return Promise.resolve({
@@ -134,4 +149,12 @@ export class NativeCommandsSender {
       statusBarHeight: 0,
     };
   }
+
+  private reportCommandCompletion(commandName: string, commandId: string) {
+    events.invokeCommandCompleted({
+      commandName,
+      commandId,
+      completionTime: 0,
+    });
+  }
 }

package/lib/Mock/mocks/NativeEventsReceiver.ts

@@ -127,8 +127,9 @@ export class NativeEventsReceiver {
   }
 
   public registerCommandCompletedListener(
-    _callback: (data: CommandCompletedEvent) => void
+    callback: (data: CommandCompletedEvent) => void
   ): EmitterSubscription {
+    events.commandCompleted.push(callback);
     return {
       remove: () => {},
     } as EmitterSubscription;

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/parent/ParentController.java

@@ -208,7 +208,9 @@ public abstract class ParentController<T extends ViewGroup> extends ChildControl
         super.onConfigurationChanged(newConfig);
         Collection<? extends ViewController<?>> childControllers = getChildControllers();
         for(ViewController<?> controller: childControllers){
-            controller.onConfigurationChanged(newConfig);
+            if (controller.isViewShown()) {
+                controller.onConfigurationChanged(newConfig);
+            }
         }
     }
 }

package/lib/dist/Mock/Stores/EventsStore.d.ts

@@ -1,6 +1,6 @@
 import { ComponentDidDisappearEvent, ComponentWillAppearEvent, ModalDismissedEvent } from '../../src/interfaces/ComponentEvents';
 import { ComponentDidAppearEvent, NavigationButtonPressedEvent } from '../../src/index';
-import { BottomTabPressedEvent } from '../../src/interfaces/Events';
+import { BottomTabPressedEvent, CommandCompletedEvent } from '../../src/interfaces/Events';
 export declare const events: {
     navigationButtonPressed: ((_event: NavigationButtonPressedEvent) => void)[];
     componentWillAppear: ((_event: ComponentWillAppearEvent) => void)[];
@@ -8,10 +8,12 @@ export declare const events: {
     componentDidDisappear: ((_event: ComponentDidDisappearEvent) => void)[];
     modalDismissed: ((_event: ModalDismissedEvent) => void)[];
     bottomTabPressed: ((_event: BottomTabPressedEvent) => void)[];
+    commandCompleted: ((_event: CommandCompletedEvent) => void)[];
     invokeComponentWillAppear: (event: ComponentWillAppearEvent) => void;
     invokeComponentDidAppear: (event: ComponentDidAppearEvent) => void;
     invokeComponentDidDisappear: (event: ComponentDidDisappearEvent) => void;
     invokeModalDismissed: (event: ModalDismissedEvent) => void;
     invokeNavigationButtonPressed: (event: NavigationButtonPressedEvent) => void;
     invokeBottomTabPressed: (event: BottomTabPressedEvent) => void;
+    invokeCommandCompleted: (event: CommandCompletedEvent) => void;
 };

package/lib/dist/Mock/Stores/EventsStore.js

@@ -8,6 +8,7 @@ exports.events = {
     componentDidDisappear: [(_event) => { }],
     modalDismissed: [(_event) => { }],
     bottomTabPressed: [(_event) => { }],
+    commandCompleted: [(_event) => { }],
     invokeComponentWillAppear: (event) => {
         exports.events.componentWillAppear &&
             exports.events.componentWillAppear.forEach((listener) => {
@@ -44,4 +45,10 @@ exports.events = {
                 listener(event);
             });
     },
+    invokeCommandCompleted: (event) => {
+        exports.events.commandCompleted &&
+            exports.events.commandCompleted.forEach((listener) => {
+                listener(event);
+            });
+    },
 };

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

@@ -2,25 +2,26 @@ import { LayoutNode } from '../../src/commands/LayoutTreeCrawler';
 import { Constants } from '../../src/adapters/Constants';
 export declare class NativeCommandsSender {
     constructor();
-    setRoot(_commandId: string, layout: {
+    setRoot(commandId: string, layout: {
         root: any;
         modals: any[];
         overlays: any[];
     }): Promise<unknown>;
     setDefaultOptions(options: object): void;
     mergeOptions(componentId: string, options: object): void;
-    push(_commandId: string, onComponentId: string, layout: LayoutNode): Promise<unknown>;
-    pop(_commandId: string, componentId: string, _options?: object): Promise<unknown>;
-    popTo(_commandId: string, componentId: string, _options?: object): Promise<unknown>;
-    popToRoot(_commandId: string, componentId: string, _options?: object): void;
-    setStackRoot(_commandId: string, onComponentId: string, layout: object): void;
-    showModal(_commandId: string, layout: object): Promise<unknown>;
-    dismissModal(_commandId: string, componentId: string, _options?: object): Promise<unknown>;
-    dismissAllModals(_commandId: string, _options?: object): void;
-    showOverlay(_commandId: string, layout: object): void;
-    dismissOverlay(_commandId: string, componentId: string): void;
-    dismissAllOverlays(_commandId: string): void;
-    getLaunchArgs(_commandId: string): void;
+    push(commandId: string, onComponentId: string, layout: LayoutNode): Promise<unknown>;
+    pop(commandId: string, componentId: string, _options?: object): Promise<unknown>;
+    popTo(commandId: string, componentId: string, _options?: object): Promise<unknown>;
+    popToRoot(commandId: string, componentId: string, _options?: object): void;
+    setStackRoot(commandId: string, onComponentId: string, layout: object): void;
+    showModal(commandId: string, layout: object): Promise<unknown>;
+    dismissModal(commandId: string, componentId: string, _options?: object): Promise<unknown>;
+    dismissAllModals(commandId: string, _options?: object): void;
+    showOverlay(commandId: string, layout: object): void;
+    dismissOverlay(commandId: string, componentId: string): void;
+    dismissAllOverlays(commandId: string): void;
+    getLaunchArgs(commandId: string): void;
     getNavigationConstants(): Promise<Constants>;
     getNavigationConstantsSync(): Constants;
+    private reportCommandCompletion;
 }

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

@@ -6,9 +6,10 @@ const LayoutStore_1 = require("../Stores/LayoutStore");
 const LayoutNodeFactory_1 = (0, tslib_1.__importDefault)(require("../Layouts/LayoutNodeFactory"));
 const EventsStore_1 = require("../Stores/EventsStore");
 const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+const CommandName_1 = require("../../src/interfaces/CommandName");
 class NativeCommandsSender {
     constructor() { }
-    setRoot(_commandId, layout) {
+    setRoot(commandId, layout) {
         return new Promise((resolve) => {
             if (LayoutStore_1.LayoutStore.getVisibleLayout()) {
                 LayoutStore_1.LayoutStore.getVisibleLayout().componentDidDisappear();
@@ -18,6 +19,7 @@ class NativeCommandsSender {
             LayoutStore_1.LayoutStore.setRoot(layoutNode);
             layoutNode.getVisibleLayout().componentDidAppear();
             resolve(layout.root.nodeId);
+            this.reportCommandCompletion(CommandName_1.CommandName.SetRoot, commandId);
         });
     }
     setDefaultOptions(options) {
@@ -26,7 +28,7 @@ class NativeCommandsSender {
     mergeOptions(componentId, options) {
         LayoutStore_1.LayoutStore.mergeOptions(componentId, options);
     }
-    push(_commandId, onComponentId, layout) {
+    push(commandId, onComponentId, layout) {
         return new Promise((resolve) => {
             const stack = LayoutStore_1.LayoutStore.getLayoutById(onComponentId).getStack();
             const layoutNode = LayoutNodeFactory_1.default.create(layout, stack);
@@ -34,37 +36,43 @@ class NativeCommandsSender {
             LayoutStore_1.LayoutStore.push(layoutNode, stack);
             stack.getVisibleLayout().componentDidAppear();
             resolve(stack.getVisibleLayout().nodeId);
+            this.reportCommandCompletion(CommandName_1.CommandName.Push, commandId);
         });
     }
-    pop(_commandId, componentId, _options) {
+    pop(commandId, componentId, _options) {
         return new Promise((resolve) => {
             const poppedChild = lodash_1.default.last(LayoutStore_1.LayoutStore.getLayoutById(componentId).getStack().children);
             LayoutStore_1.LayoutStore.pop(componentId);
             resolve(poppedChild.nodeId);
+            this.reportCommandCompletion(CommandName_1.CommandName.Pop, commandId);
         });
     }
-    popTo(_commandId, componentId, _options) {
+    popTo(commandId, componentId, _options) {
         return new Promise((resolve) => {
             LayoutStore_1.LayoutStore.popTo(componentId);
             resolve(componentId);
+            this.reportCommandCompletion(CommandName_1.CommandName.PopTo, commandId);
         });
     }
-    popToRoot(_commandId, componentId, _options) {
+    popToRoot(commandId, componentId, _options) {
         LayoutStore_1.LayoutStore.popToRoot(componentId);
+        this.reportCommandCompletion(CommandName_1.CommandName.PopToRoot, commandId);
     }
-    setStackRoot(_commandId, onComponentId, layout) {
+    setStackRoot(commandId, onComponentId, layout) {
         LayoutStore_1.LayoutStore.setStackRoot(onComponentId, layout);
+        this.reportCommandCompletion(CommandName_1.CommandName.SetStackRoot, commandId);
     }
-    showModal(_commandId, layout) {
+    showModal(commandId, layout) {
         return new Promise((resolve) => {
             const layoutNode = LayoutNodeFactory_1.default.create(layout);
             LayoutStore_1.LayoutStore.getVisibleLayout().componentDidDisappear();
             LayoutStore_1.LayoutStore.showModal(layoutNode);
             layoutNode.componentDidAppear();
             resolve(layoutNode.nodeId);
+            this.reportCommandCompletion(CommandName_1.CommandName.ShowModal, commandId);
         });
     }
-    dismissModal(_commandId, componentId, _options) {
+    dismissModal(commandId, componentId, _options) {
         return new Promise((resolve, reject) => {
             const modal = LayoutStore_1.LayoutStore.getModalById(componentId);
             if (modal) {
@@ -78,27 +86,34 @@ class NativeCommandsSender {
                 });
                 resolve(modalTopParent.nodeId);
                 LayoutStore_1.LayoutStore.getVisibleLayout().componentDidAppear();
+                this.reportCommandCompletion(CommandName_1.CommandName.DismissModal, commandId);
             }
             else {
                 reject(`component with id: ${componentId} is not a modal`);
             }
         });
     }
-    dismissAllModals(_commandId, _options) {
+    dismissAllModals(commandId, _options) {
         LayoutStore_1.LayoutStore.dismissAllModals();
+        this.reportCommandCompletion(CommandName_1.CommandName.DismissAllModals, commandId);
     }
-    showOverlay(_commandId, layout) {
+    showOverlay(commandId, layout) {
         const layoutNode = LayoutNodeFactory_1.default.create(layout);
         LayoutStore_1.LayoutStore.showOverlay(layoutNode);
         layoutNode.componentDidAppear();
+        this.reportCommandCompletion(CommandName_1.CommandName.ShowOverlay, commandId);
     }
-    dismissOverlay(_commandId, componentId) {
+    dismissOverlay(commandId, componentId) {
         LayoutStore_1.LayoutStore.dismissOverlay(componentId);
+        this.reportCommandCompletion(CommandName_1.CommandName.DismissOverlay, commandId);
     }
-    dismissAllOverlays(_commandId) {
+    dismissAllOverlays(commandId) {
         LayoutStore_1.LayoutStore.dismissAllOverlays();
+        this.reportCommandCompletion(CommandName_1.CommandName.DismissAllOverlays, commandId);
+    }
+    getLaunchArgs(commandId) {
+        this.reportCommandCompletion(CommandName_1.CommandName.GetLaunchArgs, commandId);
     }
-    getLaunchArgs(_commandId) { }
     getNavigationConstants() {
         return Promise.resolve({
             topBarHeight: 0,
@@ -115,5 +130,12 @@ class NativeCommandsSender {
             statusBarHeight: 0,
         };
     }
+    reportCommandCompletion(commandName, commandId) {
+        EventsStore_1.events.invokeCommandCompleted({
+            commandName,
+            commandId,
+            completionTime: 0,
+        });
+    }
 }
 exports.NativeCommandsSender = NativeCommandsSender;

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

@@ -13,7 +13,7 @@ export declare class NativeEventsReceiver {
     registerSearchBarUpdatedListener(_callback: (event: SearchBarUpdatedEvent) => void): EmitterSubscription;
     registerSearchBarCancelPressedListener(_callback: (event: SearchBarCancelPressedEvent) => void): EmitterSubscription;
     registerPreviewCompletedListener(_callback: (event: PreviewCompletedEvent) => void): EmitterSubscription;
-    registerCommandCompletedListener(_callback: (data: CommandCompletedEvent) => void): EmitterSubscription;
+    registerCommandCompletedListener(callback: (data: CommandCompletedEvent) => void): EmitterSubscription;
     registerBottomTabSelectedListener(_callback: (data: BottomTabSelectedEvent) => void): EmitterSubscription;
     registerBottomTabLongPressedListener(_callback: (data: BottomTabLongPressedEvent) => void): EmitterSubscription;
     registerScreenPoppedListener(_callback: (event: ScreenPoppedEvent) => void): EmitterSubscription;

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

@@ -79,7 +79,8 @@ class NativeEventsReceiver {
             remove: () => { },
         };
     }
-    registerCommandCompletedListener(_callback) {
+    registerCommandCompletedListener(callback) {
+        EventsStore_1.events.commandCompleted.push(callback);
         return {
             remove: () => { },
         };

package/lib/ios/Utils/UITabBarController+RNNUtils.m

@@ -1,17 +1,10 @@
+#import "UITabBar+utils.h"
 #import "UITabBarController+RNNUtils.h"
 #import "UIView+Utils.h"
 
 @implementation UITabBarController (RNNUtils)
 - (UIView *)getTabView:(int)tabIndex {
-    int index = 0;
-    for (UIView *view in [[self tabBar] subviews]) {
-        if ([NSStringFromClass([view class]) isEqualToString:@"UITabBarButton"]) {
-            if (index == tabIndex)
-                return view;
-            index++;
-        }
-    }
-    return nil;
+    return [[self tabBar] tabBarItemViewAtIndex:tabIndex];
 }
 
 - (UIView *)getTabIcon:(int)tabIndex {

package/package.json

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