merged

android/app/src/main/java/com/reactnativenavigation/bridge/NavigationReactModule.java

@@ -8,10 +8,12 @@ import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.reactnativenavigation.controllers.NavigationCommandsHandler;
 import com.reactnativenavigation.params.ContextualMenuParams;
+import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.SnackbarParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.params.parsers.ContextualMenuParamsParser;
+import com.reactnativenavigation.params.parsers.FabParamsParser;
 import com.reactnativenavigation.params.parsers.SnackbarParamsParser;
 import com.reactnativenavigation.params.parsers.TitleBarButtonParamsParser;
 import com.reactnativenavigation.params.parsers.TitleBarLeftButtonParamsParser;
@@ -70,15 +72,17 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void setScreenTitleBarButtons(String screenInstanceId, String navigatorEventId,
-                                         ReadableArray rightButtonsParams, ReadableMap leftButtonParams) {
+    public void setScreenButtons(String screenInstanceId, String navigatorEventId,
+                                 ReadableArray rightButtonsParams, ReadableMap leftButtonParams, ReadableMap fab) {
         if (rightButtonsParams != null) {
             setScreenTitleBarRightButtons(screenInstanceId, navigatorEventId, rightButtonsParams);
         }
-
         if (leftButtonParams != null) {
             setScreenTitleBarLeftButton(screenInstanceId, navigatorEventId, leftButtonParams);
         }
+        if (fab != null) {
+            setScreenFab(screenInstanceId, navigatorEventId, fab);
+        }
     }
 
     private void setScreenTitleBarRightButtons(String screenInstanceId, String navigatorEventId, ReadableArray rightButtonsParams) {
@@ -93,6 +97,11 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
         NavigationCommandsHandler.setScreenTitleBarLeftButtons(screenInstanceId, navigatorEventId, leftButton);
     }
 
+    private void setScreenFab(String screenInstanceId, String navigatorEventId, ReadableMap fab) {
+        FabParams fabParams = new FabParamsParser().parse(BundleConverter.toBundle(fab), navigatorEventId);
+        NavigationCommandsHandler.setScreenFab(screenInstanceId, navigatorEventId, fabParams);
+    }
+
     @ReactMethod
     public void setBottomTabBadgeByIndex(Integer index, String badge) {
         NavigationCommandsHandler.setBottomTabBadgeByIndex(index, badge);

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java

@@ -24,6 +24,7 @@ import com.reactnativenavigation.layouts.LayoutFactory;
 import com.reactnativenavigation.params.ActivityParams;
 import com.reactnativenavigation.params.AppStyle;
 import com.reactnativenavigation.params.ContextualMenuParams;
+import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.SnackbarParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
@@ -254,6 +255,10 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         modalController.setTitleBarLeftButton(screenInstanceId, navigatorEventId, titleBarLeftButton);
     }
 
+    void setScreenFab(String screenInstanceId, String navigatorEventId, FabParams fab) {
+        layout.setFab(screenInstanceId, navigatorEventId, fab);
+    }
+
     public void toggleSideMenuVisible(boolean animated, Side side) {
         layout.toggleSideMenuVisible(animated, side);
     }

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationCommandsHandler.java

@@ -7,6 +7,7 @@ import com.facebook.react.bridge.Callback;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.params.ActivityParams;
 import com.reactnativenavigation.params.ContextualMenuParams;
+import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.SnackbarParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
@@ -210,6 +211,19 @@ public class NavigationCommandsHandler {
         });
     }
 
+    public static void setScreenFab(final String screenInstanceId, final String navigatorEventId, final FabParams fab) {
+        final NavigationActivity currentActivity = NavigationActivity.currentActivity;
+        if (currentActivity == null) {
+            return;
+        }
+        NavigationApplication.instance.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                currentActivity.setScreenFab(screenInstanceId, navigatorEventId, fab);
+            }
+        });
+    }
+
     public static void dismissTopModal() {
         final NavigationActivity currentActivity = NavigationActivity.currentActivity;
         if (currentActivity == null) {

android/app/src/main/java/com/reactnativenavigation/events/FabSetEvent.java

@@ -0,0 +1,18 @@
+package com.reactnativenavigation.events;
+
+import com.reactnativenavigation.params.FabParams;
+
+public class FabSetEvent implements Event {
+    public static final String TYPE = "FabSetEvent";
+
+    public FabParams fabParams;
+
+    public FabSetEvent(FabParams fabParams) {
+        this.fabParams = fabParams;
+    }
+
+    @Override
+    public String getType() {
+        return TYPE;
+    }
+}

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

@@ -7,12 +7,15 @@ import android.view.View;
 import android.widget.RelativeLayout;
 
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.WritableMap;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.events.EventBus;
 import com.reactnativenavigation.events.ScreenChangedEvent;
 import com.reactnativenavigation.params.ActivityParams;
 import com.reactnativenavigation.params.ContextualMenuParams;
+import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.SideMenuParams;
 import com.reactnativenavigation.params.SnackbarParams;
@@ -178,6 +181,13 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
         }
     }
 
