Skip to content

Fix page shake when modal toggle open #29

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

Merged
yiminghe merged 5 commits into from
May 23, 2016
Merged

Fix page shake when modal toggle open #29

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
462f4c4
Merge pull request #1 from react-component/master
afc163 Jan 27, 2016
a4a3b0a
Merge branch 'master' of github.com:afc163/dialog
afc163 Mar 14, 2016
d2fe112
Merge github.com:react-component/dialog
afc163 Mar 14, 2016
efb583f
Merge branch 'master' of github.com:react-component/dialog
afc163 May 21, 2016
c556db8
Fix page shake problem via adding scrollbar width
afc163 May 21, 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
29 changes: 29 additions & 0 deletions src/Dialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,28 @@ function getScroll(w, top) {
return ret;
}

// http://www.alexandre-gomes.com/?p=115
function getScrollBarWidth() {
const inner = document.createElement('p');
inner.style.width = '100%';
inner.style.height = '200px';
const outer = document.createElement('div');
outer.style.position = 'absolute';
outer.style.top = '0px';
outer.style.left = '0px';
outer.style.visibility = 'hidden';
outer.style.width = '200px';
outer.style.height = '150px';
outer.style.overflow = 'hidden';
outer.appendChild(inner);
document.body.appendChild(outer);
const w1 = inner.offsetWidth;
outer.style.overflow = 'scroll';
const w2 = (w1 === w2) ? outer.clientWidth : inner.offsetWidth;
document.body.removeChild(outer);
return w1 - w2;
}

function setTransformOrigin(node, value) {
const style = node.style;
['Webkit', 'Moz', 'Ms', 'ms'].forEach((prefix) => {
Expand Down Expand Up @@ -301,6 +323,12 @@ const Dialog = React.createClass({
const props = this.props;
const scrollingClassName = `${props.prefixCls}-open`;
document.body.className += ` ${scrollingClassName}`;
// inspired by bootstrap modal
// https://github.com/twbs/bootstrap/blob/795d2208b882e194e6059a1639e056e020d64072/js/modal.js#L259-L267
const scrollBarWidth = getScrollBarWidth();
if (scrollBarWidth) {
document.body.style.paddingRight = `${scrollBarWidth}px`;
}
},

removeScrollingClass() {
Expand All @@ -312,6 +340,7 @@ const Dialog = React.createClass({
const scrollingClassName = `${props.prefixCls}-open`;
const body = document.body;
body.className = body.className.replace(scrollingClassName, '');
document.body.style.paddingRight = '';
},

close(e) {
Expand Down