Fix crash when pushing into a stack located in BottomTabs

e2e/ScreenStack.test.js

@@ -82,6 +82,14 @@ describe('screen stack', () => {
     await expect(elementById(testIDs.TOP_BAR_ELEMENT)).toBeVisible();
   });
 
+  it('push into a stack from BottomTabs', async () => {
+    await elementById(testIDs.TAB_BASED_APP_BUTTON).tap();
+    await elementById(testIDs.PUSH_BUTTON).tap();
+    await expect(elementByLabel('Pushed Screen')).toBeVisible();
+    await elementById(testIDs.POP_BUTTON).tap();
+    await expect(elementByLabel('This is tab 1')).toBeVisible();
+  });
+
   it(':ios: set stack root component should be first in stack', async () => {
     await elementById(testIDs.PUSH_BUTTON).tap();
     await expect(elementByLabel('Stack Position: 1')).toBeVisible();

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ComponentViewController.java

@@ -62,7 +62,7 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
 
     @Override
     public void mergeOptions(Options options) {
-        applyOnParentController(parentController -> parentController.mergeChildOptions(options, view));
+        applyOnParentController(parentController -> parentController.mergeChildOptions(options, getView()));
         super.mergeOptions(options);
     }
 

lib/android/app/src/test/java/com/reactnativenavigation/mocks/SimpleViewController.java

@@ -45,7 +45,7 @@ public class SimpleViewController extends ChildController<SimpleViewController.S
 
     @Override
     public void mergeOptions(Options options) {
-        applyOnParentController(parentController -> parentController.mergeChildOptions(options, view));
+        applyOnParentController(parentController -> parentController.mergeChildOptions(options, getView()));
         super.mergeOptions(options);
     }
 

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/BottomTabsControllerTest.java

@@ -47,7 +47,7 @@ public class BottomTabsControllerTest extends BaseTest {
     private ViewController child1;
     private ViewController child2;
     private ViewController child3;
-    private ViewController child4;
+    private StackController child4;
     private ViewController child5;
     private Options tabOptions = OptionHelper.createBottomTabOptions();
     private ImageLoader imageLoaderMock = ImageLoaderMock.mock();
@@ -64,7 +64,7 @@ public class BottomTabsControllerTest extends BaseTest {
         child1 = spy(new SimpleViewController(activity, childRegistry, "child1", tabOptions));
         child2 = spy(new SimpleViewController(activity, childRegistry, "child2", tabOptions));
         child3 = spy(new SimpleViewController(activity, childRegistry, "child3", tabOptions));
-        child4 = spy(new SimpleViewController(activity, childRegistry, "child4", tabOptions));
+        child4 = spy(createStack("someStack"));
         child5 = spy(new SimpleViewController(activity, childRegistry, "child5", tabOptions));
         when(child5.handleBack(any())).thenReturn(true);
         tabs = createTabs();
@@ -214,6 +214,20 @@ public class BottomTabsControllerTest extends BaseTest {
         verify(child5, times(1)).sendOnNavigationButtonPressed("btn1");
     }
 
+    @Test
+    public void push() {
+        uut.selectTab(3);
+
+        SimpleViewController stackChild = new SimpleViewController(activity, childRegistry, "stackChild", new Options());
+        SimpleViewController stackChild2 = new SimpleViewController(activity, childRegistry, "stackChild", new Options());
+        disablePushAnimation(stackChild, stackChild2);
+
+        child4.push(stackChild, new CommandListenerAdapter());
+        assertThat(child4.size()).isOne();
+        child4.push(stackChild2, new CommandListenerAdapter());
+        assertThat(child4.size()).isEqualTo(2);
+    }
+
     @NonNull
     private List<ViewController> createTabs() {
         return Arrays.asList(child1, child2, child3, child4, child5);

playground/src/screens/TextScreen.js

@@ -32,11 +32,20 @@ class TextScreen extends Component {
         <Button title='Show Tab Bar' testID={testIDs.SHOW_BOTTOM_TABS_BUTTON} onPress={() => this.hideTabBar(true)} />
         <Button title='Show Left Side Menu' testID={testIDs.SHOW_LEFT_SIDE_MENU_BUTTON} onPress={() => this.showSideMenu('left')} />
         <Button title='Show Right Side Menu' testID={testIDs.SHOW_RIGHT_SIDE_MENU_BUTTON} onPress={() => this.showSideMenu('right')} />
+        <Button title='Push' testID={testIDs.PUSH_BUTTON} onPress={this.onClickPush} />
         <Button title='Pop' testID={testIDs.POP_BUTTON} onPress={this.onClickPop} />
       </View>
     );
   }
 
+  onClickPush = async () => {
+    await Navigation.push(this.props.componentId, {
+      component: {
+        name: 'navigation.playground.PushedScreen'
+      }
+    });
+  }
+
   onClickPop = async () => {
     await Navigation.pop(this.props.componentId);
   }