react-native-navigation 7.40.2 → 7.40.3-snapshot.1472

package/lib/Mock/Stores/EventsStore.ts

@@ -2,6 +2,7 @@ import {
   ComponentDidDisappearEvent,
   ComponentWillAppearEvent,
   ModalDismissedEvent,
+  ScreenPoppedEvent,
 } from '../../src/interfaces/ComponentEvents';
 import { ComponentDidAppearEvent, NavigationButtonPressedEvent } from '../../src/index';
 import { BottomTabPressedEvent, CommandCompletedEvent } from '../../src/interfaces/Events';
@@ -14,6 +15,8 @@ export const events = {
   modalDismissed: [(_event: ModalDismissedEvent) => {}],
   bottomTabPressed: [(_event: BottomTabPressedEvent) => {}],
   commandCompleted: [(_event: CommandCompletedEvent) => {}],
+  screenPopped: [(_event: ScreenPoppedEvent) => {}],
+
   invokeComponentWillAppear: (event: ComponentWillAppearEvent) => {
     events.componentWillAppear &&
       events.componentWillAppear.forEach((listener) => {
@@ -56,4 +59,10 @@ export const events = {
         listener(event);
       });
   },
+  invokeScreenPopped: (event: ScreenPoppedEvent) => {
+    events.screenPopped &&
+      events.screenPopped.forEach((listener) => {
+        listener(event);
+      });
+  },
 };

package/lib/Mock/mocks/NativeCommandsSender.tsx

@@ -55,6 +55,9 @@ export class NativeCommandsSender {
         LayoutStore.getLayoutById(componentId).getStack().children
       ) as ComponentNode;
       LayoutStore.pop(componentId);
+      events.invokeScreenPopped({
+        componentId,
+      });
       resolve(poppedChild.nodeId);
       this.reportCommandCompletion(CommandName.Pop, commandId);
     });

package/lib/Mock/mocks/NativeEventsReceiver.ts

