merged

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

@@ -98,7 +98,7 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
     }
 
     private void setScreenFab(String screenInstanceId, String navigatorEventId, ReadableMap fab) {
-        FabParams fabParams = new FabParamsParser().parse(BundleConverter.toBundle(fab), navigatorEventId);
+        FabParams fabParams = new FabParamsParser().parse(BundleConverter.toBundle(fab), navigatorEventId, screenInstanceId);
         NavigationCommandsHandler.setScreenFab(screenInstanceId, navigatorEventId, fabParams);
     }
 

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

@@ -2,18 +2,13 @@ package com.reactnativenavigation.events;
 
 import com.reactnativenavigation.params.BaseScreenParams;
 import com.reactnativenavigation.params.FabParams;
-import com.reactnativenavigation.params.PageParams;
 
 public class ScreenChangedEvent implements Event {
     public static final String TYPE = "ScreenChangedEvent";
     public FabParams fabParams;
 
     public ScreenChangedEvent(BaseScreenParams screenParams) {
-        this.fabParams = screenParams.fabParams;
-    }
-
-    public ScreenChangedEvent(PageParams topTabParams) {
-        this.fabParams = topTabParams.fabParams;
+        this.fabParams = screenParams.getFab();
     }
 
     @Override

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

@@ -21,6 +21,7 @@ import com.reactnativenavigation.params.SideMenuParams;
 import com.reactnativenavigation.params.SnackbarParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
+import com.reactnativenavigation.screens.Screen;
 import com.reactnativenavigation.screens.ScreenStack;
 import com.reactnativenavigation.views.BottomTabs;
 import com.reactnativenavigation.views.SideMenu;
@@ -110,7 +111,7 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
     }
 
     private void createSnackbarContainer() {
-        snackbarAndFabContainer = new SnackbarAndFabContainer(getContext());
+        snackbarAndFabContainer = new SnackbarAndFabContainer(getContext(), this);
         RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT);
         lp.addRule(ABOVE, bottomTabs.getId());
         getScreenStackParent().addView(snackbarAndFabContainer, lp);
@@ -229,6 +230,11 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
         getCurrentScreenStack().peek().dismissContextualMenu();
     }
 
+    @Override
+    public Screen getCurrentScreen() {
+        return getCurrentScreenStack().peek();
+    }
+
     public void selectBottomTabByTabIndex(Integer index) {
         bottomTabs.setCurrentItem(index);
     }
@@ -382,11 +388,10 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
 
     @Override
     public void onSideMenuButtonClick() {
+        final String navigatorEventId = getCurrentScreenStack().peek().getNavigatorEventId();
+        NavigationApplication.instance.getEventEmitter().sendNavigatorEvent("sideMenu", navigatorEventId);
         if (sideMenu != null) {
             sideMenu.openDrawer(Side.Left);
-        } else {
-            final String navigatorEventId = getCurrentScreenStack().peek().getNavigatorEventId();
-            NavigationApplication.instance.getEventEmitter().sendNavigatorEvent("sideMenu", navigatorEventId);
         }
     }
 }

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

@@ -8,6 +8,7 @@ import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.SnackbarParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
+import com.reactnativenavigation.screens.Screen;
 import com.reactnativenavigation.views.SideMenu.Side;
 
 import java.util.List;
@@ -42,4 +43,6 @@ public interface Layout extends ScreenStackContainer {
     void showContextualMenu(String screenInstanceId, ContextualMenuParams params, Callback onButtonClicked);
 
     void dismissContextualMenu(String screenInstanceId);
+
+    Screen getCurrentScreen();
 }

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

@@ -16,6 +16,7 @@ import com.reactnativenavigation.params.SideMenuParams;
 import com.reactnativenavigation.params.SnackbarParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
+import com.reactnativenavigation.screens.Screen;
 import com.reactnativenavigation.screens.ScreenStack;
 import com.reactnativenavigation.views.LeftButtonOnClickListener;
 import com.reactnativenavigation.views.SideMenu;
@@ -92,7 +93,7 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
     }
 
     private void createFabAndSnackbarContainer() {
-        snackbarAndFabContainer = new SnackbarAndFabContainer(getContext());
+        snackbarAndFabContainer = new SnackbarAndFabContainer(getContext(), this);
         RelativeLayout.LayoutParams lp = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
         lp.addRule(ALIGN_PARENT_BOTTOM);
         snackbarAndFabContainer.setLayoutParams(lp);
@@ -231,6 +232,11 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
         stack.dismissContextualMenu(screenInstanceId);
     }
 
