fix Merge conflict.

This commit is contained in:
Ahmed Bouhuolia
2020-03-26 14:02:52 +02:00
parent ae29d20cc9
commit 6fd1afaba7
25 changed files with 923 additions and 454 deletions

View File

@@ -161,7 +161,9 @@ export default class MenuItem extends AbstractPureComponent2 {
className,
);
const handleAnchorClick = () => {
const handleAnchorClick = (event) => {
htmlProps.onClick && htmlProps.onClick(event);
if (dropdownType === 'collapse') {
this.setState({ isCollapseActive: !this.state.isCollapseActive });
}
@@ -210,7 +212,9 @@ export default class MenuItem extends AbstractPureComponent2 {
return (
<>
{target}
<Collapse isOpen={this.state.isCollapseActive}>{ children }</Collapse>
<Collapse isOpen={this.state.isCollapseActive} keepChildrenMounted={true}>
{ children }
</Collapse>
</>
);
}