react-native-navigation 7.23.1-snapshot.393 → 7.23.1-snapshot.405

package/README.md

@@ -8,7 +8,6 @@
   <a href="https://www.npmjs.com/package/react-native-navigation"><img src="https://img.shields.io/npm/v/react-native-navigation/latest.svg?style=flat-square" alt="NPM latest version"></a>
   <a href="https://www.npmjs.com/package/react-native-navigation"><img src="https://img.shields.io/npm/v/react-native-navigation/snapshot.svg?style=flat-square" alt="NPM snapshot version"></a>
   <a href="https://jenkins-oss.wixpress.com/job/multi-react-native-navigation-master/"><img src="https://img.shields.io/jenkins/s/http/jenkins-oss.wixpress.com:8080/job/multi-react-native-navigation-master.svg?style=flat-square" alt="NPM snapshot version"></a>
-  <a href="https://github.com/wix/react-native-navigation/pulls"><img src="https://img.shields.io/endpoint?url=https%3A%2F%2Fmerge-chance.info%2Fbadge%3Frepo%3Dwix/react-native-navigation"></a>
 
 </p>
 <p align="center">

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

@@ -9,6 +9,8 @@ const constants_1 = require("../constants");
 const LayoutStore_1 = require("../Stores/LayoutStore");
 const connect_1 = require("../connect");
 const TopBar_1 = require("./TopBar");
