react-native-navigation 7.28.1 → 7.29.0

package/lib/Mock/Components/ComponentScreen.tsx

@@ -8,6 +8,7 @@ import { connect } from '../connect';
 import { TopBar } from './TopBar';
 import { events } from '../Stores/EventsStore';
 import _ from 'lodash';
+import { switchTabByIndex } from '../actions/layoutActions';
 
 export const ComponentScreen = connect(
   class extends Component<ComponentProps> {
@@ -41,7 +42,7 @@ export const ComponentScreen = connect(
                   tabIndex: i,
                 });
                 if (_.defaultTo(bottomTabOptions?.selectTabOnPress, true))
-                  LayoutStore.selectTabIndex(this.props.layoutNode.getBottomTabs(), i);
+                  switchTabByIndex(this.props.layoutNode.getBottomTabs(), i);
               }}
             />
             <Text>{bottomTabOptions?.badge}</Text>

package/lib/Mock/Components/NavigationButton.tsx

@@ -32,10 +32,14 @@ export const NavigationButton = class extends Component<ButtonProps> {
 
   renderButtonComponent() {
     const { button, componentId } = this.props;
-    //@ts-ignore
+    // @ts-ignore
     const buttonComponentId = button.component!.componentId;
-    //@ts-ignore
-    const Component = Navigation.mock.store.getComponentClassForName(button.component.name)!();
+    // @ts-ignore
+    const ComponentClass = Navigation.mock.store.getComponentClassForName(button.component.name);
+    if (!ComponentClass) {
+      throw new Error(`Cannot find registered component for: ${button.component?.name}`);
+    }
+    const ButtonComponent = ComponentClass();
     const props = Navigation.mock.store.getPropsForId(buttonComponentId);
     return (
       <TouchableOpacity
@@ -52,7 +56,7 @@ export const NavigationButton = class extends Component<ButtonProps> {
         }}
         testID={button.testID}
       >
-        <Component
+        <ButtonComponent
           key={buttonComponentId}
           {...props}
           componentId={buttonComponentId}

package/lib/Mock/Layouts/BottomTabsNode.ts

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import { Options } from '../../src/index';
-import { LayoutStore } from '../Stores/LayoutStore';
+import { switchTabByIndex } from '../actions/layoutActions';
 import ParentNode from './ParentNode';
 
 export default class BottomTabsNode extends ParentNode {
@@ -13,7 +13,7 @@ export default class BottomTabsNode extends ParentNode {
     super.mergeOptions(options);
     if (options.bottomTabs?.currentTabIndex) {
       this.selectedIndex = options.bottomTabs?.currentTabIndex;
-      LayoutStore.selectTabIndex(this, this.selectedIndex);
+      switchTabByIndex(this, this.selectedIndex);
     }
     if (options.bottomTabs?.currentTabId) {
       const index = _.findIndex(
@@ -21,7 +21,7 @@ export default class BottomTabsNode extends ParentNode {
         (child) => child.nodeId === options?.bottomTabs?.currentTabId
       );
       if (index !== -1) this.selectedIndex = index;
-      LayoutStore.selectTabIndex(this, this.selectedIndex);
+      switchTabByIndex(this, this.selectedIndex);
     }
   }
 

package/lib/Mock/actions/layoutActions.ts

@@ -0,0 +1,10 @@
+import ParentNode from '../Layouts/ParentNode';
+import { LayoutStore } from '../Stores/LayoutStore';
+
+export const switchTabByIndex = (bottomTabs: ParentNode | undefined, index: number) => {
+  if (bottomTabs) {
+    LayoutStore.getVisibleLayout().componentDidDisappear();
+    LayoutStore.selectTabIndex(bottomTabs, index);
+    LayoutStore.getVisibleLayout().componentDidAppear();
+  }
+};

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

@@ -11,6 +11,7 @@ const connect_1 = require("../connect");
 const TopBar_1 = require("./TopBar");
 const EventsStore_1 = require("../Stores/EventsStore");
 const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+const layoutActions_1 = require("../actions/layoutActions");
 exports.ComponentScreen = (0, connect_1.connect)(class extends react_1.Component {
     constructor(props) {
         super(props);
@@ -36,7 +37,7 @@ exports.ComponentScreen = (0, connect_1.connect)(class extends react_1.Component
                             tabIndex: i,
                         });
                         if (lodash_1.default.defaultTo(bottomTabOptions?.selectTabOnPress, true))
-                            LayoutStore_1.LayoutStore.selectTabIndex(this.props.layoutNode.getBottomTabs(), i);
+                            (0, layoutActions_1.switchTabByIndex)(this.props.layoutNode.getBottomTabs(), i);
                     } }),
                 react_1.default.createElement(react_native_1.Text, null, bottomTabOptions?.badge)));
         });

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

