From 38d5c7d5c5d5a34dc16ef5d46278315f5c57f542 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Fri, 22 Jan 2016 15:57:34 +0000 Subject: [PATCH] Filter out undefined/null children which won't render --- src/components/views/elements/TruncatedList.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/views/elements/TruncatedList.js b/src/components/views/elements/TruncatedList.js index 7cc584a7c7..275686c6be 100644 --- a/src/components/views/elements/TruncatedList.js +++ b/src/components/views/elements/TruncatedList.js @@ -42,7 +42,11 @@ module.exports = React.createClass({ render: function() { var childsJsx = this.props.children; var overflowJsx; - var childCount = React.Children.count(this.props.children); + var childArray = React.Children.toArray(this.props.children).filter((c) => { + return c != null; + }); + + var childCount = childArray.length; if (this.props.truncateAt >= 0) { var overflowCount = childCount - this.props.truncateAt; @@ -51,7 +55,7 @@ module.exports = React.createClass({ overflowJsx = this.props.createOverflowElement( overflowCount, childCount ); - var childArray = React.Children.toArray(this.props.children); + // cut out the overflow elements childArray.splice(childCount - overflowCount, overflowCount); childsJsx = childArray; // use what is left