@@ -152,8 +152,9 @@ export class NativeEventsReceiver {
   }
 
   public registerScreenPoppedListener(
-    _callback: (event: ScreenPoppedEvent) => void
+    callback: (event: ScreenPoppedEvent) => void
   ): EmitterSubscription {
+    events.screenPopped.push(callback);
     return {
       remove: () => {},
     } as EmitterSubscription;

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

@@ -1,4 +1,4 @@
-import { ComponentDidDisappearEvent, ComponentWillAppearEvent, ModalDismissedEvent } from '../../src/interfaces/ComponentEvents';
+import { ComponentDidDisappearEvent, ComponentWillAppearEvent, ModalDismissedEvent, ScreenPoppedEvent } from '../../src/interfaces/ComponentEvents';
 import { ComponentDidAppearEvent, NavigationButtonPressedEvent } from '../../src/index';
 import { BottomTabPressedEvent, CommandCompletedEvent } from '../../src/interfaces/Events';
 export declare const events: {
@@ -9,6 +9,7 @@ export declare const events: {
     modalDismissed: ((_event: ModalDismissedEvent) => void)[];
     bottomTabPressed: ((_event: BottomTabPressedEvent) => void)[];
     commandCompleted: ((_event: CommandCompletedEvent) => void)[];
+    screenPopped: ((_event: ScreenPoppedEvent) => void)[];
     invokeComponentWillAppear: (event: ComponentWillAppearEvent) => void;
     invokeComponentDidAppear: (event: ComponentDidAppearEvent) => void;
     invokeComponentDidDisappear: (event: ComponentDidDisappearEvent) => void;
@@ -16,4 +17,5 @@ export declare const events: {
     invokeNavigationButtonPressed: (event: NavigationButtonPressedEvent) => void;
     invokeBottomTabPressed: (event: BottomTabPressedEvent) => void;
     invokeCommandCompleted: (event: CommandCompletedEvent) => void;
+    invokeScreenPopped: (event: ScreenPoppedEvent) => void;
 };

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

@@ -9,6 +9,7 @@ exports.events = {
     modalDismissed: [(_event) => { }],
     bottomTabPressed: [(_event) => { }],
     commandCompleted: [(_event) => { }],
+    screenPopped: [(_event) => { }],
     invokeComponentWillAppear: (event) => {
         exports.events.componentWillAppear &&
             exports.events.componentWillAppear.forEach((listener) => {
@@ -51,4 +52,10 @@ exports.events = {
                 listener(event);
             });
     },
+    invokeScreenPopped: (event) => {
+        exports.events.screenPopped &&
+            exports.events.screenPopped.forEach((listener) => {
+                listener(event);
+            });
+    },
 };

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

@@ -47,6 +47,9 @@ class NativeCommandsSender {
             }
             const poppedChild = lodash_1.default.last(LayoutStore_1.LayoutStore.getLayoutById(componentId).getStack().children);
             LayoutStore_1.LayoutStore.pop(componentId);
+            EventsStore_1.events.invokeScreenPopped({
+                componentId,
+            });
             resolve(poppedChild.nodeId);
             this.reportCommandCompletion(CommandName_1.CommandName.Pop, commandId);
         });

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

@@ -16,5 +16,5 @@ export declare class NativeEventsReceiver {
     registerCommandCompletedListener(callback: (data: CommandCompletedEvent) => void): EmitterSubscription;
     registerBottomTabSelectedListener(_callback: (data: BottomTabSelectedEvent) => void): EmitterSubscription;
     registerBottomTabLongPressedListener(_callback: (data: BottomTabLongPressedEvent) => void): EmitterSubscription;
-    registerScreenPoppedListener(_callback: (event: ScreenPoppedEvent) => void): EmitterSubscription;
+    registerScreenPoppedListener(callback: (event: ScreenPoppedEvent) => void): EmitterSubscription;
 }

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

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

package/lib/ios/RNNBottomTabsController.m

@@ -13,6 +13,8 @@
     NSUInteger _previousTabIndex;
     BottomTabsBaseAttacher *_bottomTabsAttacher;
     BOOL _tabBarNeedsRestore;
+    RNNNavigationOptions *_options;
+    BOOL _didFinishSetup;
 }
 
 - (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
@@ -28,14 +30,24 @@
     _bottomTabsAttacher = bottomTabsAttacher;
     _bottomTabPresenter = bottomTabPresenter;
     _dotIndicatorPresenter = dotIndicatorPresenter;
+    _options = options;
+    _didFinishSetup = NO;
+
+    IntNumber *currentTabIndex = options.bottomTabs.currentTabIndex;
+    if ([currentTabIndex hasValue]) {
+      NSUInteger currentTabIndexValue = [currentTabIndex get];
+      _previousTabIndex = currentTabIndexValue;
+      _currentTabIndex = currentTabIndexValue;
+    }
 
     self = [super initWithLayoutInfo:layoutInfo
-                             creator:creator
-                             options:options
-                      defaultOptions:defaultOptions
-                           presenter:presenter
-                        eventEmitter:eventEmitter
-                childViewControllers:childViewControllers];
+                           creator:creator
+                           options:options
+                    defaultOptions:defaultOptions
+                         presenter:presenter
+                      eventEmitter:eventEmitter
+              childViewControllers:childViewControllers];
+
     if (@available(iOS 13.0, *)) {
         self.tabBar.standardAppearance = [UITabBarAppearance new];
     }
@@ -52,6 +64,7 @@
                                                       action:@selector(handleLongPressGesture:)];
     [self.tabBar addGestureRecognizer:self.longPressRecognizer];
 
+    _didFinishSetup = YES;
     return self;
 }
 
@@ -124,8 +137,15 @@
 }
 
 - (void)setSelectedIndex:(NSUInteger)selectedIndex {
-    _currentTabIndex = selectedIndex;
-    [super setSelectedIndex:selectedIndex];
+    IntNumber *currentTabIndex = _options.bottomTabs.currentTabIndex;
+    if ([currentTabIndex hasValue] && !_didFinishSetup) {
+        NSUInteger currentTabIndexValue = [currentTabIndex get];
+        _currentTabIndex = currentTabIndexValue;
+    } else {
+        _currentTabIndex = selectedIndex;
+    }
+
+    [super setSelectedIndex:_currentTabIndex];
 }
 
 - (UIViewController *)selectedViewController {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "7.40.2",
+  "version": "7.40.3-snapshot.1472",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,
@@ -77,7 +77,7 @@
     "@react-native/metro-config": "^0.73.2",
     "@react-native/babel-preset": "^0.73.18",
     "@react-native/typescript-config": "^0.73.1",
-    "@react-native-community/blur": "^3.6.0",
+    "@react-native-community/blur": "^4.4.1",
     "@react-native-community/datetimepicker": "^3.4.7",
     "@react-native-community/eslint-config": "2.0.0",
     "@react-native-community/netinfo": "^5.9.4",
@@ -111,8 +111,8 @@
     "react": "18.2.0",
     "react-native": "0.73.3",
     "react-native-fast-image": "^8.6.3",
-    "react-native-gesture-handler": "^2.10.1",
-    "react-native-reanimated": "^3.8.1",
+    "react-native-gesture-handler": "2.14.1",
+    "react-native-reanimated": "3.16.1",
     "react-native-ui-lib": "7.3.6",
     "react-redux": "5.x.x",
     "react-test-renderer": "18.2.0",