Skip to content

Support iframes (nested browsing contexts) in selection event handling #7866

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
acusti wants to merge 5 commits into from
Closed

Support iframes (nested browsing contexts) in selection event handling #7866

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
74e565d
More accurate jsdoc comments
acusti Oct 4, 2016
2c2b5ad
Avoid global document and window objects, #427
acusti Oct 4, 2016
a525379
Make getting/setting selection check iframe contents
acusti Oct 4, 2016
dda228b
Use event target doc as getActiveElement context
acusti Oct 4, 2016
6b17090
Add tests for ReactInputSelection
acusti Oct 4, 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
Prev Previous commit
Next Next commit
Avoid global document and window objects, #427
  • Loading branch information
@acusti
acusti committed Oct 4, 2016
commit 2c2b5ad1a436e9f998b4780fe9b2e1c86cc7a651
16 changes: 9 additions & 7 deletions src/renderers/dom/client/ReactDOMSelection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ function isCollapsed(anchorNode, anchorOffset, focusNode, focusOffset) {
* @return {object}
*/
function getIEOffsets(node) {
var selection = document.selection;
var selection = node.ownerDocument.selection;
var selectedRange = selection.createRange();
var selectedLength = selectedRange.text.length;

Expand All @@ -63,7 +63,8 @@ function getIEOffsets(node) {
* @return {?object}
*/
function getModernOffsets(node) {
var selection = window.getSelection && window.getSelection();
var win = node.ownerDocument.defaultView;
var selection = win.getSelection && win.getSelection();

if (!selection || selection.rangeCount === 0) {
return null;
Expand Down Expand Up @@ -119,7 +120,7 @@ function getModernOffsets(node) {
var end = start + rangeLength;

// Detect whether the selection is backward.
var detectionRange = document.createRange();
var detectionRange = node.ownerDocument.createRange();
detectionRange.setStart(anchorNode, anchorOffset);
detectionRange.setEnd(focusNode, focusOffset);
var isBackward = detectionRange.collapsed;
Expand All @@ -135,7 +136,7 @@ function getModernOffsets(node) {
* @param {object} offsets
*/
function setIEOffsets(node, offsets) {
var range = document.selection.createRange().duplicate();
var range = node.ownerDocument.selection.createRange().duplicate();
var start, end;

if (offsets.end === undefined) {
Expand Down Expand Up @@ -169,11 +170,12 @@ function setIEOffsets(node, offsets) {
* @param {object} offsets
*/
function setModernOffsets(node, offsets) {
if (!window.getSelection) {
var win = node.ownerDocument.defaultView;
if (!win.getSelection) {
return;
}

var selection = window.getSelection();
var selection = win.getSelection();
var length = node[getTextContentAccessor()].length;
var start = Math.min(offsets.start, length);
var end = offsets.end === undefined ?
Expand All @@ -191,7 +193,7 @@ function setModernOffsets(node, offsets) {
var endMarker = getNodeForCharacterOffset(node, end);

if (startMarker && endMarker) {
var range = document.createRange();
var range = node.ownerDocument.createRange();
range.setStart(startMarker.node, startMarker.offset);
selection.removeAllRanges();

Expand Down
6 changes: 3 additions & 3 deletions src/renderers/dom/client/ReactInputSelection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var focusNode = require('focusNode');
var getActiveElement = require('getActiveElement');

function isInDocument(node) {
return containsNode(document.documentElement, node);
return containsNode(node.ownerDocument.documentElement, node);
}

/**
Expand Down Expand Up @@ -85,10 +85,10 @@ var ReactInputSelection = {
start: input.selectionStart,
end: input.selectionEnd,
};
} else if (document.selection &&
} else if (input.ownerDocument.selection &&
(input.nodeName && input.nodeName.toLowerCase() === 'input')) {
// IE8 input.
var range = document.selection.createRange();
var range = input.ownerDocument.selection.createRange();
// There can only be one selection per document in IE, so it must
// be in our element.
if (range.parentElement() === input) {
Expand Down
11 changes: 7 additions & 4 deletions src/renderers/dom/client/eventPlugins/SelectEventPlugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,19 @@ function getSelection(node) {
start: node.selectionStart,
end: node.selectionEnd,
};
} else if (window.getSelection) {
var selection = window.getSelection();
}
var doc = node.ownerDocument || node.document || node;
var win = doc.defaultView || doc.parentWindow;
if (win.getSelection) {
var selection = win.getSelection();
return {
anchorNode: selection.anchorNode,
anchorOffset: selection.anchorOffset,
focusNode: selection.focusNode,
focusOffset: selection.focusOffset,
};
} else if (document.selection) {
var range = document.selection.createRange();
} else if (doc.selection) {
var range = doc.selection.createRange();
return {
parentElement: range.parentElement(),
text: range.text,
Expand Down