react-native-navigation 7.33.2 → 7.33.3-snapshot.991

package/jest.config.js

@@ -8,6 +8,7 @@ module.exports = {
   },
   roots: [
     '<rootDir>/lib/src/',
+    '<rootDir>/lib/Mock/',
     '<rootDir>/playground/src/',
     '<rootDir>/integration/',
     '<rootDir>/scripts/',
@@ -23,8 +24,8 @@ module.exports = {
       '<rootDir>/playground/img/layouts@2x.png',
   },
   collectCoverageFrom: [
-    'lib/src/**/*.ts',
-    'lib/src/**/*.tsx',
+    'lib/src/**/*.(ts|tsx)',
+    'lib/Mock/**/*.(ts|tsx)',
     'integration/**/*.js',
     '!lib/dist/index.js',
     '!lib/dist/Navigation.js',

package/lib/Mock/Layouts/BottomTabsNode.ts

@@ -4,9 +4,10 @@ import { switchTabByIndex } from '../actions/layoutActions';
 import ParentNode from './ParentNode';
 
 export default class BottomTabsNode extends ParentNode {
-  selectedIndex: number = 0;
+  selectedIndex: number;
   constructor(layout: any, parentNode?: ParentNode) {
     super(layout, 'BottomTabs', parentNode);
+    this.selectedIndex = layout.data?.options?.bottomTabs?.currentTabIndex || 0;
   }
 
   mergeOptions(options: Options) {

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

@@ -5,9 +5,10 @@ const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
 const layoutActions_1 = require("../actions/layoutActions");
 const ParentNode_1 = (0, tslib_1.__importDefault)(require("./ParentNode"));
 class BottomTabsNode extends ParentNode_1.default {
-    selectedIndex = 0;
+    selectedIndex;
     constructor(layout, parentNode) {
         super(layout, 'BottomTabs', parentNode);
+        this.selectedIndex = layout.data?.options?.bottomTabs?.currentTabIndex || 0;
     }
     mergeOptions(options) {
         super.mergeOptions(options);

package/lib/ios/RNNBottomTabsController.m

@@ -58,11 +58,11 @@
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     // This hack is needed for cases when the initialized state of the tabBar should be hidden
-    UINavigationController *firstChild = [self.childViewControllers objectAtIndex:0];
-    if ([firstChild isKindOfClass:UINavigationController.class] &&
-        firstChild.hidesBottomBarWhenPushed) {
-        [firstChild pushViewController:UIViewController.new animated:NO];
-        [firstChild popViewControllerAnimated:NO];
+    UINavigationController *selectedChild = self.selectedViewController;
+    if ([selectedChild isKindOfClass:UINavigationController.class] &&
+        selectedChild.hidesBottomBarWhenPushed) {
+        [selectedChild pushViewController:UIViewController.new animated:NO];
+        [selectedChild popViewControllerAnimated:NO];
     }
 }
 

package/package.json

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