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: added missing CSS unit when positioning the window offset to top #253

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+22 −31
Open

fix: added missing CSS unit when positioning the window offset to top #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6235144
fix: added missing CSS unit (#1)
emeraldsanto May 4, 2022
557beee
fix: Target window.top.document.body; remove code for adjusting viewp…
pbt Oct 20, 2022
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
2 changes: 1 addition & 1 deletion lib/bodyScrollLock.es6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ const setPositionFixed = () => window.requestAnimationFrame(() => {
const bottomBarHeight = innerHeight - window.innerHeight;
if (bottomBarHeight && scrollY >= innerHeight) {
// Move the content further up so that the bottom bar doesn't hide it
document.body.style.top = -(scrollY + bottomBarHeight);
document.body.style.top = `-${scrollY + bottomBarHeight}px`;
}
}), 300);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/bodyScrollLock.esm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ var setPositionFixed = function setPositionFixed() {
var bottomBarHeight = innerHeight - window.innerHeight;
if (bottomBarHeight && scrollY >= innerHeight) {
// Move the content further up so that the bottom bar doesn't hide it
document.body.style.top = -(scrollY + bottomBarHeight);
document.body.style.top = '-' + (scrollY + bottomBarHeight) + 'px';
}
});
}, 300);
Expand Down
2 changes: 1 addition & 1 deletion lib/bodyScrollLock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
var bottomBarHeight = innerHeight - window.innerHeight;
if (bottomBarHeight && scrollY >= innerHeight) {
// Move the content further up so that the bottom bar doesn't hide it
document.body.style.top = -(scrollY + bottomBarHeight);
document.body.style.top = '-' + (scrollY + bottomBarHeight) + 'px';
}
});
}, 300);
Expand Down
2 changes: 1 addition & 1 deletion lib/bodyScrollLock.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 18 additions & 27 deletions src/bodyScrollLock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,30 +76,30 @@ const setOverflowHidden = (options?: BodyScrollOptions) => {
const scrollBarGap = window.innerWidth - document.documentElement.clientWidth;

if (reserveScrollBarGap && scrollBarGap > 0) {
const computedBodyPaddingRight = parseInt(window.getComputedStyle(document.body).getPropertyValue('padding-right'), 10);
previousBodyPaddingRight = document.body.style.paddingRight;
document.body.style.paddingRight = `${computedBodyPaddingRight + scrollBarGap}px`;
const computedBodyPaddingRight = parseInt(window.getComputedStyle(window.top.document.body).getPropertyValue('padding-right'), 10);
previousBodyPaddingRight = window.top.document.body.style.paddingRight;
window.top.document.body.style.paddingRight = `${computedBodyPaddingRight + scrollBarGap}px`;
}
}

// If previousBodyOverflowSetting is already set, don't set it again.
if (previousBodyOverflowSetting === undefined) {
previousBodyOverflowSetting = document.body.style.overflow;
document.body.style.overflow = 'hidden';
previousBodyOverflowSetting = window.top.document.body.style.overflow;
window.top.document.body.style.overflow = 'hidden';
}
};

const restoreOverflowSetting = () => {
if (previousBodyPaddingRight !== undefined) {
document.body.style.paddingRight = previousBodyPaddingRight;
window.top.document.body.style.paddingRight = previousBodyPaddingRight;

// Restore previousBodyPaddingRight to undefined so setOverflowHidden knows it
// can be set again.
previousBodyPaddingRight = undefined;
}

if (previousBodyOverflowSetting !== undefined) {
document.body.style.overflow = previousBodyOverflowSetting;
window.top.document.body.style.overflow = previousBodyOverflowSetting;

// Restore previousBodyOverflowSetting to undefined
// so setOverflowHidden knows it can be set again.
Expand All @@ -111,38 +111,29 @@ const setPositionFixed = () => window.requestAnimationFrame(() => {
// If previousBodyPosition is already set, don't set it again.
if (previousBodyPosition === undefined) {
previousBodyPosition = {
position: document.body.style.position,
top: document.body.style.top,
left: document.body.style.left
position: window.top.document.body.style.position,
top: window.top.document.body.style.top,
left: window.top.document.body.style.left
};

// Update the dom inside an animation frame
const { scrollY, scrollX, innerHeight } = window;
document.body.style.position = 'fixed';
document.body.style.top = `${-scrollY}px`;
document.body.style.left = `${-scrollX}px`;

setTimeout(() => window.requestAnimationFrame(() => {
// Attempt to check if the bottom bar appeared due to the position change
const bottomBarHeight = innerHeight - window.innerHeight;
if (bottomBarHeight && scrollY >= innerHeight) {
// Move the content further up so that the bottom bar doesn't hide it
document.body.style.top = -(scrollY + bottomBarHeight);
}
}), 300)
window.top.document.body.style.position = 'fixed';
window.top.document.body.style.top = `${-scrollY}px`;
window.top.document.body.style.left = `${-scrollX}px`;
}
});

const restorePositionSetting = () => {
if (previousBodyPosition !== undefined) {
// Convert the position from "px" to Int
const y = -parseInt(document.body.style.top, 10);
const x = -parseInt(document.body.style.left, 10);
const y = -parseInt(window.top.document.body.style.top, 10);
const x = -parseInt(window.top.document.body.style.left, 10);

// Restore styles
document.body.style.position = previousBodyPosition.position;
document.body.style.top = previousBodyPosition.top;
document.body.style.left = previousBodyPosition.left;
window.top.document.body.style.position = previousBodyPosition.position;
window.top.document.body.style.top = previousBodyPosition.top;
window.top.document.body.style.left = previousBodyPosition.left;

// Restore scroll
window.scrollTo(x, y);
Expand Down