Skip to content

close dialog on ESC #6

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
yiminghe merged 2 commits into from
Jul 3, 2015
Merged

close dialog on ESC #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83ecee7
feat: close dialog when esc
xujihui1985 Jul 3, 2015
c9a0262
feat: don't close dialog if closable is false
xujihui1985 Jul 3, 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
19 changes: 17 additions & 2 deletions src/Dialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
var React = require('react');
var domAlign = require('dom-align');
var RcUtil = require('rc-util');
var KeyCode = RcUtil.KeyCode;
var Dom = RcUtil.Dom;
var assign = require('object-assign');
var anim = require('css-animation');
Expand Down Expand Up @@ -95,6 +96,12 @@ var Dialog = React.createClass({
this.unMonitorWindowResize();
},

handleKeyDown(e) {
if (e.keyCode === KeyCode.ESC) {
this.props.onRequestClose();
}
},

render() {
var props = this.props;
var visible = props.visible;
Expand All @@ -118,15 +125,23 @@ var Dialog = React.createClass({
var style = assign({}, props.style, dest);

var maskProps = {};
var dialogProps = {
className :[prefixClsFn(prefixCls, ''), props.className].join(' '),
tabIndex: '0',
role: 'dialog',
ref: 'dialog',
style: style
};
if (closable) {
maskProps.onClick = this.props.onRequestClose;
dialogProps.onKeyDown = this.handleKeyDown;
}
if (style.zIndex) {
maskProps.style = {zIndex: style.zIndex};
}
var footer;
if (props.footer) {
footer = <div className={prefixClsFn(prefixCls, 'footer')}>{props.footer}</div>;
footer = (<div className={prefixClsFn(prefixCls, 'footer')}>{props.footer}</div>);
}
var header;
if (props.title || closable) {
Expand All @@ -141,7 +156,7 @@ var Dialog = React.createClass({
}
return (<div className={className.join(' ')}>
{props.mask !== false ? <div {...maskProps} className={prefixClsFn(prefixCls, 'mask')} ref="mask"/> : null}
<div className={[prefixClsFn(prefixCls, ''), props.className].join(' ')} tabIndex="0" role="dialog" ref='dialog' style={style}>
<div {...dialogProps}>
<div className={prefixClsFn(prefixCls, 'content')}>
{header}
<div className={prefixClsFn(prefixCls, 'body')}>{props.children}</div>
Expand Down