Skip to content

harmonize on a single getWindowScroll #1054

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
merged 4 commits into from
Jan 9, 2023
Merged

harmonize on a single getWindowScroll #1054

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6055c5
Fix issue where only indication I could see in any attribute that the…
eoghanmurray Apr 28, 2022
591cb85
Apply formatting changes
eoghanmurray Nov 17, 2022
c079474
Update observer.ts
YunFeng0817 Jan 9, 2023
1ca1de9
Update utils.ts
YunFeng0817 Jan 9, 2023
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
18 changes: 2 additions & 16 deletions packages/rrweb/src/record/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
on,
getWindowWidth,
getWindowHeight,
getWindowScroll,
polyfill,
hasShadowRoot,
isSerializedIframe,
Expand Down Expand Up @@ -379,22 +380,7 @@ function record<T = eventWithTime>(
type: EventType.FullSnapshot,
data: {
node,
initialOffset: {
left:
window.pageXOffset !== undefined
? window.pageXOffset
: document?.documentElement.scrollLeft ||
document?.body?.parentElement?.scrollLeft ||
document?.body?.scrollLeft ||
0,
top:
window.pageYOffset !== undefined
? window.pageYOffset
: document?.documentElement.scrollTop ||
document?.body?.parentElement?.scrollTop ||
document?.body?.scrollTop ||
0,
},
initialOffset: getWindowScroll(window),
},
}),
);
Expand Down
7 changes: 4 additions & 3 deletions packages/rrweb/src/record/observer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
throttle,
on,
hookSetter,
getWindowScroll,
getWindowHeight,
getWindowWidth,
isBlocked,
Expand Down Expand Up @@ -280,11 +281,11 @@ export function initScrollObserver({
}
const id = mirror.getId(target as Node);
if (target === doc) {
const scrollEl = (doc.scrollingElement || doc.documentElement)!;
const scrollLeftTop = getWindowScroll(doc.defaultView);
scrollCb({
id,
x: scrollEl.scrollLeft,
y: scrollEl.scrollTop,
x: scrollLeftTop.left,
y: scrollLeftTop.top,
});
} else {
scrollCb({
Expand Down
22 changes: 22 additions & 0 deletions packages/rrweb/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,28 @@ export function patch(
}
}

export function getWindowScroll(win): number {
const doc = win.document;
return {
left: doc.scrollingElement
? doc.scrollingElement.scrollLeft
: win.pageXOffset !== undefined
? win.pageXOffset
: doc?.documentElement.scrollLeft ||
doc?.body?.parentElement?.scrollLeft ||
doc?.body?.scrollLeft ||
0,
top: doc.scrollingElement
? doc.scrollingElement.scrollTop
: win.pageYOffset !== undefined
? win.pageYOffset
: doc?.documentElement.scrollTop ||
doc?.body?.parentElement?.scrollTop ||
doc?.body?.scrollTop ||
0,
};
}

export function getWindowHeight(): number {
return (
window.innerHeight ||
Expand Down