Consume currentTabId and currentTabIndex after they are applied (#6169)

If currentTabId or currentTabIndex were declared in default options - the specified tab was reselected each time options were applied. Co-authored-by: Yogev Ben David <[email protected]>
wix · Apr 28, 2020 · 3e5be29 · 3e5be29
1 parent 3828b51
commit 3e5be29
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 3 deletions.
diff --git a/...android/app/src/main/java/com/reactnativenavigation/presentation/BottomTabsPresenter.java b/...android/app/src/main/java/com/reactnativenavigation/presentation/BottomTabsPresenter.java
@@ -124,12 +124,18 @@ private void applyBottomTabsOptions(Options options) {
         bottomTabs.setBackgroundColor(bottomTabsOptions.backgroundColor.get(Color.WHITE));
         if (bottomTabsOptions.currentTabIndex.hasValue()) {
             int tabIndex = bottomTabsOptions.currentTabIndex.get();
-            if (tabIndex >= 0) tabSelector.selectTab(tabIndex);
+            if (tabIndex >= 0) {
+                bottomTabsOptions.currentTabIndex.consume();
+                tabSelector.selectTab(tabIndex);
+            }
         }
         if (bottomTabsOptions.testId.hasValue()) bottomTabs.setTag(bottomTabsOptions.testId.get());
         if (bottomTabsOptions.currentTabId.hasValue()) {
             int tabIndex = bottomTabFinder.findByControllerId(bottomTabsOptions.currentTabId.get());
-            if (tabIndex >= 0) tabSelector.selectTab(tabIndex);
+            if (tabIndex >= 0) {
+                bottomTabsOptions.currentTabId.consume();
+                tabSelector.selectTab(tabIndex);
+            }
         }
         if (bottomTabsOptions.visible.isTrueOrUndefined()) {
             if (bottomTabsOptions.animate.isTrueOrUndefined()) {

diff --git a/.../app/src/test/java/com/reactnativenavigation/viewcontrollers/BottomTabsPresenterTest.java b/.../app/src/test/java/com/reactnativenavigation/viewcontrollers/BottomTabsPresenterTest.java
@@ -8,6 +8,8 @@
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Colour;
+import com.reactnativenavigation.parse.params.Number;
+import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.presentation.BottomTabsPresenter;
 import com.reactnativenavigation.viewcontrollers.bottomtabs.TabSelector;
 import com.reactnativenavigation.views.BottomTabs;
@@ -20,6 +22,7 @@
 
 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;
 import static org.mockito.Mockito.verify;
@@ -30,6 +33,7 @@ public class BottomTabsPresenterTest extends BaseTest {
     private BottomTabsPresenter uut;
     private BottomTabs bottomTabs;
     private BottomTabsAnimator animator;
+    private TabSelector tabSelector;
 
     @Override
     public void beforeEach() {
@@ -41,7 +45,8 @@ public void beforeEach() {
         uut = new BottomTabsPresenter(tabs, new Options());
         bottomTabs = Mockito.mock(BottomTabs.class);
         animator = spy(new BottomTabsAnimator(bottomTabs));
-        uut.bindView(bottomTabs, Mockito.mock(TabSelector.class), animator);
+        tabSelector = mock(TabSelector.class);
+        uut.bindView(bottomTabs, tabSelector, animator);
     }
 
     @Test
@@ -71,4 +76,30 @@ public void mergeChildOptions_visibilityIsAppliedOnlyIsChildIsShown() {
         uut.mergeChildOptions(options, tabs.get(0));
         verify(animator).hide(any());
     }
+
+    @Test
+    public void applyChildOptions_currentTabIndexIsConsumedAfterApply() {
+        Options defaultOptions = new Options();
+        defaultOptions.bottomTabsOptions.currentTabIndex = new Number(1);
+        uut.setDefaultOptions(defaultOptions);
+
+        uut.applyChildOptions(Options.EMPTY, tabs.get(0));
+        verify(tabSelector).selectTab(1);
+
+        uut.applyChildOptions(Options.EMPTY, tabs.get(0));
+        verifyNoMoreInteractions(tabSelector);
+    }
+
+    @Test
+    public void applyChildOptions_currentTabIdIsConsumedAfterApply() {
+        Options defaultOptions = new Options();
+        defaultOptions.bottomTabsOptions.currentTabId = new Text(tabs.get(1).getId());
+        uut.setDefaultOptions(defaultOptions);
+
+        uut.applyChildOptions(Options.EMPTY, tabs.get(0));
+        verify(tabSelector).selectTab(1);
+
+        uut.applyChildOptions(Options.EMPTY, tabs.get(0));
+        verifyNoMoreInteractions(tabSelector);
+    }
 }