Skip to content

fix: page content jump when showMask is false #86

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
jljsj33 merged 2 commits into from
Apr 29, 2019
Merged

fix: page content jump when showMask is false #86

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1d5c27
fix page content jump
afc163 Apr 28, 2019
2da9fd0
fix no showMask flash
jljsj33 Apr 29, 2019
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
56 changes: 25 additions & 31 deletions src/Drawer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ class Drawer extends React.PureComponent {
}
});
// 处理 body 滚动
if (getContainer === 'body') {
if (getContainer === 'body' && showMask) {
const eventArray = ['touchstart'];
const domArray = [document.body, this.maskDom, this.handlerDom, this.contentDom];
const right =
Expand All @@ -297,9 +297,7 @@ class Drawer extends React.PureComponent {
let widthTransition = `width ${duration} ${ease}`;
const transformTransition = `transform ${duration} ${ease}`;
if (open && document.body.style.overflow !== 'hidden') {
if (showMask) {
document.body.style.overflow = 'hidden';
}
document.body.style.overflow = 'hidden';
if (right) {
document.body.style.position = 'relative';
document.body.style.width = `calc(100% - ${right}px)`;
Expand All @@ -325,20 +323,18 @@ class Drawer extends React.PureComponent {
this.dom.style.msTransform = '';
});
}
if (showMask) {
// 手机禁滚
domArray.forEach((item, i) => {
if (!item) {
return;
}
addEventListener(
item,
eventArray[i] || 'touchmove',
i ? this.removeMoveHandler : this.removeStartHandler,
this.passive,
);
});
}
// 手机禁滚
domArray.forEach((item, i) => {
if (!item) {
return;
}
addEventListener(
item,
eventArray[i] || 'touchmove',
i ? this.removeMoveHandler : this.removeStartHandler,
this.passive,
);
});
} else if (this.getCurrentDrawerSome()) {
document.body.style.overflow = '';
if ((this.isOpenChange || openTransition) && right) {
Expand Down Expand Up @@ -383,19 +379,17 @@ class Drawer extends React.PureComponent {
this.dom.style.height = '';
});
}
if (showMask) {
domArray.forEach((item, i) => {
if (!item) {
return;
}
removeEventListener(
item,
eventArray[i] || 'touchmove',
i ? this.removeMoveHandler : this.removeStartHandler,
this.passive,
);
});
}
domArray.forEach((item, i) => {
if (!item) {
return;
}
removeEventListener(
item,
eventArray[i] || 'touchmove',
i ? this.removeMoveHandler : this.removeStartHandler,
this.passive,
);
});
}
}
}
Expand Down