Emit bottom tab events on back navigation on Android

wix · Jun 21, 2024 · 97ad0fb · 97ad0fb
1 parent 6439f68
commit 97ad0fb
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.../main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsController.java b/.../main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsController.java
@@ -164,15 +164,18 @@ public boolean handleBack(CommandListener listener) {
         final boolean childBack = !tabs.isEmpty() && tabs.get(bottomTabs.getCurrentItem()).handleBack(listener);
         final Options options = resolveCurrentOptions();
         if (!childBack) {
+            final int oldTabIndex = bottomTabs.getCurrentItem();
             if (options.hardwareBack.getBottomTabOnPress() instanceof HwBackBottomTabsBehaviour.PrevSelection) {
                 if (!selectionStack.isEmpty()) {
                     final int prevSelectedTabIndex = selectionStack.poll();
                     selectTab(prevSelectedTabIndex, false);
+                    eventEmitter.emitBottomTabSelected(oldTabIndex, prevSelectedTabIndex);
                     return true;
                 }
             } else if (options.hardwareBack.getBottomTabOnPress() instanceof HwBackBottomTabsBehaviour.JumpToFirst) {
                 if (getSelectedIndex() != 0) {
                     selectTab(0, false);
+                    eventEmitter.emitBottomTabSelected(oldTabIndex, 0);
                     return true;
                 } else {
                     return false;