Skip to content

Commit

Permalink
fix: throw exception when has none collapse-panel in default slot
Browse files Browse the repository at this point in the history
  • Loading branch information
ly303550688 committed Aug 21, 2019
1 parent 095406e commit b5e1003
Showing 1 changed file with 36 additions and 34 deletions.
70 changes: 36 additions & 34 deletions components/vc-collapse/src/Collapse.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,44 +70,46 @@ export default {
const activeKey = this.stateActiveKey;
const { prefixCls, accordion, destroyInactivePanel, expandIcon } = this.$props;
const newChildren = [];
this.$slots.default.forEach((child, index) => {
if (isEmptyElement(child)) return;
const { header, headerClass, disabled } = getPropsData(child);
let isActive = false;
const key = child.key || String(index);
if (accordion) {
isActive = activeKey[0] === key;
} else {
isActive = activeKey.indexOf(key) > -1;
}
if (this.$slots.default) {
this.$slots.default.forEach((child, index) => {
if (isEmptyElement(child)) return;
const { header, headerClass, disabled } = getPropsData(child);
let isActive = false;
const key = child.key || String(index);
if (accordion) {
isActive = activeKey[0] === key;
} else {
isActive = activeKey.indexOf(key) > -1;
}

let panelEvents = {};
if (!disabled && disabled !== '') {
panelEvents = {
itemClick: () => {
this.onClickItem(key);
let panelEvents = {};
if (!disabled && disabled !== '') {
panelEvents = {
itemClick: () => {
this.onClickItem(key);
},
};
}

const props = {
props: {
header,
headerClass,
isActive,
prefixCls,
destroyInactivePanel,
openAnimation: this.currentOpenAnimations,
accordion,
expandIcon,
},
on: {
...panelEvents,
},
};
}

const props = {
props: {
header,
headerClass,
isActive,
prefixCls,
destroyInactivePanel,
openAnimation: this.currentOpenAnimations,
accordion,
expandIcon,
},
on: {
...panelEvents,
},
};

newChildren.push(cloneElement(child, props));
});
newChildren.push(cloneElement(child, props));
});
}
return newChildren;
},
setActiveKey(activeKey) {
Expand Down

0 comments on commit b5e1003

Please sign in to comment.