Skip to content

Fix #193 #197

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
merged 3 commits into from
Sep 13, 2018
Merged

Fix #193 #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02ecb34
7.4.7
picodoth Sep 12, 2018
53e81a4
Fixed hidden submenu rendering
amh4r Sep 13, 2018
248d6c3
fix: keep original behavior
picodoth Sep 13, 2018
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rc-menu",
"version": "7.4.6",
"version": "7.4.7",
"description": "menu ui component for react",
"keywords": [
"react",
Expand Down
19 changes: 9 additions & 10 deletions src/DOMWrap.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ class DOMWrap extends React.Component {

this.overflowedItems = [];
let currentSumWidth = 0;
const children = this.props.children;

// index for last visible child in horizontal mode
let lastVisibleIndex = undefined;
Expand All @@ -172,15 +171,6 @@ class DOMWrap extends React.Component {
lastVisibleIndex++;
}
});

children.slice(lastVisibleIndex + 1).forEach(c => {
// children[index].key will become '.$key' in clone by default,
// we have to overwrite with the correct key explicitly
this.overflowedItems.push(React.cloneElement(
c,
{ key: c.props.eventKey, mode: 'vertical-left' },
));
});
}

this.setState({ lastVisibleIndex });
Expand All @@ -205,6 +195,15 @@ class DOMWrap extends React.Component {
);
}
if (index === lastVisibleIndex + 1) {
this.overflowedItems = children.slice(lastVisibleIndex + 1).map(c => {
return React.cloneElement(
c,
// children[index].key will become '.$key' in clone by default,
// we have to overwrite with the correct key explicitly
{ key: c.props.eventKey, mode: 'vertical-left' },
);
});

overflowed = this.getOverflowedSubMenuItem(
childNode.props.eventKey,
this.overflowedItems,
Expand Down