+    @Override
+    public Screen getCurrentScreen() {
+        return stack.peek();
+    }
+
     @Override
     public boolean onTitleBarBackButtonClick() {
         if (leftButtonOnClickListener != null) {
@@ -242,11 +248,10 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
 
     @Override
     public void onSideMenuButtonClick() {
+        final String navigatorEventId = stack.peek().getNavigatorEventId();
+        NavigationApplication.instance.getEventEmitter().sendNavigatorEvent("sideMenu", navigatorEventId);
         if (sideMenu != null) {
             sideMenu.openDrawer(Side.Left);
-        } else {
-            final String navigatorEventId = stack.peek().getNavigatorEventId();
-            NavigationApplication.instance.getEventEmitter().sendNavigatorEvent("sideMenu", navigatorEventId);
         }
     }
 }

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

@@ -38,4 +38,8 @@ public class BaseScreenParams {
     public boolean hasCollapsingTopBar() {
         return styleParams.collapsingTopBarParams != null;
     }
+
+    public FabParams getFab() {
+        return fabParams;
+    }
 }

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

@@ -12,6 +12,7 @@ public class FabParams {
     public String expendedId;
     public String navigatorEventId;
     public List<FabActionParams> actions;
+    public String screenInstanceId;
 
     public boolean hasExpendedState() {
         return actions != null && actions.size() > 0;

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

@@ -12,4 +12,8 @@ public class ScreenParams extends BaseScreenParams {
     public boolean hasTopTabs() {
         return topTabParams != null && !topTabParams.isEmpty();
     }
+
+    public FabParams getFab() {
+        return hasTopTabs() ? topTabParams.get(0).fabParams : fabParams;
+    }
 }

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

@@ -35,10 +35,10 @@ public class ButtonParser extends Parser {
         return leftButton;
     }
 
-    public static FabParams parseFab(Bundle params, String navigatorEventId) {
+    public static FabParams parseFab(Bundle params, String navigatorEventId, String screenInstanceId) {
         FabParams fabParams = null;
         if (hasKey(params, KEY_FAB)) {
-            fabParams = new FabParamsParser().parse(params.getBundle(KEY_FAB), navigatorEventId);
+            fabParams = new FabParamsParser().parse(params.getBundle(KEY_FAB), navigatorEventId, screenInstanceId);
         }
         return fabParams;
     }

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

@@ -8,11 +8,12 @@ import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.react.ImageLoader;
 
 public class FabParamsParser extends Parser {
-    public FabParams parse(Bundle params, final String navigatorEventId) {
+    public FabParams parse(Bundle params, final String navigatorEventId, String screenInstanceId) {
         FabParams fabParams = new FabParams();
         fabParams.collapsedId = params.getString("collapsedId");
         fabParams.expendedId = params.getString("expendedId");
         fabParams.navigatorEventId = navigatorEventId;
+        fabParams.screenInstanceId = screenInstanceId;
         fabParams.backgroundColor = getColor(params, "backgroundColor", new StyleParams.Color());
 
         if (hasKey(params, "collapsedIcon")) {

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

@@ -43,7 +43,7 @@ public class ScreenParamsParser extends Parser {
             result.fragmentCreatorPassProps = params.getBundle(FRAGMENT_CREATOR_PASS_PROPS);
         }
 
-        result.fabParams = ButtonParser.parseFab(params, result.navigationParams.navigatorEventId);
+        result.fabParams = ButtonParser.parseFab(params, result.navigationParams.navigatorEventId, result.navigationParams.screenInstanceId);
 
         result.tabLabel = getTabLabel(params);
         result.tabIcon = getTabIcon(params);

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

@@ -53,7 +53,9 @@ public class StyleParamsParser {
         result.bottomTabsHidden = getBoolean("bottomTabsHidden", getDefaultBottomTabsHidden());
         result.drawScreenAboveBottomTabs = !result.bottomTabsHidden &&
                                            params.getBoolean("drawScreenAboveBottomTabs", getDefaultDrawScreenAboveBottomTabs());
-        result.drawScreenAboveBottomTabs = drawScreenUnderBottomTabsIfTitleBarIsHiddenOnScroll(result);
+        if (result.titleBarHideOnScroll) {
+            result.drawScreenAboveBottomTabs = false;
+        }
         result.bottomTabsHiddenOnScroll = getBoolean("bottomTabsHiddenOnScroll", getDefaultBottomTabsHiddenOnScroll());
         result.bottomTabsColor = getColor("bottomTabsColor", getDefaultBottomTabsColor());
         result.bottomTabsButtonColor = getColor("bottomTabsButtonColor", getDefaultBottomTabsButtonColor());
@@ -76,10 +78,6 @@ public class StyleParamsParser {
         return result;
     }
 
-    private boolean drawScreenUnderBottomTabsIfTitleBarIsHiddenOnScroll(StyleParams result) {
-        return !result.titleBarHideOnScroll;
-    }
-
     private StyleParams.Color getDefaultContextualMenuStatusBarColor() {
         return new StyleParams.Color(Color.parseColor("#7c7c7c"));
     }

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

@@ -31,7 +31,7 @@ public class TopTabParamsParser extends Parser {
         result.navigationParams = new NavigationParams(params.getBundle(NAVIGATION_PARAMS));
         result.leftButton = ButtonParser.parseLeftButton(params);
         result.rightButtons = ButtonParser.parseRightButton(params);
-        result.fabParams = ButtonParser.parseFab(params, result.navigationParams.navigatorEventId);
+        result.fabParams = ButtonParser.parseFab(params, result.navigationParams.navigatorEventId, result.navigationParams.screenInstanceId);
         result.styleParams = new StyleParamsParser(params.getBundle("styleParams")).parse();
         return result;
     }

android/app/src/main/java/com/reactnativenavigation/utils/ViewUtils.java

@@ -9,11 +9,13 @@ import android.support.annotation.Nullable;
 import android.util.DisplayMetrics;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.view.ViewTreeObserver;
 import android.view.WindowManager;
 
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.params.AppStyle;
+import com.reactnativenavigation.screens.Screen;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -115,5 +117,22 @@ public class ViewUtils {
     public interface PerformOnViewTask {
         void runOnView(View view);
     }
+
+    public static void performOnParentScreen(View child, Task<Screen> task) {
+        Screen parentScreen = findParentScreen(child.getParent());
+        if (parentScreen != null) {
+            task.run(parentScreen);
+        }
+    }
+
+    private static Screen findParentScreen(ViewParent parent) {
+        if (parent == null) {
+            return null;
+        }
+        if (parent instanceof Screen) {
+            return (Screen) parent;
+        }
+        return findParentScreen(parent.getParent());
+    }
 }
 

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

@@ -87,6 +87,9 @@ public class FloatingActionButtonAnimator {
     }
 
     void removeFabFromScreen(FloatingActionButton fab, final AnimatorListenerAdapter animationListener) {
+        if (fab == null) {
+            return;
+        }
         state = State.Removing;
         fab.animate()
                 .alpha(0)

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

@@ -10,6 +10,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.CoordinatorLayout;
 import android.support.design.widget.FloatingActionButton;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 
@@ -23,7 +24,7 @@ import java.util.ArrayList;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
 public class FloatingActionButtonCoordinator {
-
+    private static final String TAG = "FloatingActionButtonCoo";
     private static final int INITIAL_EXPENDED_FAB_ROTATION = -90;
     private CoordinatorLayout parent;
     private FabParams params;
@@ -42,7 +43,18 @@ public class FloatingActionButtonCoordinator {
         actionSize = (int) ViewUtils.convertDpToPixel(40);
     }
 
-    public void add(FabParams params) {
+    public void add(final FabParams params) {
+        Log.i(TAG, "add() called with: params = [" + params + "]");
+        if (parent.getChildCount() > 0) {
+            remove(new Runnable() {
+                @Override
+                public void run() {
+                    add(params);
+                }
+            });
+            return;
+        }
+
         this.params = params;
         if (!params.isValid()) {
             return;
@@ -55,7 +67,8 @@ public class FloatingActionButtonCoordinator {
     }
 
     public void remove(@Nullable final Runnable onComplete) {
-        if (parent.getChildCount() == 0 || fabAnimator.isAnimating()) {
+        Log.w(TAG, "remove: ");
+        if (parent.getChildCount() == 0) {
             if (onComplete != null) {
                 onComplete.run();
             }

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

@@ -8,15 +8,18 @@ import com.reactnativenavigation.events.EventBus;
 import com.reactnativenavigation.events.FabSetEvent;
 import com.reactnativenavigation.events.ScreenChangedEvent;
 import com.reactnativenavigation.events.Subscriber;
+import com.reactnativenavigation.layouts.Layout;
 import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.SnackbarParams;
 
 public class SnackbarAndFabContainer extends CoordinatorLayout implements Snakbar.OnDismissListener, Subscriber{
     private Snakbar snakbar;
     private FloatingActionButtonCoordinator fabCoordinator;
+    private Layout layout;
 
-    public SnackbarAndFabContainer(Context context) {
+    public SnackbarAndFabContainer(Context context, Layout layout) {
         super(context);
+        this.layout = layout;
         fabCoordinator = new FloatingActionButtonCoordinator(this);
         EventBus.instance.register(this);
     }
@@ -64,7 +67,9 @@ public class SnackbarAndFabContainer extends CoordinatorLayout implements Snakba
             @Override
             public void run() {
                 if (fabParams != null) {
-                    fabCoordinator.add(fabParams);
+                    if (layout.getCurrentScreen().getScreenInstanceId().equals(fabParams.screenInstanceId)) {
+                        fabCoordinator.add(fabParams);
+                    }
                 }
             }
         });

ios/RCCNavigationController.h

@@ -1,7 +1,7 @@
 #import <UIKit/UIKit.h>
 #import "RCTBridge.h"
 
-@interface RCCNavigationController : UINavigationController
+@interface RCCNavigationController : UINavigationController <UINavigationControllerDelegate>
 
 - (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children globalProps:(NSDictionary*)globalProps bridge:(RCTBridge *)bridge;
 - (void)performAction:(NSString*)performAction actionParams:(NSDictionary*)actionParams bridge:(RCTBridge *)bridge;

ios/RCCNavigationController.m

@@ -36,6 +36,7 @@ NSString const *CALLBACK_ASSOCIATED_ID = @"RCCNavigationController.CALLBACK_ASSO
   
   self = [super initWithRootViewController:viewController];
   if (!self) return nil;
+  self.delegate = self;
   
   self.navigationBar.translucent = NO; // default
   
@@ -76,6 +77,7 @@ NSString const *CALLBACK_ASSOCIATED_ID = @"RCCNavigationController.CALLBACK_ASSO
       [mergedStyle removeObjectForKey:@"navBarBlur"];
       [mergedStyle removeObjectForKey:@"navBarTranslucent"];
       [mergedStyle removeObjectForKey:@"statusBarHideWithNavBar"];
+      [mergedStyle removeObjectForKey:@"statusBarTextColorSchemeSingleScreen"];
       
       [mergedStyle addEntriesFromDictionary:navigatorStyle];
       navigatorStyle = mergedStyle;
@@ -294,5 +296,17 @@ NSString const *CALLBACK_ASSOCIATED_ID = @"RCCNavigationController.CALLBACK_ASSO
   
 }
 
+- (UIStatusBarStyle)preferredStatusBarStyle {
+  return [self.topViewController preferredStatusBarStyle];
+}
+
+
+#pragma mark - UINavigationControllerDelegate
+
+
+-(void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated {
+  [viewController setNeedsStatusBarAppearanceUpdate];
+}
+
 
 @end

ios/RCCTabBarController.h

@@ -1,7 +1,7 @@
 #import <UIKit/UIKit.h>
 #import "RCTBridge.h"
 
-@interface RCCTabBarController : UITabBarController
+@interface RCCTabBarController : UITabBarController <UITabBarDelegate>
 
 - (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children globalProps:(NSDictionary*)globalProps bridge:(RCTBridge *)bridge;
 - (void)performAction:(NSString*)performAction actionParams:(NSDictionary*)actionParams bridge:(RCTBridge *)bridge completion:(void (^)(void))completion;

ios/RCCTabBarController.m

@@ -20,6 +20,8 @@
     [[[RCCManager sharedInstance].getBridge uiManager] configureNextLayoutAnimation:nil withCallback:^(NSArray* arr){} errorCallback:^(NSArray* arr){}];
   });
   
+  [RCCTabBarController sendScreenTabChangedEvent:viewController];
+  
   return YES;
 }
 
@@ -237,4 +239,29 @@
     }
 }
 
++(void)sendScreenTabChangedEvent:(UIViewController*)viewController {
+  if ([viewController.view isKindOfClass:[RCTRootView class]]){
+    RCTRootView *rootView = (RCTRootView *)viewController.view;
+    
+    if (rootView.appProperties && rootView.appProperties[@"navigatorEventID"]) {
+      NSString *navigatorID = rootView.appProperties[@"navigatorID"];
+      NSString *screenInstanceID = rootView.appProperties[@"screenInstanceID"];
+      
+      [[[RCCManager sharedInstance] getBridge].eventDispatcher sendAppEventWithName:rootView.appProperties[@"navigatorEventID"] body:@
+       {
+         @"id": @"bottomTabSelected",
+         @"navigatorID": navigatorID,
+         @"screenInstanceID": screenInstanceID
+       }];
+    }
+  }
+  
+  if ([viewController isKindOfClass:[UINavigationController class]]) {
+    UINavigationController *navigationController = (UINavigationController*)viewController;
+    UIViewController *topViewController = [navigationController topViewController];
+    [RCCTabBarController sendScreenTabChangedEvent:topViewController];
+  }
+}
+
+
 @end

ios/RCCViewController.m

@@ -96,60 +96,60 @@ const NSInteger TRANSPARENT_NAVBAR_TAG = 78264803;
 
 - (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children globalProps:(NSDictionary *)globalProps bridge:(RCTBridge *)bridge
 {
-  NSString *component = props[@"component"];
-  if (!component) return nil;
-
-  NSDictionary *passProps = props[@"passProps"];
-  NSDictionary *navigatorStyle = props[@"style"];
-
-  NSMutableDictionary *mergedProps = [NSMutableDictionary dictionaryWithDictionary:globalProps];
-  [mergedProps addEntriesFromDictionary:passProps];
-  
-  RCTRootView *reactView = [[RCTRootView alloc] initWithBridge:bridge moduleName:component initialProperties:mergedProps];
-  if (!reactView) return nil;
-
-  self = [super init];
-  if (!self) return nil;
-
-  [self commonInit:reactView navigatorStyle:navigatorStyle props:props];
-
-  return self;
+    NSString *component = props[@"component"];
+    if (!component) return nil;
+    
+    NSDictionary *passProps = props[@"passProps"];
+    NSDictionary *navigatorStyle = props[@"style"];
+    
+    NSMutableDictionary *mergedProps = [NSMutableDictionary dictionaryWithDictionary:globalProps];
+    [mergedProps addEntriesFromDictionary:passProps];
+    
+    RCTRootView *reactView = [[RCTRootView alloc] initWithBridge:bridge moduleName:component initialProperties:mergedProps];
+    if (!reactView) return nil;
+    
+    self = [super init];
+    if (!self) return nil;
+    
+    [self commonInit:reactView navigatorStyle:navigatorStyle props:props];
+    
+    return self;
 }
 
 - (instancetype)initWithComponent:(NSString *)component passProps:(NSDictionary *)passProps navigatorStyle:(NSDictionary*)navigatorStyle globalProps:(NSDictionary *)globalProps bridge:(RCTBridge *)bridge
 {
-  NSMutableDictionary *mergedProps = [NSMutableDictionary dictionaryWithDictionary:globalProps];
-  [mergedProps addEntriesFromDictionary:passProps];
-  
-  RCTRootView *reactView = [[RCTRootView alloc] initWithBridge:bridge moduleName:component initialProperties:mergedProps];
-  if (!reactView) return nil;
-
-  self = [super init];
-  if (!self) return nil;
-
-  [self commonInit:reactView navigatorStyle:navigatorStyle props:passProps];
-
-  return self;
+    NSMutableDictionary *mergedProps = [NSMutableDictionary dictionaryWithDictionary:globalProps];
+    [mergedProps addEntriesFromDictionary:passProps];
+    
+    RCTRootView *reactView = [[RCTRootView alloc] initWithBridge:bridge moduleName:component initialProperties:mergedProps];
+    if (!reactView) return nil;
+    
+    self = [super init];
+    if (!self) return nil;
+    
+    [self commonInit:reactView navigatorStyle:navigatorStyle props:passProps];
+    
+    return self;
 }
 
 - (void)commonInit:(RCTRootView*)reactView navigatorStyle:(NSDictionary*)navigatorStyle props:(NSDictionary*)props
 {
-  self.view = reactView;
-  
-  self.edgesForExtendedLayout = UIRectEdgeNone; // default
-  self.automaticallyAdjustsScrollViewInsets = NO; // default
-  
-  self.navigatorStyle = [NSMutableDictionary dictionaryWithDictionary:navigatorStyle];
-  
-  [self setStyleOnInit];
-  
-  [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onRNReload) name:RCTReloadNotification object:nil];
-  [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onCancelReactTouches) name:RCCViewControllerCancelReactTouchesNotification object:nil];
-  
-  // In order to support 3rd party native ViewControllers, we support passing a class name as a prop mamed `ExternalNativeScreenClass`
-  // In this case, we create an instance and add it as a child ViewController which preserves the VC lifecycle.
-  // In case some props are necessary in the native ViewController, the ExternalNativeScreenProps can be used to pass them
-  [self addExternalVCIfNecessary:props];
+    self.view = reactView;
+    
+    self.edgesForExtendedLayout = UIRectEdgeNone; // default
+    self.automaticallyAdjustsScrollViewInsets = NO; // default
+    
+    self.navigatorStyle = [NSMutableDictionary dictionaryWithDictionary:navigatorStyle];
+    
+    [self setStyleOnInit];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onRNReload) name:RCTReloadNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onCancelReactTouches) name:RCCViewControllerCancelReactTouchesNotification object:nil];
+    
+    // In order to support 3rd party native ViewControllers, we support passing a class name as a prop mamed `ExternalNativeScreenClass`
+    // In this case, we create an instance and add it as a child ViewController which preserves the VC lifecycle.
+    // In case some props are necessary in the native ViewController, the ExternalNativeScreenProps can be used to pass them
+    [self addExternalVCIfNecessary:props];
 }
 
 - (void)dealloc
@@ -166,9 +166,9 @@ const NSInteger TRANSPARENT_NAVBAR_TAG = 78264803;
 
 -(void)onCancelReactTouches
 {
-  if ([self.view isKindOfClass:[RCTRootView class]]){
-    [(RCTRootView*)self.view cancelTouches];
-  }
+    if ([self.view isKindOfClass:[RCTRootView class]]){
+        [(RCTRootView*)self.view cancelTouches];
+    }
 }
 
 - (void)viewWillAppear:(BOOL)animated
@@ -189,7 +189,7 @@ const NSInteger TRANSPARENT_NAVBAR_TAG = 78264803;
 // we want to reset the style to what we expect (so we need to reset on every willAppear)
 - (void)setStyleOnAppear
 {
-  [self setStyleOnAppearForViewController:self];
+    [self setStyleOnAppearForViewController:self];
 }
 
 -(void)setStyleOnAppearForViewController:(UIViewController*)viewController
@@ -200,7 +200,7 @@ const NSInteger TRANSPARENT_NAVBAR_TAG = 78264803;
         UIColor *color = screenBackgroundColor != (id)[NSNull null] ? [RCTConvert UIColor:screenBackgroundColor] : nil;
         self.view.backgroundColor = color;
     }
- 
+    
     NSString *navBarBackgroundColor = self.navigatorStyle[@"navBarBackgroundColor"];
     if (navBarBackgroundColor)
     {
@@ -233,19 +233,33 @@ const NSInteger TRANSPARENT_NAVBAR_TAG = 78264803;
     {
         viewController.navigationController.navigationBar.tintColor = nil;
     }
-    
-    NSString *statusBarTextColorScheme = self.navigatorStyle[@"statusBarTextColorScheme"];
-    if (statusBarTextColorScheme && [statusBarTextColorScheme isEqualToString:@"light"])
+  
+    NSString *statusBarTextColorSchemeSingleScreen = self.navigatorStyle[@"statusBarTextColorSchemeSingleScreen"];
+    if (statusBarTextColorSchemeSingleScreen && [statusBarTextColorSchemeSingleScreen isEqualToString:@"light"])
     {
-        viewController.navigationController.navigationBar.barStyle = UIBarStyleBlack;
-        self._statusBarTextColorSchemeLight = YES;
+      self._statusBarTextColorSchemeLight = YES;
     }
     else
     {
-        viewController.navigationController.navigationBar.barStyle = UIBarStyleDefault;
-        self._statusBarTextColorSchemeLight = NO;
+      self._statusBarTextColorSchemeLight = NO;
     }
-    
+  
+    // incase statusBarTextColorSchemeSingleScreen exists ignore the statusBarTextColorScheme which more globaly
+    if (!statusBarTextColorSchemeSingleScreen) {
+      NSString *statusBarTextColorScheme = self.navigatorStyle[@"statusBarTextColorScheme"];
+      if (statusBarTextColorScheme && [statusBarTextColorScheme isEqualToString:@"light"] && !statusBarTextColorSchemeSingleScreen)
+      {
+          viewController.navigationController.navigationBar.barStyle = UIBarStyleBlack;
+          self._statusBarTextColorSchemeLight = YES;
+        
+      }
+      else
+      {
+          viewController.navigationController.navigationBar.barStyle = UIBarStyleDefault;
+          self._statusBarTextColorSchemeLight = NO;
+      }
+    }
+  
     NSNumber *navBarHidden = self.navigatorStyle[@"navBarHidden"];
     BOOL navBarHiddenBool = navBarHidden ? [navBarHidden boolValue] : NO;
     if (viewController.navigationController.navigationBarHidden != navBarHiddenBool)
@@ -309,29 +323,44 @@ const NSInteger TRANSPARENT_NAVBAR_TAG = 78264803;
     
     NSNumber *navBarTransparent = self.navigatorStyle[@"navBarTransparent"];
     BOOL navBarTransparentBool = navBarTransparent ? [navBarTransparent boolValue] : NO;
-    if (navBarTransparentBool)
-    {
-        if (![viewController.navigationController.navigationBar viewWithTag:TRANSPARENT_NAVBAR_TAG])
+    
+    void (^action)() = ^ {
+        if (navBarTransparentBool)
         {
-            [self storeOriginalNavBarImages];
-            
-            [viewController.navigationController.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
-            viewController.navigationController.navigationBar.shadowImage = [UIImage new];
-            UIView *transparentView = [[UIView alloc] initWithFrame:CGRectZero];
-            transparentView.tag = TRANSPARENT_NAVBAR_TAG;
-            [viewController.navigationController.navigationBar insertSubview:transparentView atIndex:0];
+            if (![viewController.navigationController.navigationBar viewWithTag:TRANSPARENT_NAVBAR_TAG])
+            {
+                [self storeOriginalNavBarImages];
+                
+                [viewController.navigationController.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
+                viewController.navigationController.navigationBar.shadowImage = [UIImage new];
+                UIView *transparentView = [[UIView alloc] initWithFrame:CGRectZero];
+                transparentView.tag = TRANSPARENT_NAVBAR_TAG;
+                [viewController.navigationController.navigationBar insertSubview:transparentView atIndex:0];
+            }
         }
-    }
-    else
-    {
-        UIView *transparentView = [viewController.navigationController.navigationBar viewWithTag:TRANSPARENT_NAVBAR_TAG];
-        if (transparentView)
+        else
         {
-            [transparentView removeFromSuperview];
-            [viewController.navigationController.navigationBar setBackgroundImage:self.originalNavBarImages[@"bgImage"] forBarMetrics:UIBarMetricsDefault];
-            viewController.navigationController.navigationBar.shadowImage = self.originalNavBarImages[@"shadowImage"];
-            self.originalNavBarImages = nil;
+            UIView *transparentView = [viewController.navigationController.navigationBar viewWithTag:TRANSPARENT_NAVBAR_TAG];
+            if (transparentView)
+            {
+                [transparentView removeFromSuperview];
+                [viewController.navigationController.navigationBar setBackgroundImage:self.originalNavBarImages[@"bgImage"] forBarMetrics:UIBarMetricsDefault];
+                viewController.navigationController.navigationBar.shadowImage = self.originalNavBarImages[@"shadowImage"];
+                self.originalNavBarImages = nil;
+            }
         }
+    };
+    
+    if(self.transitionCoordinator.initiallyInteractive || !navBarTransparentBool) {
+        action();
+    } else {
+        UIView* backgroundView = [self.navigationController.navigationBar valueForKey:@"backgroundView"];
+        CGFloat originalAlpha = backgroundView.alpha;
+        backgroundView.alpha = navBarTransparentBool ? 0.0 : 1.0;
+        [self.transitionCoordinator animateAlongsideTransition:nil completion:^(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) {
+            action();
+            backgroundView.alpha = originalAlpha;
+        }];
     }
     
     NSNumber *navBarTranslucent = self.navigatorStyle[@"navBarTranslucent"];
@@ -377,18 +406,18 @@ const NSInteger TRANSPARENT_NAVBAR_TAG = 78264803;
     {
         self.navBarHairlineImageView.hidden = NO;
     }
-  
+    
     //Bug fix: in case there is a interactivePopGestureRecognizer, it prevents react-native from getting touch events on the left screen area that the gesture handles
     //overriding the delegate of the gesture prevents this from happening while keeping the gesture intact (another option was to disable it completely by demand)
     self.originalInteractivePopGestureDelegate = nil;
     if (self.navigationController != nil && self.navigationController.interactivePopGestureRecognizer != nil)
     {
-      id <UIGestureRecognizerDelegate> interactivePopGestureRecognizer = self.navigationController.interactivePopGestureRecognizer.delegate;
-      if (interactivePopGestureRecognizer != nil)
-      {
-        self.originalInteractivePopGestureDelegate = interactivePopGestureRecognizer;
-        self.navigationController.interactivePopGestureRecognizer.delegate = self;
-      }
+        id <UIGestureRecognizerDelegate> interactivePopGestureRecognizer = self.navigationController.interactivePopGestureRecognizer.delegate;
+        if (interactivePopGestureRecognizer != nil)
+        {
+            self.originalInteractivePopGestureDelegate = interactivePopGestureRecognizer;
+            self.navigationController.interactivePopGestureRecognizer.delegate = self;
+        }
     }
 }
 
@@ -411,11 +440,11 @@ const NSInteger TRANSPARENT_NAVBAR_TAG = 78264803;
 -(void)setStyleOnDisappear
 {
     self.navBarHairlineImageView.hidden = NO;
-  
+    
     if (self.navigationController != nil && self.navigationController.interactivePopGestureRecognizer != nil && self.originalInteractivePopGestureDelegate != nil)
     {
-      self.navigationController.interactivePopGestureRecognizer.delegate = self.originalInteractivePopGestureDelegate;
-      self.originalInteractivePopGestureDelegate = nil;
+        self.navigationController.interactivePopGestureRecognizer.delegate = self.originalInteractivePopGestureDelegate;
+        self.originalInteractivePopGestureDelegate = nil;
     }
 }
 
@@ -510,57 +539,58 @@ const NSInteger TRANSPARENT_NAVBAR_TAG = 78264803;
 
 -(void)addExternalVCIfNecessary:(NSDictionary*)props
 {
-  NSString *externalScreenClass = props[@"externalNativeScreenClass"];
-  if (externalScreenClass != nil)
-  {
-    Class class = NSClassFromString(externalScreenClass);
-    if (class != NULL)
-    {
-      id obj = [[class alloc] init];
-      if (obj != nil && [obj isKindOfClass:[UIViewController class]] && [obj conformsToProtocol:@protocol(RCCExternalViewControllerProtocol)])
-      {
-        ((id <RCCExternalViewControllerProtocol>)obj).controllerDelegate = self;
-        [obj setProps:props[@"externalNativeScreenProps"]];
-        
-        UIViewController *viewController = (UIViewController*)obj;
-        [self addChildViewController:viewController];
-        viewController.view.frame = self.view.bounds;
-        [self.view addSubview:viewController.view];
-        [viewController didMoveToParentViewController:self];
-      }
-      else
-      {
-        NSLog(@"addExternalVCIfNecessary: could not create instance. Make sure that your class is a UIViewController whihc confirms to RCCExternalViewControllerProtocol");
-      }
-    }
-    else
+    NSString *externalScreenClass = props[@"externalNativeScreenClass"];
+    if (externalScreenClass != nil)
     {
-      NSLog(@"addExternalVCIfNecessary: could not create class from string. Check that the proper class name wass passed in ExternalNativeScreenClass");
+        Class class = NSClassFromString(externalScreenClass);
+        if (class != NULL)
+        {
+            id obj = [[class alloc] init];
+            if (obj != nil && [obj isKindOfClass:[UIViewController class]] && [obj conformsToProtocol:@protocol(RCCExternalViewControllerProtocol)])
+            {
+                ((id <RCCExternalViewControllerProtocol>)obj).controllerDelegate = self;
+                [obj setProps:props[@"externalNativeScreenProps"]];
+                
+                UIViewController *viewController = (UIViewController*)obj;
+                [self addChildViewController:viewController];
+                viewController.view.frame = self.view.bounds;
+                [self.view addSubview:viewController.view];
+                [viewController didMoveToParentViewController:self];
+            }
+            else
+            {
+                NSLog(@"addExternalVCIfNecessary: could not create instance. Make sure that your class is a UIViewController whihc confirms to RCCExternalViewControllerProtocol");
+            }
+        }
+        else
+        {
+            NSLog(@"addExternalVCIfNecessary: could not create class from string. Check that the proper class name wass passed in ExternalNativeScreenClass");
+        }
     }
-  }
 }
 
 #pragma mark - NewRelic
 
 - (NSString*) customNewRelicInteractionName
 {
-  NSString *interactionName = nil;
-  
-  if (self.view != nil && [self.view isKindOfClass:[RCTRootView class]])
-  {
-    NSString *moduleName = ((RCTRootView*)self.view).moduleName;
-    if(moduleName != nil)
+    NSString *interactionName = nil;
+    
+    if (self.view != nil && [self.view isKindOfClass:[RCTRootView class]])
     {
-      interactionName = [NSString stringWithFormat:@"RCCViewController: %@", moduleName];
+        NSString *moduleName = ((RCTRootView*)self.view).moduleName;
+        if(moduleName != nil)
+        {
+            interactionName = [NSString stringWithFormat:@"RCCViewController: %@", moduleName];
+        }
     }
-  }
-  
-  if (interactionName == nil)
-  {
-    interactionName = [NSString stringWithFormat:@"RCCViewController with title: %@", self.title];
-  }
-  
-  return interactionName;
+    
+    if (interactionName == nil)
+    {
+        interactionName = [NSString stringWithFormat:@"RCCViewController with title: %@", self.title];
+    }
+    
+    return interactionName;
 }
 
+
 @end

src/deprecated/platformSpecificDeprecated.android.js

@@ -36,6 +36,7 @@ function startSingleScreenApp(params) {
 }
 
 function adaptTopTabs(screen, navigatorID) {
+  screen.topTabs = _.cloneDeep(screen.topTabs);
   _.forEach(_.get(screen, 'topTabs'), (tab) => {
     addNavigatorParams(tab);
     if (navigatorID) {
@@ -279,8 +280,6 @@ function navigatorSetButtons(navigator, navigatorEventID, params) {
     }
   }
   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);
 }
 

yarn.lock

@@ -60,8 +60,8 @@ acorn@^4.0.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a"
 
 ajv-keywords@^1.0.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.4.1.tgz#f080e635e230baae26537ce727f260ae62b43802"
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.0.tgz#c11e6859eafff83e0dafc416929472eca946aa2c"
 
 ajv@^4.7.0:
   version "4.10.3"
@@ -230,7 +230,7 @@ async@1.x, async@^1.4.0, async@^1.4.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@^2.0.1:
+async@^2.0.1, async@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/async/-/async-2.1.4.tgz#2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"
   dependencies:
@@ -1188,7 +1188,7 @@ clone@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
 
-clone@^1.0.0, clone@^1.0.2:
+clone@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
 
@@ -1478,6 +1478,10 @@ dateformat@^1.0.11:
     get-stdin "^4.0.1"
     meow "^3.3.0"
 
+dateformat@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.0.0.tgz#2743e3abb5c3fc2462e527dca445e04e9f4dee17"
+
 debug@2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.3.tgz#40c453e67e6e13c901ddec317af8986cda9eff8c"
@@ -1485,8 +1489,8 @@ debug@2.3.3:
     ms "0.7.2"
 
 debug@^2.0.0, debug@^2.1.0, debug@^2.1.1, debug@^2.2.0:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.5.2.tgz#50c295a53dbf1657146e0c1b21307275e90d49cb"
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
   dependencies:
     ms "0.7.2"
 
@@ -1637,8 +1641,8 @@ diff@^2.1.2:
   resolved "https://registry.yarnpkg.com/diff/-/diff-2.2.3.tgz#60eafd0d28ee906e4e8ff0a52c1229521033bf99"
 
 diff@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.1.0.tgz#9406c73a401e6c2b3ba901c5e2c44eb6a60c5385"
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
 
 doctrine@^1.2.2:
   version "1.5.0"
@@ -1658,11 +1662,7 @@ dom-walk@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
 
-domelementtype@1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
-
-domelementtype@~1.1.1:
+domelementtype@1, domelementtype@~1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
 
@@ -2095,15 +2095,15 @@ extsprintf@1.0.2:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
 
 fancy-log@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.2.0.tgz#d5a51b53e9ab22ca07d558f2b67ae55fdb5fcbd8"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.0.tgz#45be17d02bb9917d60ccffd4995c999e6c8c9948"
   dependencies:
     chalk "^1.1.1"
     time-stamp "^1.0.0"
 
 fast-levenshtein@~2.0.4:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.5.tgz#bd33145744519ab1c36c3ee9f31f08e9079b67f2"
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
 
 fb-watchman@^1.8.0, fb-watchman@^1.9.0:
   version "1.9.0"
@@ -2176,12 +2176,12 @@ filenamify@^1.0.1:
     strip-outer "^1.0.0"
     trim-repeated "^1.0.0"
 
-fileset@0.2.x:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/fileset/-/fileset-0.2.1.tgz#588ef8973c6623b2a76df465105696b96aac8067"
+fileset@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
   dependencies:
-    glob "5.x"
-    minimatch "2.x"
+    glob "^7.0.3"
+    minimatch "^3.0.3"
 
 fill-range@^2.1.0:
   version "2.2.3"
@@ -2404,7 +2404,7 @@ glob-stream@^5.3.2:
     to-absolute-glob "^0.1.1"
     unique-stream "^2.0.2"
 
-glob@5.x, glob@^5.0.15, glob@^5.0.3, glob@^5.0.5:
+glob@^5.0.15, glob@^5.0.3, glob@^5.0.5:
   version "5.0.15"
   resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
   dependencies:
@@ -2543,14 +2543,14 @@ gulp-sourcemaps@1.6.0:
     vinyl "^1.0.0"
 
 gulp-util@^3.0.1, gulp-util@^3.0.4:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.7.tgz#78925c4b8f8b49005ac01a011c557e6218941cbb"
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
   dependencies:
     array-differ "^1.0.0"
     array-uniq "^1.0.2"
     beeper "^1.0.0"
     chalk "^1.0.0"
-    dateformat "^1.0.11"
+    dateformat "^2.0.0"
     fancy-log "^1.1.0"
     gulplog "^1.0.0"
     has-gulplog "^0.1.0"
@@ -2996,35 +2996,34 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
 istanbul-api@^1.0.0-aplha.10:
-  version "1.0.0-aplha.10"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.0.0-aplha.10.tgz#902edf5cf5404e0eba7e00ef46408488a0d3e337"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.0.tgz#fb3f62edd5bfc6ae09da09453ded6e10ae7e483b"
   dependencies:
-    async "1.x"
-    clone "^1.0.2"
-    fileset "0.2.x"
-    istanbul-lib-coverage "^1.0.0-alpha"
-    istanbul-lib-hook "^1.0.0-alpha"
-    istanbul-lib-instrument "^1.0.0-alpha"
-    istanbul-lib-report "^1.0.0-alpha"
-    istanbul-lib-source-maps "^1.0.0-alpha"
-    istanbul-reports "^1.0.0-alpha"
-    js-yaml "3.x"
-    mkdirp "0.5.x"
-    once "1.x"
+    async "^2.1.4"
+    fileset "^2.0.2"
+    istanbul-lib-coverage "^1.0.0"
+    istanbul-lib-hook "^1.0.0-alpha.4"
+    istanbul-lib-instrument "^1.3.0"
+    istanbul-lib-report "^1.0.0-alpha.3"
+    istanbul-lib-source-maps "^1.1.0"
+    istanbul-reports "^1.0.0"
+    js-yaml "^3.7.0"
+    mkdirp "^0.5.1"
+    once "^1.4.0"
 
 istanbul-lib-coverage@^1.0.0, istanbul-lib-coverage@^1.0.0-alpha, istanbul-lib-coverage@^1.0.0-alpha.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.0.tgz#c3f9b6d226da12424064cce87fce0fb57fdfa7a2"
 
-istanbul-lib-hook@^1.0.0-alpha:
+istanbul-lib-hook@^1.0.0-alpha.4:
   version "1.0.0-alpha.4"
   resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.0-alpha.4.tgz#8c5bb9f6fbd8526e0ae6cf639af28266906b938f"
   dependencies:
     append-transform "^0.3.0"
 
-istanbul-lib-instrument@^1.0.0-alpha, istanbul-lib-instrument@^1.1.1, istanbul-lib-instrument@^1.1.4:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.3.0.tgz#19f0a973397454989b98330333063a5b56df0e58"
+istanbul-lib-instrument@^1.1.1, istanbul-lib-instrument@^1.1.4, istanbul-lib-instrument@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.3.1.tgz#112c25a4f2f9bc361d13d14bbff992331b974e52"
   dependencies:
     babel-generator "^6.18.0"
     babel-template "^6.16.0"
@@ -3034,7 +3033,7 @@ istanbul-lib-instrument@^1.0.0-alpha, istanbul-lib-instrument@^1.1.1, istanbul-l
     istanbul-lib-coverage "^1.0.0"
     semver "^5.3.0"
 
-istanbul-lib-report@^1.0.0-alpha:
+istanbul-lib-report@^1.0.0-alpha.3:
   version "1.0.0-alpha.3"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.0.0-alpha.3.tgz#32d5f6ec7f33ca3a602209e278b2e6ff143498af"
   dependencies:
@@ -3045,7 +3044,7 @@ istanbul-lib-report@^1.0.0-alpha:
     rimraf "^2.4.3"
     supports-color "^3.1.2"
 
-istanbul-lib-source-maps@^1.0.0-alpha:
+istanbul-lib-source-maps@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.1.0.tgz#9d429218f35b823560ea300a96ff0c3bbdab785f"
   dependencies:
@@ -3054,7 +3053,7 @@ istanbul-lib-source-maps@^1.0.0-alpha:
     rimraf "^2.4.4"
     source-map "^0.5.3"
 
-istanbul-reports@^1.0.0-alpha:
+istanbul-reports@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.0.0.tgz#24b4eb2b1d29d50f103b369bd422f6e640aa0777"
   dependencies:
@@ -3295,7 +3294,7 @@ js-tokens@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-2.0.0.tgz#79903f5563ee778cc1162e6dcf1a0027c97f9cb5"
 
-js-yaml@3.x, js-yaml@^3.5.1:
+js-yaml@3.x, js-yaml@^3.5.1, js-yaml@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
   dependencies:
@@ -3758,13 +3757,13 @@ mime-db@~1.23.0:
   version "1.23.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.23.0.tgz#a31b4070adaea27d732ea333740a64d0ec9a6659"
 
-mime-types@2.1.11:
+mime-types@2.1.11, mime-types@~2.1.9:
   version "2.1.11"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.11.tgz#c259c471bda808a85d6cd193b430a5fae4473b3c"
   dependencies:
     mime-db "~1.23.0"
 
-mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.6, mime-types@~2.1.7, mime-types@~2.1.9:
+mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.6, mime-types@~2.1.7:
   version "2.1.13"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.13.tgz#e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88"
   dependencies:
@@ -3780,18 +3779,12 @@ min-document@^2.19.0:
   dependencies:
     dom-walk "^0.1.0"
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2:
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
   dependencies:
     brace-expansion "^1.0.0"
 
-minimatch@2.x:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"
-  dependencies:
-    brace-expansion "^1.0.0"
-
 minimist@0.0.8, minimist@~0.0.1:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
@@ -4023,7 +4016,7 @@ on-headers@~1.0.0, on-headers@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
 
-once@1.x, once@^1.3.0:
+once@1.x, once@^1.3.0, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
@@ -5181,8 +5174,8 @@ time-stamp@^1.0.0:
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.0.1.tgz#9f4bd23559c9365966f3302dbba2b07c6b99b151"
 
 timed-out@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-3.1.0.tgz#43b98b14bb712c9161c28f4dc1f3068d67a04ec2"
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-3.1.3.tgz#95860bfcc5c76c277f8f8326fd0f5b2e20eba217"
 
 tmpl@1.0.x:
   version "1.0.4"