Skip to content

enable click to close in iOS (#301) #304

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 1 commit into from
Closed

enable click to close in iOS (#301) #304

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 7 additions & 24 deletions lib/components/ModalPortal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,29 +153,14 @@ export default class ModalPortal extends Component {
}
}

handleOverlayMouseDown = () => {
if (this.shouldClose === null) {
this.shouldClose = true;
}
}

handleOverlayMouseUp = (event) => {
if (this.shouldClose && this.props.shouldCloseOnOverlayClick) {
if (this.ownerHandlesClose()) {
this.requestClose(event);
} else {
this.focusContent();
}
handleOverlayClick(event) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Lint: handleOverlayClick (event).

if (this.props.shouldCloseOnOverlayClick && this.ownerHandlesClose()) {
this.requestClose(event);
}
this.shouldClose = null;
}

handleContentMouseDown = () => {
this.shouldClose = false;
}

handleContentMouseUp = () => {
this.shouldClose = false;
handleContentClick(event) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Lint: handleContentClick (event).

Copy link
Collaborator

@diasbruno diasbruno Jan 10, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

Also...

Lint: static handleContentClick (event).

eslint/class-methods-use-this

If a class method does not use this, it can safely be made a static function.

Hope this one is correct.

event.stopPropagation();
}

requestClose (event) {
Expand Down Expand Up @@ -217,17 +202,15 @@ export default class ModalPortal extends Component {
ref={(c) => { this.overlay = c; }}
className={this.buildClassName('overlay', this.props.overlayClassName)}
style={Assign({}, overlayStyles, this.props.style.overlay || {})}
onMouseDown={this.handleOverlayMouseDown}
onMouseUp={this.handleOverlayMouseUp}
onClick={this.handleOverlayClick}
>
<div
ref={(c) => { this.content = c; }}
style={Assign({}, contentStyles, this.props.style.content || {})}
className={this.buildClassName('content', this.props.className)}
tabIndex={-1}
onKeyDown={this.handleKeyDown}
onMouseDown={this.handleContentMouseDown}
onMouseUp={this.handleContentMouseUp}
onClick={this.handleContentClick}
role={this.props.role}
aria-label={this.props.contentLabel}
>
Expand Down