jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(frontend-player): internal coordinates consider scroll

Browse source
This commit is contained in:
ShiKhu 2021-12-01 21:36:53 +01:00
parent f50355a67c
commit 4e27930c70
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
frontend/app/player/MessageDistributor/StatedScreen/Screen/BaseScreen.ts
View file

@ -76,9 +76,8 @@ export default abstract class BaseScreen {
//return this.boundingRect; //return this.boundingRect;
} }
getInternalCoordinates({ x, y }: Point): Point { getInternalViewportCoordinates({ x, y }: Point): Point {
const { x: overlayX, y: overlayY, width } = this.getBoundingClientRect(); const { x: overlayX, y: overlayY, width } = this.getBoundingClientRect();
//console.log("x y ", x,y,'ovx y', overlayX, overlayY, width)
const screenWidth = this.overlay.offsetWidth; const screenWidth = this.overlay.offsetWidth;
@ -89,7 +88,19 @@ export default abstract class BaseScreen {
return { x: screenX, y: screenY }; return { x: screenX, y: screenY };
} }
getInternalCoordinates(p: Point): Point {
const { x, y } = this.getInternalViewportCoordinates(p);
const docEl = this.document?.documentElement
const scrollX = docEl ? docEl.scrollLeft : 0
const scrollY = docEl ? docEl.scrollTop : 0
return { x: x+scrollX, y: y+scrollY };
}
getElementFromInternalPoint({ x, y }: Point): Element | null { getElementFromInternalPoint({ x, y }: Point): Element | null {
// elementFromPoint && elementFromPoints require viewpoint-related coordinates,
// not document-related
return this.document?.elementFromPoint(x, y) || null; return this.document?.elementFromPoint(x, y) || null;
} }
@ -108,11 +119,11 @@ export default abstract class BaseScreen {
} }
getElementFromPoint(point: Point): Element | null { getElementFromPoint(point: Point): Element | null {
return this.getElementFromInternalPoint(this.getInternalCoordinates(point)); return this.getElementFromInternalPoint(this.getInternalViewportCoordinates(point));
} }
getElementsFromPoint(point: Point): Element[] { getElementsFromPoint(point: Point): Element[] {
return this.getElementsFromInternalPoint(this.getInternalCoordinates(point)); return this.getElementsFromInternalPoint(this.getInternalViewportCoordinates(point));
} }
getElementBySelector(selector: string): Element | null { getElementBySelector(selector: string): Element | null {