react-native-navigation 7.23.1 → 7.24.0

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/stack/TopBarControllerTest.kt

@@ -4,26 +4,28 @@ import android.animation.AnimatorSet
 import android.app.Activity
 import android.content.Context
 import android.view.View
-import com.nhaarman.mockitokotlin2.*
+import org.mockito.kotlin.*
 import com.reactnativenavigation.BaseTest
+import com.reactnativenavigation.fakes.IconResolverFake
+import com.reactnativenavigation.mocks.TitleBarButtonCreatorMock
 import com.reactnativenavigation.options.BackButton
 import com.reactnativenavigation.options.ButtonOptions
+import com.reactnativenavigation.options.ComponentOptions
 import com.reactnativenavigation.options.Options
 import com.reactnativenavigation.options.params.Bool
 import com.reactnativenavigation.options.params.Text
 import com.reactnativenavigation.react.Constants
 import com.reactnativenavigation.react.ReactView
-import com.reactnativenavigation.utils.CollectionUtils
 import com.reactnativenavigation.utils.TitleBarHelper
 import com.reactnativenavigation.utils.resetViewProperties
 import com.reactnativenavigation.viewcontrollers.stack.topbar.TopBarAnimator
 import com.reactnativenavigation.viewcontrollers.stack.topbar.TopBarController
 import com.reactnativenavigation.viewcontrollers.stack.topbar.button.ButtonController
+import com.reactnativenavigation.viewcontrollers.stack.topbar.button.ButtonPresenter
 import com.reactnativenavigation.views.stack.StackLayout
 import com.reactnativenavigation.views.stack.topbar.TopBar
 import org.assertj.core.api.Java6Assertions.assertThat
 import org.junit.Test
