Send tabSelected events to Js only if tab was selected by user (#2158)

android/app/src/main/java/com/reactnativenavigation/layouts/BottomTabsLayout.java

@@ -344,7 +344,8 @@ public class BottomTabsLayout extends BaseLayout implements AHBottomNavigation.O
 
     public void selectBottomTabByTabIndex(Integer index) {
         if (bottomTabs.getCurrentItem() != index) {
-            bottomTabs.setCurrentItem(index);
+            bottomTabs.setCurrentItemWithoutInvokingTabSelectedListener(index);
+            switchTab(index, NavigationType.SwitchToTab);
         }
     }
 
@@ -478,13 +479,17 @@ public class BottomTabsLayout extends BaseLayout implements AHBottomNavigation.O
         }
 
         final int unselectedTabIndex = currentStackIndex;
-        hideCurrentStack();
-        showNewStack(position, NavigationType.BottomTabSelected);
-        EventBus.instance.post(new ScreenChangedEvent(getCurrentScreenStack().peek().getScreenParams()));
+        switchTab(position, NavigationType.BottomTabSelected);
         sendTabSelectedEventToJs(position, unselectedTabIndex);
         return true;
     }
 
+    private void switchTab(int position, NavigationType navigationType) {
+        hideCurrentStack();
+        showNewStack(position, navigationType);
+        EventBus.instance.post(new ScreenChangedEvent(getCurrentScreenStack().peek().getScreenParams()));
+    }
+
     private void sendTabSelectedEventToJs(int selectedTabIndex, int unselectedTabIndex) {
         String navigatorEventId = getCurrentScreenStack().peek().getNavigatorEventId();
         WritableMap data = createTabSelectedEventData(selectedTabIndex, unselectedTabIndex);

android/app/src/main/java/com/reactnativenavigation/screens/NavigationType.java

@@ -4,6 +4,7 @@ public enum NavigationType {
     Push,
     Pop,
     BottomTabSelected,
+    SwitchToTab,
     TopTabSelected,
     InitialScreen,
     ShowModal,

android/app/src/main/java/com/reactnativenavigation/views/BottomTabs.java

@@ -96,6 +96,10 @@ public class BottomTabs extends AHBottomNavigation {
         }
     }
 
+    public void setCurrentItemWithoutInvokingTabSelectedListener(Integer index) {
+        setCurrentItem(index, false);
+    }
+
     private void setBackgroundColor(StyleParams.Color bottomTabsColor) {
         if (bottomTabsColor.hasColor()) {
             if (bottomTabsColor.getColor() != getDefaultBackgroundColor()) {