[fixed] regression with disabled lsit items

hampusborgos · Jul 22, 2016 · 90c304f · 90c304f
1 parent 17aeefe
commit 90c304f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/List.jsx b/src/List.jsx
@@ -77,7 +77,7 @@ export default React.createClass({
     let id = instanceId(this)
       , items;
 
-    let props = _.omitOwnProps(this);
+    let elementProps = _.omitOwnProps(this);
 
     items = !data.length
       ? (
@@ -86,8 +86,8 @@ export default React.createClass({
         </li>
       ) : data.map((item, idx) => {
           var currentId = optionId(id, idx)
-            , isDisabled = isDisabledItem(item, props)
-            , isReadOnly = isReadOnlyItem(item, props);
+            , isDisabled = isDisabledItem(item, this.props)
+            , isReadOnly = isReadOnlyItem(item, this.props);
 
           return (
             <Option
@@ -120,7 +120,7 @@ export default React.createClass({
         tabIndex='-1'
         className={cn(className, 'rw-list')}
         role={role === undefined ? 'listbox' : role}
-        {...props}
+        {...elementProps}
       >
         { items }
       </ul>

diff --git a/src/ListGroupable.jsx b/src/ListGroupable.jsx
@@ -91,14 +91,14 @@ export default React.createClass({
     let { className, role, data, messages } = this.props
     let { sortedKeys, groups } = this.state;
 
-    let props = _.omitOwnProps(this);
+    let elementProps = _.omitOwnProps(this);
 
     let items = []
       , idx = -1
       , group;
 
     let id = instanceId(this);
-    
+
     this._currentActiveID = null;
 
     if (data.length) {
@@ -124,7 +124,7 @@ export default React.createClass({
         tabIndex='-1'
         className={cn(className, 'rw-list', 'rw-list-grouped')}
         role={role === undefined ? 'listbox' : role }
-        { ...props }
+        {...elementProps}
       >
         { items }
       </ul>