From b653fe0bd34ff7c2032e112dd4a35f67f4c7e882 Mon Sep 17 00:00:00 2001
From: Nicolas Gallagher <nicolasgallagher@gmail.com>
Date: Sat, 18 Feb 2017 12:18:26 -0800
Subject: [PATCH] [add] fontFeatureSettings 'Text' style

Fix #331
---
 docs/components/Text.md                     | 1 +
 src/apis/StyleSheet/StyleSheetValidation.js | 4 +---
 src/components/Text/TextStylePropTypes.js   | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/components/Text.md b/docs/components/Text.md
index 40cd4214..fa8e2222 100644
--- a/docs/components/Text.md
+++ b/docs/components/Text.md
@@ -63,6 +63,7 @@ Lets the user select the text.
 + ...[View#style](View.md)
 + `color`
 + `fontFamily`
++ `fontFeatureSettings` ‡
 + `fontSize`
 + `fontStyle`
 + `fontWeight`
diff --git a/src/apis/StyleSheet/StyleSheetValidation.js b/src/apis/StyleSheet/StyleSheetValidation.js
index 0a90a37c..ef41d1dc 100644
--- a/src/apis/StyleSheet/StyleSheetValidation.js
+++ b/src/apis/StyleSheet/StyleSheetValidation.js
@@ -71,12 +71,10 @@ StyleSheetValidation.addValidStylePropTypes({
   appearance: PropTypes.string,
   clear: PropTypes.string,
   cursor: PropTypes.string,
-  display: PropTypes.string,
   float: PropTypes.oneOf([ 'left', 'none', 'right' ]),
   font: PropTypes.string, /* @private */
   listStyle: PropTypes.string,
-  pointerEvents: PropTypes.string,
-  WebkitOverflowScrolling: PropTypes.string /* @private */
+  pointerEvents: PropTypes.string
 })
 
 module.exports = StyleSheetValidation
diff --git a/src/components/Text/TextStylePropTypes.js b/src/components/Text/TextStylePropTypes.js
index 54c4150c..dae20e27 100644
--- a/src/components/Text/TextStylePropTypes.js
+++ b/src/components/Text/TextStylePropTypes.js
@@ -12,6 +12,7 @@ const WritingDirectionPropType = oneOf([ 'auto', 'ltr', 'rtl' ]);
 const TextOnlyStylePropTypes = {
   color: ColorPropType,
   fontFamily: string,
+  fontFeatureSettings: string,
   fontSize: numberOrString,
   fontStyle: string,
   fontWeight: string,