[Form components] fixes regarding to the pull-request review

mui · May 16, 2016 · 15e4a22 · 15e4a22
1 parent 72995e6
commit 15e4a22
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/src/DatePicker/CalendarMonth.js b/src/DatePicker/CalendarMonth.js
@@ -56,7 +56,9 @@ class CalendarMonth extends Component {
         <DayButton
           date={day}
           disabled={disabled}
-          style={Object.assign({}, disabled && {cursor: 'not-allowed'})}
+          style={{
+            cursor: disabled ? 'not-allowed' : 'inherit',
+          }}
           key={`db${(i + j)}`}
           onTouchTap={this.handleTouchTapDay}
           selected={selected}

diff --git a/src/List/ListItem.js b/src/List/ListItem.js
@@ -355,11 +355,10 @@ class ListItem extends Component {
     } = this.props;
 
     const mergedDivStyles = Object.assign(
-      {},
+      {cursor: 'not-allowed'},
       styles.root,
       styles.innerDiv,
       innerDivStyle,
-      {cursor: 'not-allowed'},
       style,
     );
 

diff --git a/src/Table/TableBody.js b/src/Table/TableBody.js
@@ -205,7 +205,10 @@ class TableBody extends Component {
       <TableRowColumn
         key={key}
         columnNumber={0}
-        style={Object.assign({width: 24}, isDisabled && {cursor: 'not-allowed'})}
+        style={{
+          width: 24,
+          cursor: isDisabled ? 'not-allowed' : 'inherit',
+        }}
       >
         {checkbox}
       </TableRowColumn>

diff --git a/src/Table/TableHeader.js b/src/Table/TableHeader.js
@@ -149,7 +149,10 @@ class TableHeader extends Component {
     return (
       <TableHeaderColumn
         key={key}
-        style={Object.assign({width: 24}, isDisabled && {cursor: 'not-allowed'})}
+        style={{
+          width: 24,
+          cursor: isDisabled ? 'not-allowed' : 'inherit',
+        }}
       >
         {checkbox}
       </TableHeaderColumn>