Skip to content

fix: the children of <Collapse /> could be null #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shepherdwind merged 2 commits into from
Nov 18, 2016
Merged

fix: the children of <Collapse /> could be null #45

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6f846a
fix: the children of <Collapse /> could be null
ystarlongzi Nov 17, 2016
06a1d50
remove trailing spaces
ystarlongzi Nov 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/Collapse.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,10 @@ const Collapse = React.createClass({
getItems() {
const activeKey = this.state.activeKey;
const { prefixCls, accordion } = this.props;
return Children.map(this.props.children, (child, index) => {
const newChildren = [];

Children.forEach(this.props.children, (child, index) => {
if (!child) return;
// If there is no key provide, use the panel order as default key
const key = child.key || String(index);
const header = child.props.header;
Expand All @@ -112,8 +115,10 @@ const Collapse = React.createClass({
onItemClick: this.onClickItem(key).bind(this),
};

return React.cloneElement(child, props);
newChildren.push(React.cloneElement(child, props));
});

return newChildren;
},

setActiveKey(activeKey) {
Expand Down