Merge branch 'toolbarandroid-props-change-fix'

wi100sh · Mar 28, 2016 · abcdfd3 · abcdfd3
2 parents ce22fd8 + 0bdb671
commit abcdfd3
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/lib/create-icon-set.js b/lib/create-icon-set.js
@@ -277,7 +277,18 @@ function createIconSet(glyphMap : Object, fontFamily : string, fontFile : string
     componentWillReceiveProps: function(nextProps) {
       var keys = Object.keys(IconToolbarAndroid.propTypes);
       if(!isEqual(pick(nextProps, keys), pick(this.props, keys))) {
-        this.updateIconSources(nextProps);
+        var stateToEvict = [];
+        if (!nextProps.navIconName) {
+          stateToEvict.push('navIcon');
+        }
+        if (!nextProps.iconName) {
+          stateToEvict.push('icon');
+        }
+        if (this.state && stateToEvict.length) {
+          this.replaceState(omit(this.state, stateToEvict), () => this.updateIconSources(nextProps));
+        } else {
+          this.updateIconSources(nextProps);
+        }
       }
     },