Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion src/RootCloseWrapper.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,11 @@ export default class RootCloseWrapper extends React.Component {
bindRootCloseHandlers() {
const doc = ownerDocument(this);

// Use capture for this listener so it fires before React's listener, to
// avoid false positives in the contains() check below if the target DOM
// element is removed in the React mouse callback.
this._onDocumentMouseListener =
addEventListener(doc, this.props.event, this.handleDocumentMouse);
addEventListener(doc, this.props.event, this.handleDocumentMouse, true);

this._onDocumentKeyupListener =
addEventListener(doc, 'keyup', this.handleDocumentKeyUp);
Expand Down
6 changes: 3 additions & 3 deletions src/utils/addEventListener.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import addEventListener from 'dom-helpers/events/on';
import removeEventListener from 'dom-helpers/events/off';

export default function (node, event, handler) {
addEventListener(node, event, handler);
export default function (node, event, handler, capture) {
addEventListener(node, event, handler, capture);
return {
remove(){
removeEventListener(node, event, handler);
removeEventListener(node, event, handler, capture);
}
};
}