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

Jump to bottom

fix(computeStyle): correctly calculate bottom when x="top" and `rig… #612

Merged
merged 1 commit into from Apr 15, 2018
Merged

fix(computeStyle): correctly calculate bottom when x="top" and `rig… #612

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 12 additions & 2 deletions packages/popper/src/modifiers/computeStyle.js
View file
Open in desktop
Expand Up @@ -66,12 +66,22 @@ export default function computeStyle(data, options) {
// its bottom.
let left, top;
if (sideA === 'bottom') {
top = -offsetParentRect.height + offsets.bottom;
// when offsetParent is <html> the positioning is relative to the bottom of the screen (excluding the scrollbar)
// and not the bottom of the html element
if (offsetParent.nodeName === 'HTML') {
top = -offsetParent.clientHeight + offsets.bottom;
} else {
top = -offsetParentRect.height + offsets.bottom;
}
} else {
top = offsets.top;
}
if (sideB === 'right') {
left = -offsetParentRect.width + offsets.right;
if (offsetParent.nodeName === 'HTML') {
left = -offsetParent.clientWidth + offsets.right;
} else {
left = -offsetParentRect.width + offsets.right;
}
} else {
left = offsets.left;
}
Expand Down
68 changes: 68 additions & 0 deletions packages/popper/tests/functional/computeStyle.js
View file
Open in desktop
@@ -0,0 +1,68 @@
import Popper from '../../src/index.js';

import '@popperjs/test-utils';
const jasmineWrapper = document.getElementById('jasmineWrapper');
const arrowSize = 5;

// Utils
import appendNewPopper from '@popperjs/test-utils/utils/appendNewPopper';
import appendNewRef from '@popperjs/test-utils/utils/appendNewRef';
import getRect from '../utils/getRect';

[true, false].forEach((positionFixed) => {
beforeEach(function(){
Popper.Defaults.positionFixed = positionFixed;
});

describe('[computeStyle]' + (positionFixed ? ' Fixed' : ''), () => {
describe('x="top" y="left"', () => {
it('positions a popper on the body correctly', (done) => {
const reference = appendNewRef(1);
const popper = appendNewPopper(2);

new Popper(reference, popper, {
modifiers: {
computeStyle: {
x: 'top',
y: 'left',
},
},
onCreate(data) {
const popRect = getRect(popper);
const refRect = getRect(reference);
expect(popRect.top - arrowSize).toBeApprox(refRect.bottom);
expect(popRect.left).toBeApprox(5);
data.instance.destroy();
done();
},
});
});

it('positions a popper on a scrolled body correctly', (done) => {
jasmineWrapper.style.height = '500vh';
jasmineWrapper.style.width = '500vw';

const reference = appendNewRef(1);
const popper = appendNewPopper(2);

new Popper(reference, popper, {
modifiers: {
computeStyle: {
x: 'top',
y: 'left',
},
},
onCreate(data) {
const popRect = getRect(popper);
const refRect = getRect(reference);
expect(popRect.top - arrowSize).toBeApprox(refRect.bottom);
expect(popRect.left).toBeApprox(5);
jasmineWrapper.style.cssText = null;
data.instance.destroy();
done();
},
});
});
});
});
});