+const EventsStore_1 = require("../Stores/EventsStore");
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
 exports.ComponentScreen = connect_1.connect(class extends react_1.Component {
     constructor(props) {
         super(props);
@@ -29,13 +31,21 @@ exports.ComponentScreen = connect_1.connect(class extends react_1.Component {
         const buttons = bottomTabs.children.map((child, i) => {
             const bottomTabOptions = child.resolveOptions().bottomTab;
             return (react_1.default.createElement(react_native_1.View, { key: `tab-${i}` },
-                react_1.default.createElement(react_native_1.Button, { testID: bottomTabOptions?.testID, title: bottomTabOptions?.text || '', onPress: () => LayoutStore_1.LayoutStore.selectTabIndex(this.props.layoutNode.getBottomTabs(), i) }),
+                react_1.default.createElement(react_native_1.Button, { testID: bottomTabOptions?.testID, title: bottomTabOptions?.text || '', onPress: () => {
+                        EventsStore_1.events.invokeBottomTabPressed({
+                            tabIndex: i,
+                        });
+                        if (lodash_1.default.defaultTo(bottomTabOptions?.selectTabOnPress, true))
+                            LayoutStore_1.LayoutStore.selectTabIndex(this.props.layoutNode.getBottomTabs(), i);
+                    } }),
                 react_1.default.createElement(react_native_1.Text, null, bottomTabOptions?.badge)));
         });
         return react_1.default.createElement(react_native_1.View, { testID: bottomTabsOptions?.testID }, buttons);
     }
     render() {
         const Component = __1.Navigation.mock.store.getWrappedComponent(this.props.layoutNode.data.name);
+        if (!Component)
+            throw new Error(`${this.props.layoutNode.data.name} has not been registered.`);
         return (react_1.default.createElement(react_native_1.View, { testID: this.isVisible() ? constants_1.VISIBLE_SCREEN_TEST_ID : undefined },
             this.props.layoutNode.getStack() && (react_1.default.createElement(TopBar_1.TopBar, { layoutNode: this.props.layoutNode, topBarOptions: this.props.layoutNode.resolveOptions().topBar, backButtonOptions: this.props.layoutNode.resolveOptions().topBar?.backButton })),
             this.renderTabBar(),

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

@@ -1,14 +1,17 @@
 import { ComponentDidDisappearEvent, ComponentWillAppearEvent, ModalDismissedEvent } from '../../interfaces/ComponentEvents';
 import { ComponentDidAppearEvent, NavigationButtonPressedEvent } from '../../index';
+import { BottomTabPressedEvent } from '../../interfaces/Events';
 export declare const events: {
     navigationButtonPressed: ((_event: NavigationButtonPressedEvent) => void)[];
     componentWillAppear: ((_event: ComponentWillAppearEvent) => void)[];
     componentDidAppear: ((_event: ComponentDidAppearEvent) => void)[];
     componentDidDisappear: ((_event: ComponentDidDisappearEvent) => void)[];
     modalDismissed: ((_event: ModalDismissedEvent) => void)[];
+    bottomTabPressed: ((_event: BottomTabPressedEvent) => 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;
 };

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

@@ -7,6 +7,7 @@ exports.events = {
     componentDidAppear: [(_event) => { }],
     componentDidDisappear: [(_event) => { }],
     modalDismissed: [(_event) => { }],
+    bottomTabPressed: [(_event) => { }],
     invokeComponentWillAppear: (event) => {
         exports.events.componentWillAppear &&
             exports.events.componentWillAppear.forEach((listener) => {
@@ -37,4 +38,10 @@ exports.events = {
                 listener(event);
             });
     },
+    invokeBottomTabPressed: (event) => {
+        exports.events.bottomTabPressed &&
+            exports.events.bottomTabPressed?.forEach((listener) => {
+                listener(event);
+            });
+    },
 };

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

@@ -7,7 +7,7 @@ export declare class NativeEventsReceiver {
     registerComponentDidAppearListener(callback: (event: ComponentDidAppearEvent) => void): EmitterSubscription;
     registerComponentDidDisappearListener(callback: (event: ComponentDidDisappearEvent) => void): EmitterSubscription;
     registerNavigationButtonPressedListener(callback: (event: NavigationButtonPressedEvent) => void): EmitterSubscription;
-    registerBottomTabPressedListener(_callback: (data: BottomTabPressedEvent) => void): EmitterSubscription;
+    registerBottomTabPressedListener(callback: (data: BottomTabPressedEvent) => void): EmitterSubscription;
     registerModalDismissedListener(callback: (event: ModalDismissedEvent) => void): EmitterSubscription;
     registerModalAttemptedToDismissListener(_callback: (event: ModalAttemptedToDismissEvent) => void): EmitterSubscription;
     registerSearchBarUpdatedListener(_callback: (event: SearchBarUpdatedEvent) => void): EmitterSubscription;

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

@@ -43,9 +43,12 @@ class NativeEventsReceiver {
             },
         };
     }
-    registerBottomTabPressedListener(_callback) {
+    registerBottomTabPressedListener(callback) {
+        EventsStore_1.events.bottomTabPressed.push(callback);
         return {
-            remove: () => { },
+            remove: () => {
+                lodash_1.default.remove(EventsStore_1.events.bottomTabPressed, (value) => value === callback);
+            },
         };
     }
     registerModalDismissedListener(callback) {

package/lib/ios/RNNBridgeManager.mm

@@ -113,7 +113,6 @@
 - (void)onBridgeWillReload {
     dispatch_async(dispatch_get_main_queue(), ^{
       [self->_overlayManager dismissAllOverlays];
-      [self->_modalManager dismissAllModalsSynchronosly];
       [self->_componentRegistry clear];
       UIApplication.sharedApplication.delegate.window.rootViewController = nil;
     });

package/lib/ios/RNNModalManager.h

@@ -22,7 +22,6 @@ typedef void (^RNNTransitionRejectionBlock)(NSString *_Nonnull code, NSString *_
             animated:(BOOL)animated
           completion:(RNNTransitionCompletionBlock _Nullable)completion;
 - (void)dismissAllModalsAnimated:(BOOL)animated completion:(void (^__nullable)(void))completion;
-- (void)dismissAllModalsSynchronosly;
 
 - (void)reset;
 

package/lib/ios/RNNModalManager.m

@@ -130,21 +130,6 @@
         completion();
 }
 
-- (void)dismissAllModalsSynchronosly {
-    if (_presentedModals.count) {
-        dispatch_semaphore_t sem = dispatch_semaphore_create(0);
-        [self dismissAllModalsAnimated:NO
-                            completion:^{
-                              dispatch_semaphore_signal(sem);
-                            }];
-
-        while (dispatch_semaphore_wait(sem, DISPATCH_TIME_NOW)) {
-            [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode
-                                     beforeDate:[NSDate dateWithTimeIntervalSinceNow:0]];
-        }
-    }
-}
-
 - (void)reset {
     [_presentedModals removeAllObjects];
     [_pendingModalIdsToDismiss removeAllObjects];
@@ -177,8 +162,7 @@
             _dismissModalTransitionDelegate;
     }
 
-    if ((modalToDismiss == topPresentedVC ||
-         [[topPresentedVC childViewControllers] containsObject:modalToDismiss])) {
+    if ((modalToDismiss == topPresentedVC || [topPresentedVC findViewController:modalToDismiss])) {
         [self dismissSearchController:modalToDismiss];
         [modalToDismiss
             dismissViewControllerAnimated:animated

package/lib/src/Mock/Components/ComponentScreen.tsx

@@ -6,6 +6,8 @@ import { VISIBLE_SCREEN_TEST_ID } from '../constants';
 import { LayoutStore } from '../Stores/LayoutStore';
 import { connect } from '../connect';
 import { TopBar } from './TopBar';
+import { events } from '../Stores/EventsStore';
+import _ from 'lodash';
 
 export const ComponentScreen = connect(
   class extends Component<ComponentProps> {
@@ -34,7 +36,13 @@ export const ComponentScreen = connect(
             <Button
               testID={bottomTabOptions?.testID}
               title={bottomTabOptions?.text || ''}
-              onPress={() => LayoutStore.selectTabIndex(this.props.layoutNode.getBottomTabs(), i)}
+              onPress={() => {
+                events.invokeBottomTabPressed({
+                  tabIndex: i,
+                });
+                if (_.defaultTo(bottomTabOptions?.selectTabOnPress, true))
+                  LayoutStore.selectTabIndex(this.props.layoutNode.getBottomTabs(), i);
+              }}
             />
             <Text>{bottomTabOptions?.badge}</Text>
           </View>
@@ -46,6 +54,9 @@ export const ComponentScreen = connect(
 
     render() {
       const Component = Navigation.mock.store.getWrappedComponent(this.props.layoutNode.data.name);
+      if (!Component)
+        throw new Error(`${this.props.layoutNode.data.name} has not been registered.`);
+
       return (
         <View testID={this.isVisible() ? VISIBLE_SCREEN_TEST_ID : undefined}>
           {this.props.layoutNode.getStack() && (

package/lib/src/Mock/Stores/EventsStore.ts

@@ -4,6 +4,7 @@ import {
   ModalDismissedEvent,
 } from '../../interfaces/ComponentEvents';
 import { ComponentDidAppearEvent, NavigationButtonPressedEvent } from '../../index';
+import { BottomTabPressedEvent } from '../../interfaces/Events';
 
 export const events = {
   navigationButtonPressed: [(_event: NavigationButtonPressedEvent) => {}],
@@ -11,6 +12,7 @@ export const events = {
   componentDidAppear: [(_event: ComponentDidAppearEvent) => {}],
   componentDidDisappear: [(_event: ComponentDidDisappearEvent) => {}],
   modalDismissed: [(_event: ModalDismissedEvent) => {}],
+  bottomTabPressed: [(_event: BottomTabPressedEvent) => {}],
   invokeComponentWillAppear: (event: ComponentWillAppearEvent) => {
     events.componentWillAppear &&
       events.componentWillAppear.forEach((listener) => {
@@ -41,4 +43,10 @@ export const events = {
         listener(event);
       });
   },
+  invokeBottomTabPressed: (event: BottomTabPressedEvent) => {
+    events.bottomTabPressed &&
+      events.bottomTabPressed?.forEach((listener) => {
+        listener(event);
+      });
+  },
 };

package/lib/src/Mock/mocks/NativeEventsReceiver.ts

@@ -73,10 +73,13 @@ export class NativeEventsReceiver {
   }
 
   public registerBottomTabPressedListener(
-    _callback: (data: BottomTabPressedEvent) => void
+    callback: (data: BottomTabPressedEvent) => void
   ): EmitterSubscription {
+    events.bottomTabPressed.push(callback);
     return {
-      remove: () => {},
+      remove: () => {
+        _.remove(events.bottomTabPressed, (value) => value === callback);
+      },
     } as EmitterSubscription;
   }
 

package/package.json

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