Skip to content

[Enhancement] Support nodes within other frames #156

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
Craga89 wants to merge 3 commits into from
Closed

[Enhancement] Support nodes within other frames #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
083461c
Use getOwnerDocument instead of bare document
Craga89 May 17, 2016
1b53470
Add getOwnerDocument DOM utility
Craga89 May 17, 2016
a538e97
Fix whitespace
Craga89 May 17, 2016
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
23 changes: 14 additions & 9 deletions lib/DraggableCore.es6
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// @flow
import React, {PropTypes} from 'react';
import {matchesSelector, addEvent, removeEvent, addUserSelectStyles,
import { findDOMNode } from 'react-dom';
import {getOwnerDocument, matchesSelector, addEvent, removeEvent, addUserSelectStyles,
removeUserSelectStyles, styleHacks} from './utils/domFns';
import {createCoreData, getControlPosition, snapToGrid} from './utils/positionFns';
import {dontSetMe} from './utils/shims';
Expand Down Expand Up @@ -168,12 +169,14 @@ export default class DraggableCore extends React.Component {
};

componentWillUnmount() {
var doc = getOwnerDocument(findDOMNode(this));

// Remove any leftover event handlers. Remove both touch and mouse handlers in case
// some browser quirk caused a touch event to fire during a mouse move, or vice versa.
removeEvent(document, eventsFor.mouse.move, this.handleDrag);
removeEvent(document, eventsFor.touch.move, this.handleDrag);
removeEvent(document, eventsFor.mouse.stop, this.handleDragStop);
removeEvent(document, eventsFor.touch.stop, this.handleDragStop);
removeEvent(doc, eventsFor.mouse.move, this.handleDrag);
removeEvent(doc, eventsFor.touch.move, this.handleDrag);
removeEvent(doc, eventsFor.mouse.stop, this.handleDragStop);
removeEvent(doc, eventsFor.touch.stop, this.handleDragStop);
if (this.props.enableUserSelectHack) removeUserSelectStyles();
}

Expand Down Expand Up @@ -229,8 +232,9 @@ export default class DraggableCore extends React.Component {
// Add events to the document directly so we catch when the user's mouse/touch moves outside of
// this element. We use different events depending on whether or not we have detected that this
// is a touch-capable device.
addEvent(document, dragEventFor.move, this.handleDrag);
addEvent(document, dragEventFor.stop, this.handleDragStop);
var doc = getOwnerDocument(findDOMNode(this));
addEvent(doc, dragEventFor.move, this.handleDrag);
addEvent(doc, dragEventFor.stop, this.handleDragStop);
};

handleDrag: EventHandler<MouseEvent> = (e) => {
Expand Down Expand Up @@ -291,8 +295,9 @@ export default class DraggableCore extends React.Component {

// Remove event handlers
log('DraggableCore: Removing handlers');
removeEvent(document, dragEventFor.move, this.handleDrag);
removeEvent(document, dragEventFor.stop, this.handleDragStop);
var doc = getOwnerDocument(findDOMNode(this));
removeEvent(doc, dragEventFor.move, this.handleDrag);
removeEvent(doc, dragEventFor.stop, this.handleDragStop);
};

onMouseDown: EventHandler<MouseEvent> = (e) => {
Expand Down
8 changes: 8 additions & 0 deletions lib/utils/domFns.es6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@ export function matchesSelector(el: Node, selector: string): boolean {
return el[matchesSelectorFunc].call(el, selector);
}

export function getOwnerDocument(node) {
if (node.contentWindow) {
return node.contentWindow.document;
}

return node.contentDocument || node.ownerDocument || node.document;
}

export function addEvent(el: ?Node, event: string, handler: Function): void {
if (!el) { return; }
if (el.attachEvent) {
Expand Down