Fix font PropTypes

This commit is contained in:
Mikael Sand
2017-07-23 22:55:39 +03:00
parent fc61c9dad2
commit 80b9ff9d57
6 changed files with 103 additions and 31 deletions

View File

@@ -44,33 +44,37 @@ function parseFontString(font) {
export function extractFont(props) {
const {
letterSpacing,
wordSpacing,
fontWeight,
fontStyle,
kerning,
fontVariant,
fontWeight,
fontStretch,
textAnchor,
textDecoration,
letterSpacing,
wordSpacing,
kerning,
} = props;
let {
font,
fontSize,
fontFamily,
font,
} = props;
fontFamily = extractSingleFontFamily(fontFamily);
fontSize = fontSize ? '' + fontSize : null;
const ownedFont = _.pickBy({
fontFamily,
letterSpacing,
wordSpacing,
fontWeight,
fontStyle,
fontVariant,
fontWeight,
fontStretch,
fontSize,
kerning,
fontFamily,
textAnchor,
textDecoration,
letterSpacing,
wordSpacing,
kerning,
}, prop => !_.isNil(prop));
if (typeof font === 'string') {