Skip to content
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

Make DOM utilities work in nested browsing contexts #188

Merged
merged 3 commits into from
Oct 7, 2016
Merged

Make DOM utilities work in nested browsing contexts #188

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
34a95e5
[fbjs] Use relative document and window (#156)
devanecondition Sep 8, 2016
a28ba36
[fbjs] Support nested browsing contexts (#156)
acusti Sep 28, 2016
80dad7c
[fbjs] Test getActiveElement api change (#156)
acusti Sep 28, 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
5 changes: 3 additions & 2 deletions packages/fbjs/src/__forks__/Style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,16 @@ var Style = {
if (!node) {
return null;
}
while (node && node !== document.body) {
var ownerDocument = node.ownerDocument;
while (node && node !== ownerDocument.body) {
if (_isNodeScrollable(node, 'overflow') ||
_isNodeScrollable(node, 'overflowY') ||
_isNodeScrollable(node, 'overflowX')) {
return node;
}
node = node.parentNode;
}
return window;
return ownerDocument.defaultView || ownerDocument.parentWindow;
},

};
Expand Down
6 changes: 3 additions & 3 deletions packages/fbjs/src/__forks__/getUnboundedScrollPosition.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
* @return {object} Map with `x` and `y` keys.
*/
function getUnboundedScrollPosition(scrollable) {
if (scrollable === window) {
if (scrollable.Window && scrollable instanceof scrollable.Window) {
return {
x: window.pageXOffset || document.documentElement.scrollLeft,
y: window.pageYOffset || document.documentElement.scrollTop
x: scrollable.pageXOffset || scrollable.document.documentElement.scrollLeft,
y: scrollable.pageYOffset || scrollable.document.documentElement.scrollTop
};
}
return {
Expand Down
13 changes: 13 additions & 0 deletions packages/fbjs/src/core/dom/__tests__/getActiveElement-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,17 @@ describe('getActiveElement', () => {
var element = getActiveElement();
expect(element.tagName).toEqual('BODY');
});

it('uses optional document parameter when provided', () => {
var iframe = document.createElement('iframe');
document.body.appendChild(iframe);
var iframeDocument = iframe.contentDocument;
var element = getActiveElement(iframeDocument);
try {
expect(element.ownerDocument).toBe(iframeDocument);
expect(element.ownerDocument).not.toBe(document);
} finally {
document.body.removeChild(iframe);
}
});
});
12 changes: 8 additions & 4 deletions packages/fbjs/src/core/dom/getActiveElement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,19 @@
*
* The activeElement will be null only if the document or document body is not
* yet defined.
*
* @param {?DOMDocument} doc Defaults to current document.
* @return {?DOMElement}
*/
function getActiveElement() /*?DOMElement*/ {
if (typeof document === 'undefined') {
function getActiveElement(doc) /*?DOMElement*/ {
doc = doc || document;
if (typeof doc === 'undefined') {
return null;
}
try {
return document.activeElement || document.body;
return doc.activeElement || doc.body;
} catch (e) {
return document.body;
return doc.body;
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/fbjs/src/core/dom/getElementRect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const containsNode = require('containsNode');
* @return {object}
*/
function getElementRect(elem) {
const docElem = document.documentElement;
const docElem = elem.ownerDocument.documentElement;

// FF 2, Safari 3 and Opera 9.5- do not support getBoundingClientRect().
// IE9- will throw if the element is not in the document.
Expand Down
6 changes: 3 additions & 3 deletions packages/fbjs/src/core/dom/getScrollPosition.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ const getUnboundedScrollPosition = require('getUnboundedScrollPosition');
* @return {object} Map with `x` and `y` keys.
*/
function getScrollPosition(scrollable) {
const documentScrollElement = getDocumentScrollElement();
if (scrollable === window) {
const documentScrollElement = getDocumentScrollElement(scrollable.ownerDocument || scrollable.document);
if (scrollable.Window && scrollable instanceof scrollable.Window) {
scrollable = documentScrollElement;
}
const scrollPosition = getUnboundedScrollPosition(scrollable);

const viewport =
scrollable === documentScrollElement ?
document.documentElement :
scrollable.ownerDocument.documentElement :
scrollable;

const xMax = scrollable.scrollWidth - viewport.clientWidth;
Expand Down
4 changes: 3 additions & 1 deletion packages/fbjs/src/core/dom/isNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
* @return {boolean} Whether or not the object is a DOM node.
*/
function isNode(object) {
var doc = object ? (object.ownerDocument || object) : document;
var defaultView = doc.defaultView || window;
Copy link
Contributor

Choose a reason for hiding this comment

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

This will throw if doc is null, won't it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I’m thinking doc can’t be null. It definitely passes the isNode tests.

If object is null, doc is document
If object is not null but object.ownerDocument is null, doc becomes object, which wasn’t null
If object is not null and object.ownerDocument is not null, it won’t throw

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh, my mistake. I missed the || object. This seems good.

return !!(object && (
typeof Node === 'function' ? object instanceof Node :
typeof defaultView.Node === 'function' ? object instanceof defaultView.Node :
typeof object === 'object' &&
typeof object.nodeType === 'number' &&
typeof object.nodeName === 'string'
Expand Down