Skip to content

fix: menu regression #295

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 4 commits into from
Apr 28, 2018
Merged

fix: menu regression #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0a83aa
fix: menu regression
picodoth Apr 28, 2018
de741a1
Merge branch 'master' into fix-menu-regression
afc163 Apr 28, 2018
307cf12
Merge branch 'master' into fix-menu-regression
afc163 Apr 28, 2018
967eb41
fix: add option for all menuItem
picodoth Apr 28, 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
Expand Up @@ -74,7 +74,7 @@
"dom-scroll-into-view": "1.x",
"prop-types": "^15.5.8",
"rc-animate": "2.x",
"rc-menu": "^7.0.1",
"rc-menu": "^7.0.2",
"rc-trigger": "^2.2.0",
"rc-util": "^4.0.4",
"warning": "^3.0.0"
Expand Down
7 changes: 5 additions & 2 deletions src/Select.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,9 @@ export default class Select extends React.Component {
};

onMenuSelect = ({ item }) => {
if (!item) {
return;
}
let value = this.state.value;
const props = this.props;
const selectedValue = getValuePropValue(item);
Expand Down Expand Up @@ -921,7 +924,7 @@ export default class Select extends React.Component {
const menuItem = (
<MenuItem
style={UNSELECTABLE_STYLE}
role={null}
role="option"
attribute={UNSELECTABLE_ATTRIBUTE}
value={key}
key={key}
Expand Down Expand Up @@ -953,7 +956,7 @@ export default class Select extends React.Component {
options.unshift(
<MenuItem
style={UNSELECTABLE_STYLE}
role={null}
role="option"
attribute={UNSELECTABLE_ATTRIBUTE}
value={inputValue}
key={inputValue}
Expand Down
5 changes: 1 addition & 4 deletions tests/__snapshots__/DropdownMenu.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ exports[`DropdownMenu renders correctly 1`] = `
style="overflow:auto"
>
<ul
aria-activedescendant=""
class="undefined-menu undefined-menu-root undefined-menu-vertical"
role="menu"
role="listbox"
tabindex="0"
>
<li
Expand All @@ -20,7 +19,6 @@ exports[`DropdownMenu renders correctly 1`] = `
class="undefined-menu-item-group-list"
>
<li
aria-selected="true"
class="undefined-menu-item undefined-menu-item-selected"
role="menuitem"
>
Expand All @@ -38,7 +36,6 @@ exports[`DropdownMenu renders correctly 1`] = `
class="undefined-menu-item-group-list"
>
<li
aria-selected="false"
class="undefined-menu-item"
role="menuitem"
>
Expand Down
23 changes: 10 additions & 13 deletions tests/__snapshots__/Select.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,14 @@ Array [
style="overflow:auto"
>
<ul
aria-activedescendant=""
class="rc-select-dropdown-menu rc-select-dropdown-menu-root rc-select-dropdown-menu-vertical"
role="menu"
role="listbox"
tabindex="0"
>
<li
aria-selected="false"
class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-active"
role="menuitem"
role="option"
style="user-select:none;-webkit-user-select:none"
unselectable="on"
>
Expand All @@ -71,7 +70,7 @@ Array [
<li
aria-selected="false"
class="rc-select-dropdown-menu-item"
role="menuitem"
role="option"
style="user-select:none;-webkit-user-select:none"
unselectable="on"
>
Expand Down Expand Up @@ -138,15 +137,14 @@ Array [
style="overflow:auto"
>
<ul
aria-activedescendant=""
class="rc-select-dropdown-menu rc-select-dropdown-menu-root rc-select-dropdown-menu-vertical"
role="menu"
role="listbox"
tabindex="0"
>
<li
aria-selected="false"
class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-active"
role="menuitem"
role="option"
style="user-select:none;-webkit-user-select:none"
unselectable="on"
>
Expand All @@ -155,7 +153,7 @@ Array [
<li
aria-selected="false"
class="rc-select-dropdown-menu-item"
role="menuitem"
role="option"
style="user-select:none;-webkit-user-select:none"
unselectable="on"
>
Expand Down Expand Up @@ -409,9 +407,8 @@ Array [
style="overflow:auto"
>
<ul
aria-activedescendant=""
class="antd-dropdown-menu antd-dropdown-menu-root antd-dropdown-menu-vertical"
role="menu"
role="listbox"
tabindex="0"
>
<li
Expand All @@ -429,7 +426,7 @@ Array [
<li
aria-selected="false"
class="antd-dropdown-menu-item option-test antd-dropdown-menu-item-active"
role="menuitem"
role="option"
style="user-select:none;-webkit-user-select:none"
unselectable="on"
>
Expand All @@ -442,7 +439,7 @@ Array [
<li
aria-selected="false"
class="antd-dropdown-menu-item"
role="menuitem"
role="option"
style="user-select:none;-webkit-user-select:none"
unselectable="on"
>
Expand All @@ -465,7 +462,7 @@ Array [
<li
aria-selected="false"
class="antd-dropdown-menu-item"
role="menuitem"
role="option"
style="user-select:none;-webkit-user-select:none"
unselectable="on"
>
Expand Down
44 changes: 19 additions & 25 deletions tests/__snapshots__/Select.tags.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,8 @@ exports[`Select.tags OptGroup renders correctly 1`] = `
style="overflow: auto;"
>
<ul
aria-activedescendant=""
class="rc-select-dropdown-menu rc-select-dropdown-menu-root rc-select-dropdown-menu-vertical"
role="menu"
role="listbox"
tabindex="0"
>
<li
Expand All @@ -97,7 +96,7 @@ exports[`Select.tags OptGroup renders correctly 1`] = `
<li
aria-selected="true"
class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-active rc-select-dropdown-menu-item-selected"
role="menuitem"
role="option"
style=""
unselectable="on"
>
Expand All @@ -120,7 +119,7 @@ exports[`Select.tags OptGroup renders correctly 1`] = `
<li
aria-selected="false"
class="rc-select-dropdown-menu-item"
role="menuitem"
role="option"
unselectable="on"
>
yiminghe
Expand All @@ -130,7 +129,7 @@ exports[`Select.tags OptGroup renders correctly 1`] = `
<li
aria-selected="true"
class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-selected"
role="menuitem"
role="option"
unselectable="on"
>
foo
Expand Down Expand Up @@ -192,15 +191,14 @@ exports[`Select.tags OptGroup renders inputValue correctly 1`] = `
style="overflow: auto;"
>
<ul
aria-activedescendant=""
class="rc-select-dropdown-menu rc-select-dropdown-menu-root rc-select-dropdown-menu-vertical"
role="menu"
role="listbox"
tabindex="0"
>
<li
aria-selected="false"
class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-active"
role="menuitem"
role="option"
style=""
unselectable="on"
>
Expand Down Expand Up @@ -277,9 +275,8 @@ exports[`Select.tags OptGroup renders inputValue correctly 2`] = `
style="overflow: auto;"
>
<ul
aria-activedescendant=""
class="rc-select-dropdown-menu rc-select-dropdown-menu-root rc-select-dropdown-menu-vertical"
role="menu"
role="listbox"
tabindex="0"
>
<li
Expand All @@ -297,7 +294,7 @@ exports[`Select.tags OptGroup renders inputValue correctly 2`] = `
<li
aria-selected="false"
class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-active"
role="menuitem"
role="option"
style=""
unselectable="on"
>
Expand All @@ -320,7 +317,7 @@ exports[`Select.tags OptGroup renders inputValue correctly 2`] = `
<li
aria-selected="false"
class="rc-select-dropdown-menu-item"
role="menuitem"
role="option"
unselectable="on"
>
yiminghe
Expand All @@ -330,7 +327,7 @@ exports[`Select.tags OptGroup renders inputValue correctly 2`] = `
<li
aria-selected="true"
class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-selected"
role="menuitem"
role="option"
style=""
unselectable="on"
>
Expand Down Expand Up @@ -898,15 +895,14 @@ Array [
style="overflow:auto"
>
<ul
aria-activedescendant=""
class="rc-select-dropdown-menu rc-select-dropdown-menu-root rc-select-dropdown-menu-vertical"
role="menu"
role="listbox"
tabindex="0"
>
<li
aria-selected="false"
class="rc-select-dropdown-menu-item"
role="menuitem"
role="option"
style="user-select:none;-webkit-user-select:none"
unselectable="on"
>
Expand All @@ -915,7 +911,7 @@ Array [
<li
aria-selected="true"
class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-active rc-select-dropdown-menu-item-selected"
role="menuitem"
role="option"
style="user-select:none;-webkit-user-select:none"
unselectable="on"
>
Expand Down Expand Up @@ -990,15 +986,14 @@ Array [
style="overflow:auto"
>
<ul
aria-activedescendant=""
class="rc-select-dropdown-menu rc-select-dropdown-menu-root rc-select-dropdown-menu-vertical"
role="menu"
role="listbox"
tabindex="0"
>
<li
aria-selected="false"
class="rc-select-dropdown-menu-item"
role="menuitem"
role="option"
style="user-select:none;-webkit-user-select:none"
unselectable="on"
>
Expand All @@ -1007,7 +1002,7 @@ Array [
<li
aria-selected="false"
class="rc-select-dropdown-menu-item"
role="menuitem"
role="option"
style="user-select:none;-webkit-user-select:none"
unselectable="on"
>
Expand All @@ -1016,7 +1011,7 @@ Array [
<li
aria-selected="true"
class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-active rc-select-dropdown-menu-item-selected"
role="menuitem"
role="option"
style="user-select:none;-webkit-user-select:none"
unselectable="on"
>
Expand Down Expand Up @@ -1076,15 +1071,14 @@ Array [
style="overflow:auto"
>
<ul
aria-activedescendant=""
class="rc-select-dropdown-menu rc-select-dropdown-menu-root rc-select-dropdown-menu-vertical"
role="menu"
role="listbox"
tabindex="0"
>
<li
aria-selected="false"
class="rc-select-dropdown-menu-item rc-select-dropdown-menu-item-active"
role="menuitem"
role="option"
style="user-select:none;-webkit-user-select:none"
unselectable="on"
>
Expand Down