@@ -20,10 +20,14 @@ const NavigationButton = class extends react_1.Component {
     }
     renderButtonComponent() {
         const { button, componentId } = this.props;
-        //@ts-ignore
+        // @ts-ignore
         const buttonComponentId = button.component.componentId;
-        //@ts-ignore
-        const Component = react_native_navigation_1.Navigation.mock.store.getComponentClassForName(button.component.name)();
+        // @ts-ignore
+        const ComponentClass = react_native_navigation_1.Navigation.mock.store.getComponentClassForName(button.component.name);
+        if (!ComponentClass) {
+            throw new Error(`Cannot find registered component for: ${button.component?.name}`);
+        }
+        const ButtonComponent = ComponentClass();
         const props = react_native_navigation_1.Navigation.mock.store.getPropsForId(buttonComponentId);
         return (react_1.default.createElement(react_native_1.TouchableOpacity, { onPress: () => {
                 if (this.ref) {
@@ -35,7 +39,7 @@ const NavigationButton = class extends react_1.Component {
                     componentId: componentId,
                 });
             }, testID: button.testID },
-            react_1.default.createElement(Component, { key: buttonComponentId, ...props, componentId: buttonComponentId, ref: (ref) => (this.ref = ref) })));
+            react_1.default.createElement(ButtonComponent, { key: buttonComponentId, ...props, componentId: buttonComponentId, ref: (ref) => (this.ref = ref) })));
     }
     invokeOnClick(stateNode) {
         if (stateNode.children) {

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
-const LayoutStore_1 = require("../Stores/LayoutStore");
+const layoutActions_1 = require("../actions/layoutActions");
 const ParentNode_1 = (0, tslib_1.__importDefault)(require("./ParentNode"));
 class BottomTabsNode extends ParentNode_1.default {
     selectedIndex = 0;
@@ -13,13 +13,13 @@ class BottomTabsNode extends ParentNode_1.default {
         super.mergeOptions(options);
         if (options.bottomTabs?.currentTabIndex) {
             this.selectedIndex = options.bottomTabs?.currentTabIndex;
-            LayoutStore_1.LayoutStore.selectTabIndex(this, this.selectedIndex);
+            (0, layoutActions_1.switchTabByIndex)(this, this.selectedIndex);
         }
         if (options.bottomTabs?.currentTabId) {
             const index = lodash_1.default.findIndex(this.children, (child) => child.nodeId === options?.bottomTabs?.currentTabId);
             if (index !== -1)
                 this.selectedIndex = index;
-            LayoutStore_1.LayoutStore.selectTabIndex(this, this.selectedIndex);
+            (0, layoutActions_1.switchTabByIndex)(this, this.selectedIndex);
         }
     }
     getVisibleLayout() {

package/lib/dist/Mock/Layouts/LayoutNodeFactory.d.ts

@@ -3,5 +3,5 @@ import ComponentNode from './ComponentNode';
 import Stack from './StackNode';
 import ParentNode from './ParentNode';
 export default class LayoutNodeFactory {
-    static create(layout: any, parentNode?: ParentNode): BottomTabs | ComponentNode | Stack;
+    static create(layout: any, parentNode?: ParentNode): Stack | BottomTabs | ComponentNode;
 }

package/lib/dist/Mock/actions/layoutActions.d.ts

@@ -0,0 +1,2 @@
+import ParentNode from '../Layouts/ParentNode';
+export declare const switchTabByIndex: (bottomTabs: ParentNode | undefined, index: number) => void;

package/lib/dist/Mock/actions/layoutActions.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.switchTabByIndex = void 0;
+const LayoutStore_1 = require("../Stores/LayoutStore");
+const switchTabByIndex = (bottomTabs, index) => {
+    if (bottomTabs) {
+        LayoutStore_1.LayoutStore.getVisibleLayout().componentDidDisappear();
+        LayoutStore_1.LayoutStore.selectTabIndex(bottomTabs, index);
+        LayoutStore_1.LayoutStore.getVisibleLayout().componentDidAppear();
+    }
+};
+exports.switchTabByIndex = switchTabByIndex;

package/lib/ios/RNNDynamicIconCreator.m

@@ -14,12 +14,12 @@
     UIColor *darkBackgroundColor = [backgroundColor resolvedColorWithTraitCollection:[UITraitCollection traitCollectionWithUserInterfaceStyle:UIUserInterfaceStyleDark]];
     UIImage *darkImage = [[self.iconDrawer draw:iconImage
                                  imageColor:darkColor
-                            backgroundColor:lightBackgroundColor
+                            backgroundColor:darkBackgroundColor
                                        size:iconSize
                                cornerRadius:cornerRadius] imageWithInsets:buttonOptions.iconInsets.UIEdgeInsets];
     UIImage *lightImage = [[self.iconDrawer draw:iconImage
                                   imageColor:lightColor
-                             backgroundColor:darkBackgroundColor
+                             backgroundColor:lightBackgroundColor
                                         size:iconSize
                                 cornerRadius:cornerRadius] imageWithInsets:buttonOptions.iconInsets.UIEdgeInsets];
     [lightImage.imageAsset registerImage:darkImage withTraitCollection:[UITraitCollection traitCollectionWithUserInterfaceStyle:UIUserInterfaceStyleDark]];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "7.28.1",
+  "version": "7.29.0",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,