+    @Override
+    public void setFab(String screenInstanceId, String navigatorEventId, FabParams fabParams) {
+        for (int i = 0; i < bottomTabs.getItemsCount(); i++) {
+            screenStacks[i].setFab(screenInstanceId, navigatorEventId, fabParams);
+        }
+    }
+
     @Override
     public void toggleSideMenuVisible(boolean animated, Side side) {
         if (sideMenu != null) {
@@ -290,9 +300,16 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
         hideCurrentStack();
         showNewStack(position);
         EventBus.instance.post(new ScreenChangedEvent(getCurrentScreenStack().peek().getScreenParams()));
+        sendTabSelectedEventToJs();
         return true;
     }
 
+    private void sendTabSelectedEventToJs() {
+        WritableMap data = Arguments.createMap();
+        String navigatorEventId = getCurrentScreenStack().peek().getNavigatorEventId();
+        NavigationApplication.instance.getEventEmitter().sendNavigatorEvent("bottomTabSelected", navigatorEventId, data);
+    }
+
     private void showNewStack(int position) {
         showStackAndUpdateStyle(screenStacks[position]);
         currentStackIndex = position;

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

@@ -4,6 +4,7 @@ import android.view.View;
 
 import com.facebook.react.bridge.Callback;
 import com.reactnativenavigation.params.ContextualMenuParams;
+import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.SnackbarParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
@@ -26,6 +27,8 @@ public interface Layout extends ScreenStackContainer {
 
     void setTitleBarLeftButton(String screenInstanceId, String navigatorEventId, TitleBarLeftButtonParams titleBarLeftButtonParams);
 
+    void setFab(String screenInstanceId, String navigatorEventId, FabParams fabParams);
+
     void toggleSideMenuVisible(boolean animated, Side side);
 
     void setSideMenuVisible(boolean animated, boolean visible, Side side);

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

@@ -10,6 +10,7 @@ import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.events.EventBus;
 import com.reactnativenavigation.events.ScreenChangedEvent;
 import com.reactnativenavigation.params.ContextualMenuParams;
+import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.SideMenuParams;
 import com.reactnativenavigation.params.SnackbarParams;
@@ -185,6 +186,11 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
         stack.setScreenTitleBarLeftButton(screenInstanceId, navigatorEventId, titleBarLeftButtonParams);
     }
 
+    @Override
+    public void setFab(String screenInstanceId, String navigatorEventId, FabParams fabParams) {
+        stack.setFab(screenInstanceId, navigatorEventId, fabParams);
+    }
+
     @Override
     public void toggleSideMenuVisible(boolean animated, Side side) {
         if (sideMenu != null) {

android/app/src/main/java/com/reactnativenavigation/params/FabParams.java

@@ -16,4 +16,8 @@ public class FabParams {
     public boolean hasExpendedState() {
         return actions != null && actions.size() > 0;
     }
+
+    public boolean isValid() {
+        return collapsedId != null;
+    }
 }

android/app/src/main/java/com/reactnativenavigation/params/parsers/ContextualMenuButtonParamsParser.java

@@ -20,7 +20,9 @@ public class ContextualMenuButtonParamsParser extends TitleBarButtonParamsParser
 
     private ContextualMenuButtonParams parseSingleContextualMenuButton(Bundle button) {
         ContextualMenuButtonParams result = new ContextualMenuButtonParams();
-        result.icon = ImageLoader.loadImage(button.getString("icon"));
+        if (button.get("icon") != null) {
+            result.icon = ImageLoader.loadImage(button.getString("icon"));
+        }
         result.showAsAction = parseShowAsAction(button.getString("showAsAction"));
         result.color = StyleParams.Color.parse(button, "color");
         result.label = button.getString("label");

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

@@ -13,10 +13,12 @@ import com.reactnativenavigation.animation.VisibilityAnimator;
 import com.reactnativenavigation.events.ContextualMenuHiddenEvent;
 import com.reactnativenavigation.events.Event;
 import com.reactnativenavigation.events.EventBus;
+import com.reactnativenavigation.events.FabSetEvent;
 import com.reactnativenavigation.events.Subscriber;
 import com.reactnativenavigation.events.ViewPagerScreenChangedEvent;
 import com.reactnativenavigation.params.BaseScreenParams;
 import com.reactnativenavigation.params.ContextualMenuParams;
+import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
@@ -192,6 +194,13 @@ public abstract class Screen extends RelativeLayout implements Subscriber {
                 screenParams.overrideBackPressInJs);
     }
 
+    public void setFab(FabParams fabParams) {
+        screenParams.fabParams = fabParams;
+        if (isShown()) {
+            EventBus.instance.post(new FabSetEvent(fabParams));
+        }
+    }
+
     public StyleParams getStyleParams() {
         return screenParams.styleParams;
     }

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

@@ -10,6 +10,7 @@ import android.widget.RelativeLayout.LayoutParams;
 import com.facebook.react.bridge.Callback;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.params.ContextualMenuParams;
+import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
@@ -234,6 +235,15 @@ public class ScreenStack {
         });
     }
 
+    public void setFab(String screenInstanceId, final String navigatorEventId, final FabParams fabParams) {
+        performOnScreen(screenInstanceId, new Task<Screen>() {
+            @Override
+            public void run(Screen param) {
+                param.setFab(fabParams);
+            }
+        });
+    }
+
     public void showContextualMenu(String screenInstanceId, final ContextualMenuParams params, final Callback onButtonClicked) {
         performOnScreen(screenInstanceId, new Task<Screen>() {
             @Override

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

@@ -44,6 +44,9 @@ public class FloatingActionButtonCoordinator {
 
     public void add(FabParams params) {
         this.params = params;
+        if (!params.isValid()) {
+            return;
+        }
         createCollapsedFab();
         createExpendedFab();
         setStyle();

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

@@ -5,6 +5,7 @@ import android.support.design.widget.CoordinatorLayout;
 
 import com.reactnativenavigation.events.Event;
 import com.reactnativenavigation.events.EventBus;
+import com.reactnativenavigation.events.FabSetEvent;
 import com.reactnativenavigation.events.ScreenChangedEvent;
 import com.reactnativenavigation.events.Subscriber;
 import com.reactnativenavigation.params.FabParams;
@@ -38,9 +39,12 @@ public class SnackbarAndFabContainer extends CoordinatorLayout implements Snakba
 
     @Override
     public void onEvent(Event event) {
-        if (event.getType() == ScreenChangedEvent.TYPE) {
+        if (ScreenChangedEvent.TYPE.equals(event.getType())) {
             onScreenChange(((ScreenChangedEvent) event).fabParams);
         }
+        if (FabSetEvent.TYPE.equals(event.getType())) {
+            updateFab(((FabSetEvent) event).fabParams);
+        }
     }
 
     private void onScreenChange(FabParams fabParams) {

ios/RCCTabBarController.m

@@ -2,9 +2,27 @@
 #import "RCCViewController.h"
 #import "RCTConvert.h"
 #import "RCCManager.h"
+#import "RCTUIManager.h"
+
+@interface RCTUIManager ()
+
+- (void)configureNextLayoutAnimation:(NSDictionary *)config
+                        withCallback:(RCTResponseSenderBlock)callback
+                       errorCallback:(__unused RCTResponseSenderBlock)errorCallback;
+
+@end
 
 @implementation RCCTabBarController
 
+- (BOOL)tabBarController:(UITabBarController *)tabBarController shouldSelectViewController:(UIViewController *)viewController {
+  id queue = [[RCCManager sharedInstance].getBridge uiManager].methodQueue;
+  dispatch_async(queue, ^{
+    [[[RCCManager sharedInstance].getBridge uiManager] configureNextLayoutAnimation:nil withCallback:^(NSArray* arr){} errorCallback:^(NSArray* arr){}];
+  });
+  
+  return YES;
+}
+
 - (UIImage *)image:(UIImage*)image withColor:(UIColor *)color1
 {
   UIGraphicsBeginImageContextWithOptions(image.size, NO, image.scale);
@@ -26,6 +44,8 @@
   self = [super init];
   if (!self) return nil;
   
+  self.delegate = self;
+  
   self.tabBar.translucent = YES; // default
   
   UIColor *buttonColor = nil;

src/Navigation.js

@@ -43,7 +43,7 @@ function _registerComponentNoRedux(screenID, generator) {
 
       render() {
         return (
-          <InternalComponent navigator={this.navigator} {...this.state.internalProps} />
+          <InternalComponent testID={screenID} navigator={this.navigator} {...this.state.internalProps} />
         );
       }
     };
@@ -75,7 +75,7 @@ function _registerComponentRedux(screenID, generator, store, Provider) {
       render() {
         return (
           <Provider store={store}>
-            <InternalComponent navigator={this.navigator} {...this.state.internalProps} />
+            <InternalComponent testID={screenID} navigator={this.navigator} {...this.state.internalProps} />
           </Provider>
         );
       }

src/deprecated/platformSpecificDeprecated.android.js

@@ -278,7 +278,10 @@ function navigatorSetButtons(navigator, navigatorEventID, params) {
       }
     }
   }
-  newPlatformSpecific.setScreenTitleBarButtons(navigator.screenInstanceID, navigatorEventID, params.rightButtons, leftButton);
+  const fab = getFab(params);
+  console.log('params: ', JSON.stringify(params));
+  console.log('fab: ', JSON.stringify(fab));
+  newPlatformSpecific.setScreenButtons(navigator.screenInstanceID, navigatorEventID, params.rightButtons, leftButton, fab);
 }
 
 function navigatorSetTabBadge(navigator, params) {
@@ -411,32 +414,40 @@ function addNavigatorButtons(screen, sideMenuParams) {
 }
 
 function getFab(screen) {
+  let fab = screen.fab;
   if (screen.navigatorButtons && screen.navigatorButtons.fab) {
-    const fab = screen.navigatorButtons.fab;
-    const collapsedIconUri = resolveAssetSource(fab.collapsedIcon);
-    if (!collapsedIconUri) {
-      return;
-    }
-    fab.collapsedIcon = collapsedIconUri.uri;
-    if (fab.expendedIcon) {
-      const expendedIconUri = resolveAssetSource(fab.expendedIcon);
-      if (expendedIconUri) {
-        fab.expendedIcon = expendedIconUri.uri;
-      }
-    }
-    if (fab.backgroundColor) {
-      fab.backgroundColor = processColor(fab.backgroundColor);
-    }
+    fab = screen.navigatorButtons.fab;
+  }
+  if (fab === null || fab === undefined) {
+    return;
+  }
+  if (Object.keys(fab).length === 0 ) {
+    return {};
+  }
 
-    if (fab.actions) {
-      _.forEach(fab.actions, (action) => {
-        action.icon = resolveAssetSource(action.icon).uri;
-        return action;
-      });
+  const collapsedIconUri = resolveAssetSource(fab.collapsedIcon);
+  if (!collapsedIconUri) {
+    return;
+  }
+  fab.collapsedIcon = collapsedIconUri.uri;
+  if (fab.expendedIcon) {
+    const expendedIconUri = resolveAssetSource(fab.expendedIcon);
+    if (expendedIconUri) {
+      fab.expendedIcon = expendedIconUri.uri;
     }
+  }
+  if (fab.backgroundColor) {
+    fab.backgroundColor = processColor(fab.backgroundColor);
+  }
 
-    return fab;
+  if (fab.actions) {
+    _.forEach(fab.actions, (action) => {
+      action.icon = resolveAssetSource(action.icon).uri;
+      return action;
+    });
   }
+
+  return fab;
 }
 
 function createSideMenuButton() {
@@ -509,11 +520,15 @@ function showContextualMenu(navigator, params) {
 
   params.rightButtons.forEach((button, index) => {
     const btn = {
-      icon: resolveAssetSource(button.icon).uri,
+      icon: resolveAssetSource(button.icon),
+      showAsAction: button.showAsAction,
       color: processColor(button.color),
       label: button.title,
       index
     };
+    if (btn.icon) {
+      btn.icon = btn.icon.uri;
+    }
     contextualMenu.buttons.push(btn);
   });
 

src/platformSpecific.android.js

@@ -44,8 +44,8 @@ function setScreenTitleBarSubtitle(screenInstanceID, subtitle) {
   NativeReactModule.setScreenTitleBarSubtitle(screenInstanceID, subtitle);
 }
 
-function setScreenTitleBarButtons(screenInstanceID, navigatorEventID, rightButtons, leftButton) {
-  NativeReactModule.setScreenTitleBarButtons(screenInstanceID, navigatorEventID, rightButtons, leftButton);
+function setScreenButtons(screenInstanceID, navigatorEventID, rightButtons, leftButton, fab) {
+  NativeReactModule.setScreenButtons(screenInstanceID, navigatorEventID, rightButtons, leftButton, fab);
 }
 
 function showModal(screenParams) {
@@ -141,7 +141,7 @@ module.exports = {
   toggleBottomTabsVisible,
   setScreenTitleBarTitle,
   setScreenTitleBarSubtitle,
-  setScreenTitleBarButtons,
+  setScreenButtons,
   showModal,
   dismissTopModal,
   dismissAllModals,