Skip to content

[Icon Menu] Support for closeAfterTap. #1124

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

Closed
wants to merge 16 commits into from
Closed

[Icon Menu] Support for closeAfterTap. #1124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ce9e97c
Adding closeAfterTap switch.
mkucharz Jul 11, 2015
b460c1b
Addressing comments.
mkucharz Jul 12, 2015
f6f887d
Merge branch 'master' of github.com:Syncano/material-ui into icon-men…
mkucharz Jul 13, 2015
555fcb3
Missing comma.
mkucharz Jul 13, 2015
ebb6266
update dropdown spacing to reflect material spec
salarkhan Jul 11, 2015
fe9db5b
[eslint] fix comma-dangle after release of eslint 0.24.0
oliviertassinari Jul 10, 2015
547a838
Fixed PR that did not incorporate errorStyles prop
Zadielerick Jul 10, 2015
165391c
[Dialog] fix contentClassName not used
oliviertassinari Jul 11, 2015
a54d6ab
Support for setting width of "checkbox column" in a table.
mkucharz Jul 11, 2015
54a92d0
[Docs] Support for setting width of "checkbox column" in a table.
mkucharz Jul 11, 2015
cfc3e07
Removing prop.
mkucharz Jul 12, 2015
cfadbe2
[eslint] enforce rule no-var
oliviertassinari Jul 12, 2015
9c27e5e
Add 'border-radius: 0' to LeftNav menu style.
maoziliang Jul 12, 2015
10440ac
Fix `tooltipPosition` props in IconButton example
LFDM Jul 12, 2015
d57ffd8
Missing comma.
mkucharz Jul 13, 2015
460f642
Merge branch 'icon-menu-closeAfterTap' of github.com:Syncano/material…
mkucharz Jul 13, 2015
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
6 changes: 6 additions & 0 deletions docs/src/app/components/pages/components/icon-menus.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ class IconMenus extends React.Component {
type: 'number',
header: 'default: 200',
desc: 'Sets the delay in milliseconds before closing the menu when an item is clicked.'
},
{
name: 'closeOnItemTouchTap',
type: 'bool',
header: 'optional',
desc: 'If false, menu will not be closed after tap (default: true).'
}
]
},
Expand Down
17 changes: 11 additions & 6 deletions src/menus/icon-menu.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ let IconMenu = React.createClass({
onTouchTap: React.PropTypes.func,
menuStyle: React.PropTypes.object,
touchTapCloseDelay: React.PropTypes.number,
closeOnItemTouchTap: React.PropTypes.bool,
},

getDefaultProps() {
Expand All @@ -46,6 +47,7 @@ let IconMenu = React.createClass({
onMouseUp: () => {},
onTouchTap: () => {},
touchTapCloseDelay: 200,
closeOnItemTouchTap: true,
};
},

Expand Down Expand Up @@ -160,14 +162,17 @@ let IconMenu = React.createClass({
},

_handleItemTouchTap(e, child) {
let isKeyboard = Events.isKeyboard(e);

this._timeout = setTimeout(() => {
this.close(isKeyboard);
}, this.props.touchTapCloseDelay);
if (this.props.closeOnItemTouchTap) {
let isKeyboard = Events.isKeyboard(e);

if (isKeyboard) {
this.refs[this.state.iconButtonRef].setKeyboardFocus();
this._timeout = setTimeout(() => {
this.close(isKeyboard);
}, this.props.touchTapCloseDelay);

if (isKeyboard) {
this.refs[this.state.iconButtonRef].setKeyboardFocus();
}
}
Copy link
Member

@hai-cea hai-cea Jul 12, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, I think all of the isKeyboard logic should be inside the the new if block.


this.props.onItemTouchTap(e, child);
Expand Down