[add] support for vendor-prefixed font-smoothing styles

Fix #240
This commit is contained in:
Nicolas Gallagher
2016-11-23 09:58:18 -08:00
parent 94d31beaf4
commit f71dae7d93
3 changed files with 13 additions and 14 deletions

View File

@@ -79,7 +79,7 @@ const examples = [
title: 'Wrap', title: 'Wrap',
render: function() { render: function() {
return ( return (
<Text> <Text style={{ WebkitFontSmoothing: 'antialiased' }}>
The text should wrap if it goes on multiple lines. See, this is going to The text should wrap if it goes on multiple lines. See, this is going to
the next line. the next line.
</Text> </Text>

View File

@@ -18,10 +18,12 @@ var ColorPropType = require('../../propTypes/ColorPropType');
var NativeMethodsMixin = require('../../modules/NativeMethodsMixin'); var NativeMethodsMixin = require('../../modules/NativeMethodsMixin');
var React = require('react'); var React = require('react');
var StyleSheet = require('../../apis/StyleSheet'); var StyleSheet = require('../../apis/StyleSheet');
var StyleSheetPropType = require('../../propTypes/StyleSheetPropType');
var TimerMixin = require('react-timer-mixin'); var TimerMixin = require('react-timer-mixin');
var Touchable = require('./Touchable'); var Touchable = require('./Touchable');
var TouchableWithoutFeedback = require('./TouchableWithoutFeedback'); var TouchableWithoutFeedback = require('./TouchableWithoutFeedback');
var View = require('../View'); var View = require('../View');
var ViewStylePropTypes = require('../View/ViewStylePropTypes');
var ensureComponentIsNative = require('./ensureComponentIsNative'); var ensureComponentIsNative = require('./ensureComponentIsNative');
var ensurePositiveDelayProps = require('./ensurePositiveDelayProps'); var ensurePositiveDelayProps = require('./ensurePositiveDelayProps');
@@ -77,7 +79,7 @@ var TouchableHighlight = React.createClass({
* active. * active.
*/ */
underlayColor: ColorPropType, underlayColor: ColorPropType,
style: React.PropTypes.style, style: StyleSheetPropType(ViewStylePropTypes),
/** /**
* Called immediately after the underlay is shown * Called immediately after the underlay is shown
*/ */

View File

@@ -20,22 +20,19 @@ const TextPropTypes = process.env.NODE_ENV !== 'production' ? {
textAlign: TextAlignPropType, textAlign: TextAlignPropType,
textAlignVertical: oneOf([ 'auto', 'bottom', 'center', 'top' ]), textAlignVertical: oneOf([ 'auto', 'bottom', 'center', 'top' ]),
textDecorationLine: string, textDecorationLine: string,
/* @platform web */
textOverflow: string,
/* @platform web */
textRendering: oneOf([ 'auto', 'geometricPrecision', 'optimizeLegibility', 'optimizeSpeed' ]),
textShadowColor: ColorPropType, textShadowColor: ColorPropType,
textShadowOffset: ShadowOffsetPropType, textShadowOffset: ShadowOffsetPropType,
textShadowRadius: number, textShadowRadius: number,
/* @platform web */
textTransform: oneOf([ 'capitalize', 'lowercase', 'none', 'uppercase' ]),
/* @platform web */
unicodeBidi: oneOf([ 'normal', 'bidi-override', 'embed', 'isolate', 'isolate-override', 'plaintext' ]),
/* @platform web */
whiteSpace: string,
/* @platform web */
wordWrap: string,
writingDirection: WritingDirectionPropType, writingDirection: WritingDirectionPropType,
/* @platform web */
textOverflow: string,
textRendering: oneOf([ 'auto', 'geometricPrecision', 'optimizeLegibility', 'optimizeSpeed' ]),
textTransform: oneOf([ 'capitalize', 'lowercase', 'none', 'uppercase' ]),
unicodeBidi: oneOf([ 'normal', 'bidi-override', 'embed', 'isolate', 'isolate-override', 'plaintext' ]),
whiteSpace: string,
wordWrap: string,
MozOsxFontSmoothing: string,
WebkitFontSmoothing: string,
// opt-out of RTL flipping // opt-out of RTL flipping
textAlign$noI18n: TextAlignPropType, textAlign$noI18n: TextAlignPropType,
textShadowOffset$noI18n: ShadowOffsetPropType, textShadowOffset$noI18n: ShadowOffsetPropType,