Merge branch 'v2.0' of https://github.com/wix/react-native-navigation into v2.0

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

@@ -2,8 +2,6 @@ package com.reactnativenavigation.params.parsers;
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
 import com.reactnativenavigation.params.AppStyle;
 import com.reactnativenavigation.params.StyleParams;
@@ -72,7 +70,6 @@ public class StyleParamsParser {
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.selectedTopTabTextColor;
     }
 
-    @Nullable
     private StyleParams.Color getDefaultNavigationColor() {
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.navigationBarColor;
     }
@@ -81,17 +78,14 @@ public class StyleParamsParser {
         return AppStyle.appStyle != null && AppStyle.appStyle.forceTitlesDisplay;
     }
 
-    @Nullable
     private StyleParams.Color getDefaultSelectedBottomTabsButtonColor() {
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.selectedBottomTabsButtonColor;
     }
 
-    @Nullable
     private StyleParams.Color getDefaultBottomTabsButtonColor() {
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.bottomTabsButtonColor;
     }
 
-    @Nullable
     private StyleParams.Color getDefaultBottomTabsColor() {
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.bottomTabsColor;
     }
@@ -120,17 +114,14 @@ public class StyleParamsParser {
         return AppStyle.appStyle != null && AppStyle.appStyle.backButtonHidden;
     }
 
-    @Nullable
     private StyleParams.Color getDefaultTitleBarColor() {
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.titleBarTitleColor;
     }
 
-    @Nullable
     private StyleParams.Color getTitleBarButtonColor() {
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.titleBarButtonColor;
     }
 
-    @Nullable
     private StyleParams.Color getTitleBarDisabledButtonColor() {
         return AppStyle.appStyle == null ? new StyleParams.Color(Color.LTGRAY) : AppStyle.appStyle.titleBarDisabledButtonColor;
     }
@@ -139,12 +130,10 @@ public class StyleParamsParser {
         return AppStyle.appStyle != null && AppStyle.appStyle.titleBarHidden;
     }
 
-    @Nullable
     private StyleParams.Color getDefaultTopBarColor() {
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.topBarColor;
     }
 
-    @Nullable
     private StyleParams.Color getDefaultStatusBarColor() {
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.statusBarColor;
     }
@@ -153,7 +142,6 @@ public class StyleParamsParser {
         return params.containsKey(key) ? params.getBoolean(key) : defaultValue;
     }
 
-    @NonNull
     private StyleParams.Color getColor(String key, StyleParams.Color defaultColor) {
         StyleParams.Color color = StyleParams.Color.parse(params.getString(key));
         if (color.hasColor()) {

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

@@ -111,12 +111,14 @@ public class ScreenStack {
         final Screen previous = stack.peek();
 
         if (keyboardVisibilityDetector.isKeyboardVisible()) {
-            keyboardVisibilityDetector.closeKeyboard(new Runnable() {
+            keyboardVisibilityDetector.setKeyboardCloseListener(new Runnable() {
                 @Override
                 public void run() {
+                    keyboardVisibilityDetector.setKeyboardCloseListener(null);
                     swapScreens(animated, toRemove, previous, onScreenPop);
                 }
             });
+            keyboardVisibilityDetector.closeKeyboard();
         } else {
             swapScreens(animated, toRemove, previous, onScreenPop);
         }

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

@@ -26,8 +26,11 @@ public class KeyboardVisibilityDetector {
         return keyboardVisibilityListener.isKeyboardVisible();
     }
 
-    public void closeKeyboard(Runnable keyboardClosedListener) {
-        this.keyboardCloseListener = keyboardClosedListener;
+    public void setKeyboardCloseListener(Runnable keyboardCloseListener) {
+        this.keyboardCloseListener = keyboardCloseListener;
+    }
+
+    public void closeKeyboard() {
         InputMethodManager imm = (InputMethodManager) screen.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
         imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0);
     }

package.json

@@ -7,7 +7,7 @@
     "type": "git",
     "url": "https://github.com/wix/react-native-navigation.git"
   },
-  "version": "2.0.0-experimental.64",
+  "version": "2.0.0-experimental.66",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "nativePackage": true,
   "bugs": {

src/Navigation.js

@@ -29,12 +29,20 @@ function _registerComponentNoRedux(screenID, generator) {
 
       constructor(props) {
         super(props);
-        this.allProps = {...props, ...PropRegistry.load(props.screenInstanceID)};
+        this.state = {
+          internalProps: {...props, ...PropRegistry.load(props.screenInstanceID)}
+        }
+      }
+  
+      componentWillReceiveProps(nextProps) {
+        this.setState({
+          internalProps: {...PropRegistry.load(this.props.screenInstanceID), ...nextProps}
+        })
       }
 
       render() {
         return (
-          <InternalComponent navigator={this.navigator} {...this.allProps} />
+          <InternalComponent navigator={this.navigator} {...this.state.internalProps} />
         );
       }
     };
@@ -52,13 +60,21 @@ function _registerComponentRedux(screenID, generator, store, Provider) {
 
       constructor(props) {
         super(props);
-        this.allProps = {...props, ...PropRegistry.load(props.screenInstanceID)};
+        this.state = {
+          internalProps: {...props, ...PropRegistry.load(props.screenInstanceID)}
+        }
+      }
+      
+      componentWillReceiveProps(nextProps) {
+        this.setState({
+          internalProps: {...PropRegistry.load(this.props.screenInstanceID), ...nextProps}
+        })
       }
 
       render() {
         return (
           <Provider store={store}>
-            <InternalComponent navigator={this.navigator} {...this.allProps} />
+            <InternalComponent navigator={this.navigator} {...this.state.internalProps} />
           </Provider>
         );
       }

src/deprecated/platformSpecificDeprecated.android.js

@@ -115,6 +115,7 @@ function convertStyleParams(originalStyleObject) {
     titleBarHidden: originalStyleObject.navBarHidden,
     titleBarTitleColor: originalStyleObject.navBarTextColor,
     titleBarButtonColor: originalStyleObject.navBarButtonColor,
+    titleBarDisabledButtonColor: originalStyleObject.titleBarDisabledButtonColor,
     backButtonHidden: originalStyleObject.backButtonHidden,
     topTabsHidden: originalStyleObject.topTabsHidden,