kylefang/react-native-vector-icons
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native-vector-icons.git synced 2026-06-19 01:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'toolbarandroid-props-change-fix'

Browse Source
This commit is contained in:
Joel Arvidsson
2016-03-27 21:02:11 -05:00
parent ce22fd87c4 0bdb671139
commit abcdfd39bb
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/create-icon-set.js
View File

@@ -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);
}
}
},