-import java.util.*
 
 class TopBarControllerTest : BaseTest() {
     private lateinit var uut: TopBarController
@@ -34,10 +36,16 @@ class TopBarControllerTest : BaseTest() {
     private lateinit var textButton2: ButtonOptions
     private lateinit var componentButton: ButtonOptions
     private lateinit var animator: TopBarAnimator
+    private lateinit var leftButtonControllers: MutableMap<String,ButtonController>
+    private lateinit var rightButtonControllers:  MutableMap<String,ButtonController>
+
+
     private val topBar: View
         get() = uut.view
 
     override fun beforeEach() {
+        leftButtonControllers= mutableMapOf()
+        rightButtonControllers= mutableMapOf()
         activity = newActivity()
         animator = spy(TopBarAnimator())
         uut = createTopBarController()
@@ -48,68 +56,111 @@ class TopBarControllerTest : BaseTest() {
 
     @Test
     fun setButton_setsTextButton() {
-        uut.applyRightButtons(rightButtons(textButton1)!!)
-        uut.applyLeftButtons(leftButton(leftButton))
+        uut.applyRightButtonsOptions(rightButtonControllers, listOf(textButton1)){
+            createButtonController(it)
+        }
+        uut.applyLeftButtonsOptions(leftButtonControllers, listOf(leftButton)){
+            createButtonController(it)
+        }
         assertThat(uut.getRightButton(0).title.toString()).isEqualTo(textButton1.text.get())
     }
 
     @Test
     fun setButton_setsCustomButton() {
-        uut.applyLeftButtons(leftButton(leftButton))
-        uut.applyRightButtons(rightButtons(componentButton)!!)
+        uut.applyLeftButtonsOptions(leftButtonControllers, listOf(leftButton)){
+            createButtonController(it)
+        }
+        uut.applyRightButtonsOptions(rightButtonControllers, listOf(componentButton)){
+            createButtonController(it)
+        }
         val btnView = uut.getRightButton(0).actionView as ReactView
         assertThat(btnView.componentName).isEqualTo(componentButton.component.name.get())
     }
 
     @Test
     fun applyRightButtons_emptyButtonsListClearsRightButtons() {
-        uut.applyLeftButtons(leftButton(leftButton))
-        uut.applyRightButtons(rightButtons(componentButton, textButton1)!!)
-        uut.applyLeftButtons(leftButton(leftButton))
-        uut.applyRightButtons(ArrayList())
+        uut.applyLeftButtonsOptions(leftButtonControllers, listOf(leftButton)){
+            createButtonController(it)
+        }
+        uut.applyRightButtonsOptions(rightButtonControllers, listOf(componentButton, textButton1)){
+            createButtonController(it)
+        }
+        uut.applyLeftButtonsOptions(leftButtonControllers, listOf(leftButton)){
+            createButtonController(it)
+        }
+        uut.applyRightButtonsOptions(rightButtonControllers, listOf()){
+            createButtonController(it)
+        }
         assertThat(uut.rightButtonCount).isEqualTo(0)
     }
 
     @Test
     fun applyRightButtons_previousButtonsAreCleared() {
-        uut.applyRightButtons(rightButtons(textButton1, componentButton)!!)
+        uut.applyRightButtonsOptions(rightButtonControllers, listOf(textButton1, componentButton)){
+            createButtonController(it)
+        }
         assertThat(uut.rightButtonCount).isEqualTo(2)
-        uut.applyRightButtons(rightButtons(textButton2)!!)
+        uut.applyRightButtonsOptions(rightButtonControllers, listOf(textButton2)){
+            createButtonController(it)
+        }
         assertThat(uut.rightButtonCount).isEqualTo(1)
     }
 
     @Test
     fun applyRightButtons_buttonsAreAddedInReversedOrderToMatchOrderOnIOs() {
-        uut.applyLeftButtons(leftButton(leftButton))
-        uut.applyRightButtons(rightButtons(textButton1, componentButton)!!)
+        uut.applyLeftButtonsOptions(leftButtonControllers, listOf(leftButton)){
+            createButtonController(it)
+        }
+        uut.applyRightButtonsOptions(rightButtonControllers, listOf(textButton1, componentButton)){
+            createButtonController(it)
+        }
         assertThat(uut.getRightButton(1).title.toString()).isEqualTo(textButton1.text.get())
     }
 
     @Test
     fun applyRightButtons_componentButtonIsReapplied() {
-        val initialButtons = rightButtons(componentButton)
-        uut.applyRightButtons(initialButtons!!)
+        uut.applyRightButtonsOptions(rightButtonControllers, listOf( componentButton)){
+            createButtonController(it)
+        }
         assertThat(uut.getRightButton(0).itemId).isEqualTo(componentButton.intId)
-        uut.applyRightButtons(rightButtons(textButton1)!!)
+        uut.applyRightButtonsOptions(rightButtonControllers, listOf( textButton1)){
+            createButtonController(it)
+        }
         assertThat(uut.getRightButton(0).itemId).isEqualTo(textButton1.intId)
-        uut.applyRightButtons(initialButtons)
+        uut.applyRightButtonsOptions(rightButtonControllers, listOf( componentButton)){
+            createButtonController(it)
+        }
         assertThat(uut.getRightButton(0).itemId).isEqualTo(componentButton.intId)
     }
 
     @Test
-    fun mergeRightButtons_componentButtonIsNotAddedIfAlreadyAddedToMenu() {
-        val initialButtons = rightButtons(componentButton)
-        uut.applyRightButtons(initialButtons!!)
-        uut.mergeRightButtons(initialButtons, emptyList())
+    fun mergeRightButtonsOptions_componentButtonIsNotAddedIfAlreadyAddedToMenu() {
+        val controllers = mutableMapOf<String,ButtonController>()
+        uut.applyRightButtonsOptions(controllers, listOf(componentButton)){
+            createButtonController(it)
+        }
+        verify(controllers[componentButton.id]!!, times(1)).addToMenu(any(), any())
+        uut.mergeRightButtonsOptions(controllers, listOf(componentButton.copy())){
+            createButtonController(it)
+        }
+        verify(controllers[componentButton.id]!!, times(1)).addToMenu(any(), any())
     }
 
     @Test
     fun setLeftButtons_emptyButtonsListClearsLeftButton() {
-        uut.applyLeftButtons(leftButton(leftButton))
-        uut.applyRightButtons(rightButtons(componentButton)!!)
+        uut.applyLeftButtonsOptions(leftButtonControllers, listOf(leftButton)){
+            createButtonController(it)
+        }
+        uut.applyRightButtonsOptions(rightButtonControllers, listOf( componentButton)){
+            createButtonController(it)
+        }
         assertThat(uut.leftButtonCount).isNotZero()
-        uut.applyLeftButtons(emptyList())
-        uut.applyRightButtons(rightButtons(textButton1)!!)
+        uut.applyLeftButtonsOptions(leftButtonControllers, listOf()){
+            createButtonController(it)
+        }
+        uut.applyRightButtonsOptions(rightButtonControllers, listOf( textButton1)){
+            createButtonController(it)
+        }
         assertThat(uut.leftButtonCount).isZero()
     }
 
@@ -117,7 +168,9 @@ class TopBarControllerTest : BaseTest() {
     fun setLeftButtons_clearsBackButton() {
         uut.view.setBackButton(TitleBarHelper.createButtonController(activity, backButton))
         assertThat(uut.view.navigationIcon).isNotNull()
-        uut.applyLeftButtons(leftButton(leftButton))
+        uut.applyLeftButtonsOptions(leftButtonControllers, listOf(leftButton)){
+            createButtonController(it)
+        }
         assertThat(uut.view.navigationIcon).isNull()
     }
 
@@ -125,25 +178,35 @@ class TopBarControllerTest : BaseTest() {
     fun setLeftButtons_emptyButtonsListClearsBackButton() {
         uut.view.setBackButton(TitleBarHelper.createButtonController(activity, backButton))
         assertThat(uut.view.navigationIcon).isNotNull()
-        uut.applyLeftButtons(emptyList())
+        uut.applyLeftButtonsOptions(leftButtonControllers, listOf()){
+            createButtonController(it)
+        }
         assertThat(uut.view.navigationIcon).isNull()
     }
 
     @Test
     fun mergeLeftButtons_clearsBackButton() {
+        val controllers = mutableMapOf<String,ButtonController>()
         uut.view.setBackButton(TitleBarHelper.createButtonController(activity, backButton))
         assertThat(uut.view.navigationIcon).isNotNull()
-        uut.mergeLeftButtons(emptyList(), leftButton(leftButton))
+        uut.mergeLeftButtonsOptions(controllers, listOf(leftButton)){
+            createButtonController(it)
+        }
         assertThat(uut.view.navigationIcon).isNull()
     }
 
     @Test
     fun mergeLeftButtons_emptyButtonsListClearsBackButton() {
+        val controllers = mutableMapOf<String,ButtonController>()
+
         uut.view.setBackButton(TitleBarHelper.createButtonController(activity, backButton))
         assertThat(uut.view.navigationIcon).isNotNull()
-        val initialButtons = leftButton(leftButton)
-        uut.applyLeftButtons(initialButtons)
-        uut.mergeLeftButtons(initialButtons, emptyList())
+        uut.applyLeftButtonsOptions(controllers, listOf(leftButton)){
+            createButtonController(it)
+        }
+        uut.mergeLeftButtonsOptions(controllers, emptyList()){
+            createButtonController(it)
+        }
         assertThat(uut.view.navigationIcon).isNull()
     }
 
@@ -219,6 +282,128 @@ class TopBarControllerTest : BaseTest() {
         assertThat(result).isEqualTo(someAnimator)
     }
 
+    @Test
+    fun `mergeRightButtons - should add buttons`(){
+        val controllers = spy(LinkedHashMap<String,ButtonController>())
+        val controller = spy(ButtonController(activity, ButtonPresenter(activity, textButton1, IconResolverFake(activity)),
+            textButton1, TitleBarButtonCreatorMock(), object : ButtonController.OnClickListener {
+                override fun onPress(button: ButtonOptions) {
+
+                }
+
+            }))
+        uut.mergeRightButtonsOptions(controllers, listOf(textButton1)) {
+                controller
+        }
+        assertThat(uut.rightButtonCount).isEqualTo(1)
+        verify(controllers, never()).remove(any())
+        assertThat(controllers[textButton1.id]).isEqualTo(controller)
+    }
+    @Test
+    fun `mergeRightOptions - should destroy all buttons that was removed`(){
+       val componentButton2 = componentButton.copy()
+        componentButton2.component = ComponentOptions().apply {
+           this.name = componentButton.component.name
+           this.componentId = Text("CustomNewComponent")
+        }
+        uut.mergeRightButtonsOptions(rightButtonControllers, listOf(textButton1, textButton2, componentButton)) {
+            createButtonController(it)
+        }
+        val removedControllers = mutableMapOf<String, ButtonController>().apply {
+            putAll(rightButtonControllers)
+        }
+        uut.mergeRightButtonsOptions(rightButtonControllers, listOf(componentButton2)) {
+            createButtonController(it)
+        }
+        verify(removedControllers[textButton1.id]!!, times(1)).destroy()
+        verify(removedControllers[textButton2.id]!!, times(1)).destroy()
+        verify(removedControllers[componentButton.id]!!, times(1)).destroy()
+    }
+    @Test
+    fun `mergeRightButtons - should remove all and re-add buttons in case of reorder, without destroy`(){
+        uut.mergeRightButtonsOptions(rightButtonControllers, listOf(textButton1, textButton2)) {
+            createButtonController(it)
+        }
+        assertThat(uut.getRightButton(1).itemId ).isEqualTo(textButton1.intId)
+        assertThat(uut.getRightButton(0).itemId ).isEqualTo(textButton2.intId)
+        val removedControllers = mutableMapOf<String, ButtonController>().apply { putAll(rightButtonControllers) }
+        uut.mergeRightButtonsOptions(rightButtonControllers, listOf(textButton2.copy(), textButton1.copy())) {
+            createButtonController(it)
+        }
+        assertThat(uut.getRightButton(1).itemId ).isEqualTo(textButton2.intId)
+        assertThat(uut.getRightButton(0).itemId ).isEqualTo(textButton1.intId)
+
+        verify(removedControllers[textButton1.id]!!, never()).destroy()
+        verify(removedControllers[textButton2.id]!!, never()).destroy()
+
+        verify(rightButtonControllers[textButton1.id]!!, times(2)).addToMenu(any(), any())
+        verify(rightButtonControllers[textButton2.id]!!, times(2)).addToMenu(any(), any())
+    }
+    @Test
+    fun `mergeRightButtons - should rebuild menu when adding menu items, existing should not be destroyed`(){
+        val controllers = spy(LinkedHashMap<String,ButtonController>())
+        uut.mergeRightButtonsOptions(controllers, listOf(textButton1)) {
+            createButtonController(it)
+        }
+        assertThat(uut.rightButtonCount).isEqualTo(1)
+
+        uut.mergeRightButtonsOptions(controllers, listOf(textButton1, textButton2)) {
+            createButtonController(it)
+        }
+        assertThat(uut.rightButtonCount).isEqualTo(2)
+        verify(controllers, never()).remove(any())
+        verify(controllers[textButton1.id]!!, times(2)).addToMenu(any(), any())
+    }
+    @Test
+    fun `mergeRightButtons - should modify changed buttons`(){
+        val controllers = spy(LinkedHashMap<String,ButtonController>())
+        uut.mergeRightButtonsOptions(controllers, listOf(textButton1.apply {
+            this.enabled = Bool(true)
+        })) {
+            createButtonController(it)
+        }
+        assertThat(uut.rightButtonCount).isEqualTo(1)
+        verify(controllers[textButton1.id]!!, times(1)).addToMenu(any(), any())
+
+        uut.mergeRightButtonsOptions(controllers, listOf(textButton1.copy().apply { this.enabled= Bool(false) })) {
+            createButtonController(it)
+        }
+        verify(controllers, never()).remove(any())
+        verify(controllers[textButton1.id]!!, times(1)).mergeButtonOptions(any(), any())
+        verify(controllers[textButton1.id]!!, times(1)).addToMenu(any(), any())
+        verify(controllers[textButton1.id]!!, never()).destroy()
+    }
+
+    @Test
+    fun `mergeRightButtons - reorder of same menu items should rebuild menu, not view recreation`(){
+        val controllers = spy(LinkedHashMap<String,ButtonController>())
+        uut.mergeRightButtonsOptions(controllers, listOf(textButton1, textButton2)) {
+            createButtonController(it)
+        }
+        assertThat(uut.rightButtonCount).isEqualTo(2)
+        verify(controllers[textButton1.id]!!, times(1)).addToMenu(any(), any())
+        verify(controllers[textButton2.id]!!, times(1)).addToMenu(any(), any())
+
+        uut.mergeRightButtonsOptions(controllers, listOf(textButton2.copy(), textButton1.copy())) {
+            createButtonController(it)
+        }
+        verify(controllers[textButton1.id]!!, never()).mergeButtonOptions(any(), any())
+        verify(controllers[textButton2.id]!!, never()).mergeButtonOptions(any(), any())
+        verify(controllers[textButton1.id]!!, times(2)).addToMenu(any(), any())
+        verify(controllers[textButton2.id]!!, times(2)).addToMenu(any(), any())
+        verify(controllers[textButton1.id]!!, never()).destroy()
+        verify(controllers[textButton2.id]!!, never()).destroy()
+    }
+
+    private fun createButtonController(it: ButtonOptions) =
+        spy(ButtonController(activity, ButtonPresenter(activity, it, IconResolverFake(activity)),
+            it, TitleBarButtonCreatorMock(), object : ButtonController.OnClickListener {
+                override fun onPress(button: ButtonOptions) {
+
+                }
+
+            }))
+
     private fun createButtons() {
         leftButton = ButtonOptions()
         leftButton.id = Constants.BACK_BUTTON_ID
@@ -238,17 +423,10 @@ class TopBarControllerTest : BaseTest() {
         return button
     }
 
-    private fun leftButton(leftButton: ButtonOptions): List<ButtonController> {
-        return listOf(TitleBarHelper.createButtonController(activity, leftButton))
-    }
-
-    private fun rightButtons(vararg buttons: ButtonOptions): List<ButtonController>? {
-        return CollectionUtils.map(listOf(*buttons)) { button: ButtonOptions? -> TitleBarHelper.createButtonController(activity, button) }
-    }
-
     private fun createTopBarController() = spy(object : TopBarController(animator) {
         override fun createTopBar(context: Context, stackLayout: StackLayout): TopBar {
             return spy(super.createTopBar(context, stackLayout))
         }
     })
+
 }

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/viewcontroller/ViewControllerTest.java

@@ -31,6 +31,7 @@ import org.robolectric.Shadows;
 import java.lang.reflect.Field;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
@@ -51,7 +52,9 @@ public class ViewControllerTest extends BaseTest {
         activity = newActivity();
         childRegistry = new ChildControllersRegistry();
         uut = new SimpleViewController(activity, childRegistry, "uut", new Options());
-        uut.setParentController(mock(ParentController.class));
+        final ParentController<?> parent = mock(ParentController.class);
+        uut.setParentController(parent);
+        Mockito.when(parent.resolveChildOptions(any())).thenReturn(Options.EMPTY);
     }
 
     @Test

package/lib/android/app/src/test/java/com/reactnativenavigation/views/TitleAndButtonsContainerTest.kt

@@ -7,8 +7,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import android.widget.LinearLayout
-import com.nhaarman.mockitokotlin2.spy
-import com.nhaarman.mockitokotlin2.verify
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.verify
 import com.reactnativenavigation.BaseTest
 import com.reactnativenavigation.options.Alignment
 import com.reactnativenavigation.options.params.Colour

package/lib/android/app/src/test/java/com/reactnativenavigation/views/animations/BaseViewAnimatorTest.kt

@@ -2,14 +2,14 @@ package com.reactnativenavigation.views.animations
 
 import android.animation.Animator
 import android.view.View
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.spy
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.whenever
 import com.reactnativenavigation.BaseTest
 import com.reactnativenavigation.options.AnimationOptions
 import org.assertj.core.api.Java6Assertions.assertThat
 import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
 
 class BaseViewAnimatorTest : BaseTest() {
     private lateinit var uut: BaseViewAnimator<View>

package/lib/android/app/src/test/java/com/reactnativenavigation/views/bottomtabs/BottomTabsContainerTest.kt

@@ -6,7 +6,7 @@ import android.graphics.drawable.ColorDrawable
 import android.view.View
 import android.widget.LinearLayout
 import androidx.core.graphics.ColorUtils
-import com.nhaarman.mockitokotlin2.*
+import org.mockito.kotlin.*
 import com.reactnativenavigation.BaseTest
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test

package/lib/android/app/src/test/java/com/reactnativenavigation/views/bottomtabs/BottomTabsTest.kt

@@ -1,9 +1,9 @@
 package com.reactnativenavigation.views.bottomtabs
 
-import com.nhaarman.mockitokotlin2.never
-import com.nhaarman.mockitokotlin2.spy
-import com.nhaarman.mockitokotlin2.times
-import com.nhaarman.mockitokotlin2.verify
+import org.mockito.kotlin.never
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
 import com.reactnativenavigation.BaseTest
 import org.junit.Test
 

package/lib/dist/Mock/Application.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Application = void 0;
 const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
+const React = (0, tslib_1.__importStar)(require("react"));
 const react_native_1 = require("react-native");
 const connect_1 = require("./connect");
-exports.Application = connect_1.connect(class extends React.Component {
+exports.Application = (0, connect_1.connect)(class extends React.Component {
     constructor(props) {
         super(props);
         props.entryPoint();

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

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BottomTabs = void 0;
 const tslib_1 = require("tslib");
-const react_1 = tslib_1.__importStar(require("react"));
+const react_1 = (0, tslib_1.__importStar)(require("react"));
 const LayoutComponent_1 = require("./LayoutComponent");
 const connect_1 = require("../connect");
-exports.BottomTabs = connect_1.connect(class extends react_1.Component {
+exports.BottomTabs = (0, connect_1.connect)(class extends react_1.Component {
     render() {
         return this.props.layoutNode.children.map((child) => {
             return react_1.default.createElement(LayoutComponent_1.LayoutComponent, { key: child.nodeId, layoutNode: child });

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

@@ -2,14 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentScreen = void 0;
 const tslib_1 = require("tslib");
-const react_1 = tslib_1.__importStar(require("react"));
+const react_1 = (0, tslib_1.__importStar)(require("react"));
 const react_native_1 = require("react-native");
-const __1 = require("../..");
+const src_1 = require("../../src");
 const constants_1 = require("../constants");
 const LayoutStore_1 = require("../Stores/LayoutStore");
 const connect_1 = require("../connect");
 const TopBar_1 = require("./TopBar");
-exports.ComponentScreen = connect_1.connect(class extends react_1.Component {
+const EventsStore_1 = require("../Stores/EventsStore");
+const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+exports.ComponentScreen = (0, 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);
+        const Component = src_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/Components/LayoutComponent.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LayoutComponent = void 0;
 const tslib_1 = require("tslib");
-const react_1 = tslib_1.__importStar(require("react"));
+const react_1 = (0, tslib_1.__importStar)(require("react"));
 const react_native_1 = require("react-native");
 const BottomTabs_1 = require("./BottomTabs");
 const ComponentScreen_1 = require("./ComponentScreen");
 const Stack_1 = require("./Stack");
-exports.LayoutComponent = class extends react_1.Component {
+const LayoutComponent = class extends react_1.Component {
     render() {
         switch (this.props.layoutNode.type) {
             case 'BottomTabs':
@@ -20,3 +20,4 @@ exports.LayoutComponent = class extends react_1.Component {
         return react_1.default.createElement(react_native_1.View, null);
     }
 };
+exports.LayoutComponent = LayoutComponent;

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

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Modals = void 0;
 const tslib_1 = require("tslib");
-const react_1 = tslib_1.__importStar(require("react"));
+const react_1 = (0, tslib_1.__importStar)(require("react"));
 const react_native_1 = require("react-native");
 const LayoutComponent_1 = require("./LayoutComponent");
 const LayoutStore_1 = require("../Stores/LayoutStore");
 const connect_1 = require("../connect");
-exports.Modals = connect_1.connect(class extends react_1.Component {
+exports.Modals = (0, connect_1.connect)(class extends react_1.Component {
     render() {
         const children = LayoutStore_1.LayoutStore.getModals();
         return (react_1.default.createElement(react_native_1.View, { testID: 'MODALS' }, children.map((child) => {

package/lib/dist/Mock/Components/NavigationButton.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { OptionsTopBarButton } from '../../';
+import { OptionsTopBarButton } from '../../src';
 interface ButtonProps {
     button: OptionsTopBarButton;
     componentId: string;

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

@@ -2,15 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NavigationButton = void 0;
 const tslib_1 = require("tslib");
-const react_1 = tslib_1.__importStar(require("react"));
+const react_1 = (0, tslib_1.__importStar)(require("react"));
 const react_native_1 = require("react-native");
-const __1 = require("../../");
+const src_1 = require("../../src");
 const EventsStore_1 = require("../Stores/EventsStore");
-exports.NavigationButton = class extends react_1.Component {
-    constructor() {
-        super(...arguments);
-        this.ref = undefined;
-    }
+const NavigationButton = class extends react_1.Component {
+    ref = undefined;
     render() {
         const { button, componentId } = this.props;
         if (button.component)
@@ -26,8 +23,8 @@ exports.NavigationButton = class extends react_1.Component {
         //@ts-ignore
         const buttonComponentId = button.component.componentId;
         //@ts-ignore
-        const Component = __1.Navigation.mock.store.getComponentClassForName(button.component.name)();
-        const props = __1.Navigation.mock.store.getPropsForId(buttonComponentId);
+        const Component = src_1.Navigation.mock.store.getComponentClassForName(button.component.name)();
+        const props = src_1.Navigation.mock.store.getPropsForId(buttonComponentId);
         return (react_1.default.createElement(react_native_1.TouchableOpacity, { onPress: () => {
                 if (this.ref) {
                     // @ts-ignore
@@ -38,7 +35,7 @@ exports.NavigationButton = class extends react_1.Component {
                     componentId: componentId,
                 });
             }, testID: button.testID },
-            react_1.default.createElement(Component, Object.assign({ key: buttonComponentId }, props, { componentId: buttonComponentId, ref: (ref) => (this.ref = ref) }))));
+            react_1.default.createElement(Component, { key: buttonComponentId, ...props, componentId: buttonComponentId, ref: (ref) => (this.ref = ref) })));
     }
     invokeOnClick(stateNode) {
         if (stateNode.children) {
@@ -53,3 +50,4 @@ exports.NavigationButton = class extends react_1.Component {
         }
     }
 };
+exports.NavigationButton = NavigationButton;

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

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Overlays = void 0;
 const tslib_1 = require("tslib");
-const react_1 = tslib_1.__importStar(require("react"));
+const react_1 = (0, tslib_1.__importStar)(require("react"));
 const react_native_1 = require("react-native");
 const constants_1 = require("../constants");
 const LayoutComponent_1 = require("./LayoutComponent");
 const LayoutStore_1 = require("../Stores/LayoutStore");
 const connect_1 = require("../connect");
-exports.Overlays = connect_1.connect(class extends react_1.Component {
+exports.Overlays = (0, connect_1.connect)(class extends react_1.Component {
     render() {
         const children = LayoutStore_1.LayoutStore.getOverlays();
         return (react_1.default.createElement(react_native_1.View, { testID: constants_1.VISIBLE_OVERLAY_TEST_ID }, children.map((child) => {

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

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Stack = void 0;
 const tslib_1 = require("tslib");
-const react_1 = tslib_1.__importStar(require("react"));
+const react_1 = (0, tslib_1.__importStar)(require("react"));
 const LayoutComponent_1 = require("./LayoutComponent");
 const connect_1 = require("../connect");
-exports.Stack = connect_1.connect(class extends react_1.Component {
+exports.Stack = (0, connect_1.connect)(class extends react_1.Component {
     render() {
         const children = this.props.layoutNode.children;
         return children.map((child, i) => {