On tab press event (#5880)

* Open modal from tab iOS * Open modal from tab Android * Remove playground changes Co-authored-by: Yogev Ben David <[email protected]>
wix · Jan 28, 2020 · b153142 · b153142
1 parent 8a1bfe7
commit b153142
Show file tree

Hide file tree

Showing 15 changed files with 257 additions and 70 deletions.
diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/parse/BottomTabOptions.java b/lib/android/app/src/main/java/com/reactnativenavigation/parse/BottomTabOptions.java
@@ -42,6 +42,8 @@ public static BottomTabOptions parse(TypefaceLoader typefaceManager, JSONObject
         options.fontSize = NumberParser.parse(json, "fontSize");
         options.selectedFontSize = NumberParser.parse(json, "selectedFontSize");
         options.dotIndicator = DotIndicatorOptions.parse(json.optJSONObject("dotIndicator"));
+        options.selectTabOnPress = BoolParser.parse(json, "selectTabOnPress");
+
         return options;
     }
 
@@ -59,6 +61,7 @@ public static BottomTabOptions parse(TypefaceLoader typefaceManager, JSONObject
     public DotIndicatorOptions dotIndicator = new DotIndicatorOptions();
     public Number fontSize = new NullNumber();
     public Number selectedFontSize = new NullNumber();
+    public Bool selectTabOnPress = new NullBool();
     @Nullable public Typeface fontFamily;
 
 
@@ -78,6 +81,7 @@ void mergeWith(final BottomTabOptions other) {
         if (other.selectedFontSize.hasValue()) selectedFontSize = other.selectedFontSize;
         if (other.fontFamily != null) fontFamily = other.fontFamily;
         if (other.dotIndicator.hasValue()) dotIndicator = other.dotIndicator;
+        if (other.selectTabOnPress.hasValue()) selectTabOnPress = other.selectTabOnPress;
     }
 
     void mergeWithDefault(final BottomTabOptions defaultOptions) {
@@ -96,5 +100,6 @@ void mergeWithDefault(final BottomTabOptions defaultOptions) {
         if (fontFamily == null) fontFamily = defaultOptions.fontFamily;
         if (!testId.hasValue()) testId = defaultOptions.testId;
         if (!dotIndicator.hasValue()) dotIndicator = defaultOptions.dotIndicator;
+        if (!selectTabOnPress.hasValue()) selectTabOnPress = defaultOptions.selectTabOnPress;
     }
 }
diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/react/events/EventEmitter.java b/lib/android/app/src/main/java/com/reactnativenavigation/react/events/EventEmitter.java
@@ -15,6 +15,7 @@ public class EventEmitter {
     private static final String AppLaunched = "RNN.AppLaunched";
     private static final String CommandCompleted = "RNN.CommandCompleted";
     private static final String BottomTabSelected = "RNN.BottomTabSelected";
+    private static final String BottomTabPressed = "RNN.BottomTabPressed";
     private static final String ComponentDidAppear = "RNN.ComponentDidAppear";
     private static final String ComponentDidDisappear = "RNN.ComponentDidDisappear";
     private static final String NavigationButtonPressed = "RNN.NavigationButtonPressed";
@@ -61,6 +62,12 @@ public void emitBottomTabSelected(int unselectedTabIndex, int selectedTabIndex)
         emit(BottomTabSelected, event);
     }
 
+    public void emitBottomTabPressed(int tabIndex) {
+        WritableMap event = Arguments.createMap();
+        event.putInt("tabIndex", tabIndex);
+        emit(BottomTabPressed, event);
+    }
+
     public void emitCommandCompleted(String commandName, String commandId, long completionTime) {
         WritableMap event = Arguments.createMap();
         event.putString("commandName", commandName);

diff --git a/.../main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsController.java b/.../main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsController.java
@@ -144,10 +144,18 @@ protected ViewController getCurrentChild() {
 
     @Override
     public boolean onTabSelected(int index, boolean wasSelected) {
-        eventEmitter.emitBottomTabSelected(bottomTabs.getCurrentItem(), index);
-        if (wasSelected) return false;
-        selectTab(index);
-        return false;
+        BottomTabOptions options = tabs.get(index).resolveCurrentOptions().bottomTabOptions;
+
+        eventEmitter.emitBottomTabPressed(index);
+
+        if (options.selectTabOnPress.get(true)){
+            eventEmitter.emitBottomTabSelected(bottomTabs.getCurrentItem(), index);
+            if (wasSelected) return false;
+            selectTab(index);
+            return false;
+        } else {
+            return false;
+        }
 	}
 
 	private List<AHBottomNavigationItem> createTabs() {

diff --git a/lib/ios/RNNBottomTabOptions.h b/lib/ios/RNNBottomTabOptions.h
@@ -21,6 +21,7 @@
 @property(nonatomic, strong) Color *textColor;
 @property(nonatomic, strong) Number *fontSize;
 @property(nonatomic, strong) Bool *visible;
+@property(nonatomic, strong) Bool *selectTabOnPress;
 
 
 @end
diff --git a/lib/ios/RNNBottomTabOptions.m b/lib/ios/RNNBottomTabOptions.m
@@ -27,6 +27,7 @@ - (instancetype)initWithDict:(NSDictionary *)dict {
     self.textColor = [ColorParser parse:dict key:@"textColor"];
     self.fontSize = [NumberParser parse:dict key:@"fontSize"];
     self.visible = [BoolParser parse:dict key:@"visible"];
+    self.selectTabOnPress = [BoolParser parse:dict key:@"selectTabOnPress"];
 
     return self;
 }

diff --git a/lib/ios/RNNBottomTabsController.m b/lib/ios/RNNBottomTabsController.m
@@ -79,4 +79,16 @@ - (void)handleLongPress:(UILongPressGestureRecognizer *) recognizer {
     }
 }
 
+- (BOOL)tabBarController:(UITabBarController *)tabBarController shouldSelectViewController:(UIViewController *)viewController
+{
+    NSUInteger _index = [tabBarController.viewControllers indexOfObject:viewController];
+    [self.eventEmitter sendBottomTabPressed:@(_index)];
+
+    if([[viewController resolveOptions].bottomTab.selectTabOnPress getWithDefaultValue:YES]){
+        return YES;
+    }
+
+    return NO;
+}
+
 @end
diff --git a/lib/ios/RNNButtonOptions.h b/lib/ios/RNNButtonOptions.h
@@ -11,5 +11,6 @@
 @property (nonatomic, strong) Image* icon;
 @property (nonatomic, strong) Bool* enabled;
 @property (nonatomic, strong) RNNInsetsOptions* iconInsets;
+@property(nonatomic, strong) Bool *selectTabOnPress;
 
 @end
diff --git a/lib/ios/RNNButtonOptions.m b/lib/ios/RNNButtonOptions.m
@@ -13,7 +13,8 @@ - (instancetype)initWithDict:(NSDictionary *)dict {
 	self.icon = [ImageParser parse:dict key:@"icon"];
 	self.iconInsets = [[RNNInsetsOptions alloc] initWithDict:dict[@"iconInsets"]];
 	self.enabled = [BoolParser parse:dict key:@"enabled"];
-
+	self.selectTabOnPress = [BoolParser parse:dict key:@"selectTabOnPress"];
+
 
 	return self;
 }

diff --git a/lib/ios/RNNEventEmitter.h b/lib/ios/RNNEventEmitter.h
@@ -30,5 +30,7 @@
 
 - (void)sendScreenPoppedEvent:(NSString *)componentId;
 
+- (void)sendBottomTabPressed:(NSNumber *)tabIndex;
+
 
 @end
diff --git a/lib/ios/RNNEventEmitter.m b/lib/ios/RNNEventEmitter.m
@@ -21,12 +21,14 @@ @implementation RNNEventEmitter {
 static NSString* const SearchBarCancelPressed 	= @"RNN.SearchBarCancelPressed";
 static NSString* const PreviewCompleted         = @"RNN.PreviewCompleted";
 static NSString* const ScreenPopped             = @"RNN.ScreenPopped";
+static NSString* const BottomTabPressed         = @"RNN.BottomTabPressed";
 
 -(NSArray<NSString *> *)supportedEvents {
 	return @[AppLaunched,
 			 CommandCompleted,
 			 BottomTabSelected,
        BottomTabLongPressed,
+       BottomTabPressed,
 			 ComponentDidAppear,
 			 ComponentDidDisappear,
 			 NavigationButtonPressed,
@@ -84,6 +86,12 @@ - (void)sendBottomTabLongPressed:(NSNumber *)selectedTabIndex {
                                         				  }];
 }
 
+-(void)sendBottomTabPressed:(NSNumber *)tabIndex {
+    [self send:BottomTabPressed body:@{
+                                        @"tabIndex": tabIndex
+                                        }];
+}
+
 -(void)sendOnNavigationCommandCompletion:(NSString *)commandName commandId:(NSString *)commandId params:(NSDictionary*)params {
 	[self send:CommandCompleted body:@{
 									   @"commandId":commandId,

diff --git a/lib/src/adapters/NativeEventsReceiver.ts b/lib/src/adapters/NativeEventsReceiver.ts
@@ -1,4 +1,9 @@
-import { NativeModules, NativeEventEmitter, EventEmitter, EmitterSubscription } from 'react-native';
+import {
+  NativeModules,
+  NativeEventEmitter,
+  EventEmitter,
+  EmitterSubscription
+} from 'react-native';
 import {
   ComponentDidAppearEvent,
   ComponentDidDisappearEvent,
@@ -10,7 +15,12 @@ import {
   ScreenPoppedEvent,
   ModalAttemptedToDismissEvent
 } from '../interfaces/ComponentEvents';
-import { CommandCompletedEvent, BottomTabSelectedEvent, BottomTabLongPressedEvent } from '../interfaces/Events';
+import {
+  CommandCompletedEvent,
+  BottomTabSelectedEvent,
+  BottomTabLongPressedEvent,
+  BottomTabPressedEvent
+} from '../interfaces/Events';
 
 export class NativeEventsReceiver {
   private emitter: EventEmitter;
@@ -20,65 +30,97 @@ export class NativeEventsReceiver {
     try {
       this.emitter = new NativeEventEmitter(NativeModules.RNNEventEmitter);
     } catch (e) {
-      this.emitter = {
+      this.emitter = ({
         addListener: () => {
           return {
             remove: () => undefined
           };
         }
-      } as any as EventEmitter;
+      } as any) as EventEmitter;
     }
   }
 
-  public registerAppLaunchedListener(callback: () => void): EmitterSubscription {
+  public registerAppLaunchedListener(
+    callback: () => void
+  ): EmitterSubscription {
     return this.emitter.addListener('RNN.AppLaunched', callback);
   }
 
-  public registerComponentDidAppearListener(callback: (event: ComponentDidAppearEvent) => void): EmitterSubscription {
+  public registerComponentDidAppearListener(
+    callback: (event: ComponentDidAppearEvent) => void
+  ): EmitterSubscription {
     return this.emitter.addListener('RNN.ComponentDidAppear', callback);
   }
 
-  public registerComponentDidDisappearListener(callback: (event: ComponentDidDisappearEvent) => void): EmitterSubscription {
+  public registerComponentDidDisappearListener(
+    callback: (event: ComponentDidDisappearEvent) => void
+  ): EmitterSubscription {
     return this.emitter.addListener('RNN.ComponentDidDisappear', callback);
   }
 
-  public registerNavigationButtonPressedListener(callback: (event: NavigationButtonPressedEvent) => void): EmitterSubscription {
+  public registerNavigationButtonPressedListener(
+    callback: (event: NavigationButtonPressedEvent) => void
+  ): EmitterSubscription {
     return this.emitter.addListener('RNN.NavigationButtonPressed', callback);
   }
 
-  public registerModalDismissedListener(callback: (event: ModalDismissedEvent) => void): EmitterSubscription {
+  public registerBottomTabPressedListener(
+    callback: (data: BottomTabPressedEvent) => void
+  ): EmitterSubscription {
+    return this.emitter.addListener('RNN.BottomTabPressed', callback);
+  }
+
+  public registerModalDismissedListener(
+    callback: (event: ModalDismissedEvent) => void
+  ): EmitterSubscription {
     return this.emitter.addListener('RNN.ModalDismissed', callback);
   }
 
-  public registerModalAttemptedToDismissListener(callback: (event: ModalAttemptedToDismissEvent) => void): EmitterSubscription {
+  public registerModalAttemptedToDismissListener(
+    callback: (event: ModalAttemptedToDismissEvent) => void
+  ): EmitterSubscription {
     return this.emitter.addListener('RNN.ModalAttemptedToDismiss', callback);
   }
 
-  public registerSearchBarUpdatedListener(callback: (event: SearchBarUpdatedEvent) => void): EmitterSubscription {
+  public registerSearchBarUpdatedListener(
+    callback: (event: SearchBarUpdatedEvent) => void
+  ): EmitterSubscription {
     return this.emitter.addListener('RNN.SearchBarUpdated', callback);
   }
 
-  public registerSearchBarCancelPressedListener(callback: (event: SearchBarCancelPressedEvent) => void): EmitterSubscription {
+  public registerSearchBarCancelPressedListener(
+    callback: (event: SearchBarCancelPressedEvent) => void
+  ): EmitterSubscription {
     return this.emitter.addListener('RNN.SearchBarCancelPressed', callback);
   }
 
-  public registerPreviewCompletedListener(callback: (event: PreviewCompletedEvent) => void): EmitterSubscription {
+  public registerPreviewCompletedListener(
+    callback: (event: PreviewCompletedEvent) => void
+  ): EmitterSubscription {
     return this.emitter.addListener('RNN.PreviewCompleted', callback);
   }
 
-  public registerCommandCompletedListener(callback: (data: CommandCompletedEvent) => void): EmitterSubscription {
+  public registerCommandCompletedListener(
+    callback: (data: CommandCompletedEvent) => void
+  ): EmitterSubscription {
     return this.emitter.addListener('RNN.CommandCompleted', callback);
   }
 
-  public registerBottomTabSelectedListener(callback: (data: BottomTabSelectedEvent) => void): EmitterSubscription {
+  public registerBottomTabSelectedListener(
+    callback: (data: BottomTabSelectedEvent) => void
+  ): EmitterSubscription {
     return this.emitter.addListener('RNN.BottomTabSelected', callback);
   }
 
-  public registerBottomTabLongPressedListener(callback: (data: BottomTabLongPressedEvent) => void): EmitterSubscription {
+  public registerBottomTabLongPressedListener(
+    callback: (data: BottomTabLongPressedEvent) => void
+  ): EmitterSubscription {
     return this.emitter.addListener('RNN.BottomTabLongPressed', callback);
   }
 
-  public registerScreenPoppedListener(callback: (event: ScreenPoppedEvent) => void): EmitterSubscription {
+  public registerScreenPoppedListener(
+    callback: (event: ScreenPoppedEvent) => void
+  ): EmitterSubscription {
     return this.emitter.addListener('RNN.ScreenPopped', callback);
   }
 }