Remove eslint rule for style/children props

mxenabled · Oct 1, 2015 · 988d07a · 988d07a
1 parent 3e3646e
commit 988d07a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -186,7 +186,7 @@
     "react/no-did-update-set-state": 2,
     "react/no-multi-comp": 2,
     "react/no-unknown-property": 2,
-    "react/prop-types": 0,
+    "react/prop-types": [2, { "ignore": ["style", "children"] }],
     "react/react-in-jsx-scope": 2,
     "react/require-extension": [2, { "extensions": [".js", ".jsx"] }],
     "react/self-closing-comp": 2,

diff --git a/src/components/TypeAhead.js b/src/components/TypeAhead.js
@@ -8,14 +8,10 @@ const StyleConstants = require('../constants/Style');
 const TypeAhead = React.createClass({
   propTypes: {
     items: React.PropTypes.array,
-    onItemsRemove: React.PropTypes.func,
-    onItemsSelect: React.PropTypes.func,
+    onItemRemove: React.PropTypes.func,
+    onItemSelect: React.PropTypes.func,
     placeholderText: React.PropTypes.string,
-    selectedItems: React.PropTypes.array,
-    style: React.PropTypes.oneOfType([
-      React.PropTypes.array,
-      React.PropTypes.object
-    ])
+    preSelectedItems: React.PropTypes.array
   },
 
   getDefaultProps () {
@@ -286,7 +282,7 @@ const TypeAhead = React.createClass({
       <div
         onBlur={this._handleBlur}
         onFocus={this._handleFocus}
-        style={[styles.component]}
+        style={[styles.component, this.props.style]}
         tabIndex='0'
       >
         {this._renderSelectedItems()}