From 1bf113b134e211d72657d0b27a040639bfe40738 Mon Sep 17 00:00:00 2001 From: Jazib Ali <112427340+JazibAli360@users.noreply.github.com> Date: Thu, 15 Oct 2026 17:38:10 +0500 Subject: [PATCH] =?UTF-8?q?fix:=20HTML=20tooltip=20misplaced=20by=20exactl?= =?UTF-8?q?y=20the=20scroll=20delta=E2=80=A6=20(#1163)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/dom.ts | 6 ++- test/ut/spec/core/dom.test.ts | 74 +++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 test/ut/spec/core/dom.test.ts diff --git a/src/core/dom.ts b/src/core/dom.ts index 53fda5e27..cc39f1ce7 100644 --- a/src/core/dom.ts +++ b/src/core/dom.ts @@ -12,6 +12,7 @@ type SavedInfo = { trans?: ReturnType invTrans?: ReturnType srcCoords?: number[] + invSrcCoords?: number[] clearMarkers?: () => void } @@ -163,8 +164,9 @@ function prepareCoordMarkers(el: HTMLElement, saved: SavedInfo) { function preparePointerTransformer(markers: HTMLDivElement[], saved: SavedInfo, inverse?: boolean) { const transformerName: 'invTrans' | 'trans' = inverse ? 'invTrans' : 'trans'; + const srcCoordsName: 'invSrcCoords' | 'srcCoords' = inverse ? 'invSrcCoords' : 'srcCoords'; const transformer = saved[transformerName]; - const oldSrcCoords = saved.srcCoords; + const oldSrcCoords = saved[srcCoordsName]; const srcCoords = []; const destCoords = []; let oldCoordTheSame = true; @@ -182,7 +184,7 @@ function preparePointerTransformer(markers: HTMLDivElement[], saved: SavedInfo, return (oldCoordTheSame && transformer) ? transformer : ( - saved.srcCoords = srcCoords, + saved[srcCoordsName] = srcCoords, saved[transformerName] = inverse ? buildTransformer(destCoords, srcCoords) : buildTransformer(srcCoords, destCoords) diff --git a/test/ut/spec/core/dom.test.ts b/test/ut/spec/core/dom.test.ts new file mode 100644 index 000000000..050131142 --- /dev/null +++ b/test/ut/spec/core/dom.test.ts @@ -0,0 +1,74 @@ +/** + * @jest-environment jsdom + */ +import { transformCoordWithViewport } from '../../../../src/core/dom'; + +describe('dom', function () { + + const WIDTH = 100; + const HEIGHT = 80; + const ELEMENT_LEFT = 10; + const ELEMENT_TOP = 200; + let scrollY = 0; + + const proto = HTMLElement.prototype; + const oldOffsetLeft = Object.getOwnPropertyDescriptor(proto, 'offsetLeft'); + const oldOffsetTop = Object.getOwnPropertyDescriptor(proto, 'offsetTop'); + const oldGetBoundingClientRect = proto.getBoundingClientRect; + + // Markers are appended in order: left-top, right-top, left-bottom, right-bottom. + function markerIndex(el: HTMLElement) { + return Array.prototype.indexOf.call(el.parentNode.children, el); + } + + beforeAll(function () { + Object.defineProperty(proto, 'offsetLeft', { + configurable: true, + get() { + return (markerIndex(this) % 2) * WIDTH; + } + }); + Object.defineProperty(proto, 'offsetTop', { + configurable: true, + get() { + return (markerIndex(this) >> 1) * HEIGHT; + } + }); + proto.getBoundingClientRect = function () { + const left = ELEMENT_LEFT + this.offsetLeft; + const top = ELEMENT_TOP - scrollY + this.offsetTop; + return { left, top, right: left, bottom: top, width: 0, height: 0, x: left, y: top } as DOMRect; + }; + }); + + afterAll(function () { + Object.defineProperty(proto, 'offsetLeft', oldOffsetLeft); + Object.defineProperty(proto, 'offsetTop', oldOffsetTop); + proto.getBoundingClientRect = oldGetBoundingClientRect; + }); + + it('transformCoordWithViewport inverse should not be stale after forward refreshes', function () { + const el = document.createElement('div'); + document.body.appendChild(el); + const out: number[] = []; + + scrollY = 0; + // Build the inverse transformer first (local -> viewport). + expect(transformCoordWithViewport(out, el, 5, 6, true)).toBe(true); + expect(out[0]).toBeCloseTo(ELEMENT_LEFT + 5); + expect(out[1]).toBeCloseTo(ELEMENT_TOP + 6); + + // Scroll, then use the forward transformer (viewport -> local). + scrollY = 50; + expect(transformCoordWithViewport(out, el, ELEMENT_LEFT + 5, ELEMENT_TOP - scrollY + 6)).toBe(true); + expect(out[0]).toBeCloseTo(5); + expect(out[1]).toBeCloseTo(6); + + // The inverse transformer must reflect the new position too. + expect(transformCoordWithViewport(out, el, 5, 6, true)).toBe(true); + expect(out[0]).toBeCloseTo(ELEMENT_LEFT + 5); + expect(out[1]).toBeCloseTo(ELEMENT_TOP - scrollY + 6); + + document.body.removeChild(el); + }); +});