Merge pull request mui#1096 from oliviertassinari/listitem2

hai-cea · hai-cea · commit 42777f2028bf · 2015-07-09T20:31:52.000-05:00
[ListItem] do not enable nested for no ListItem component
diff --git a/src/lists/list-item.jsx b/src/lists/list-item.jsx
@@ -224,8 +224,7 @@ let ListItem = React.createClass({
     React.Children.forEach(this.props.children, (child) => {
       if (child === null) return;
 
-      //consider all element to be nested except literals.
-      if (React.isValidElement(child)) {
+      if (React.isValidElement(child) && child.type.displayName === 'ListItem') {
         nestedListItems.push(child);
       }
       else {

Original file line number	Diff line number	Diff line change
`@@ -224,8 +224,7 @@ let ListItem = React.createClass({`
`224`	`224`	`React.Children.forEach(this.props.children, (child) => {`
`225`	`225`	`if (child === null) return;`
`226`	`226`
`227`		`- //consider all element to be nested except literals.`
`228`		`- if (React.isValidElement(child)) {`
	`227`	`+ if (React.isValidElement(child) && child.type.displayName === 'ListItem') {`
`229`	`228`	`nestedListItems.push(child);`
`230`	`229`	`}`
`231`	`230`	`else {`