diff --git a/src/renderview.js b/src/renderview.js index 6dd52e0..3f006a7 100644 --- a/src/renderview.js +++ b/src/renderview.js @@ -518,7 +518,9 @@ class BaseRenderView { // from the physical size and the pixel ratio. // Select entry matching our element - const ourEntries = entries.filter((entry) => entry.target.id === viewElement.id) + const ourEntries = entries.filter( + (entry) => entry.target === viewElement + ) if (!ourEntries.length) { return } @@ -636,8 +638,10 @@ class BaseRenderView { ) let pendingMoveEvent = null + let moveEventTimer = null const sendMoveEvent = () => { + moveEventTimer = null if (pendingMoveEvent !== null) { const event = pendingMoveEvent pendingMoveEvent = null @@ -645,6 +649,14 @@ class BaseRenderView { } } + // Clear a pending throttled event when the view is closed + signal.addEventListener('abort', () => { + if (moveEventTimer !== null) { + window.clearTimeout(moveEventTimer) + moveEventTimer = null + } + }) + viewElement.addEventListener('pointermove', (ev) => { // If this pointer is not down, but other pointers are, don't emit an event. if (pointerToButton[ev.pointerId] === undefined) { @@ -684,7 +696,7 @@ class BaseRenderView { if (this._moveThrottle > 0) { sendMoveEvent() // Send previous (if any) pendingMoveEvent = event - window.setTimeout(sendMoveEvent, this._moveThrottle) + moveEventTimer = window.setTimeout(sendMoveEvent, this._moveThrottle) } else { this.onEvent(event) } @@ -811,8 +823,10 @@ class BaseRenderView { // ----- wheel --------------- let pendingWheelEvent = null + let wheelEventTimer = null const sendWheelEvent = () => { + wheelEventTimer = null if (pendingWheelEvent !== null) { const event = pendingWheelEvent pendingWheelEvent = null @@ -820,6 +834,14 @@ class BaseRenderView { } } + // Clear a pending throttled event when the view is closed + signal.addEventListener('abort', () => { + if (wheelEventTimer !== null) { + window.clearTimeout(wheelEventTimer) + wheelEventTimer = null + } + }) + viewElement.addEventListener('wheel', (ev) => { // Only scroll if we have focus if (window.document.activeElement !== this._focusElement) { @@ -860,7 +882,7 @@ class BaseRenderView { if (this._wheelThrottle > 0) { sendWheelEvent() // Send previous (if any) pendingWheelEvent = event - window.setTimeout(sendWheelEvent, this._wheelThrottle) + wheelEventTimer = window.setTimeout(sendWheelEvent, this._wheelThrottle) } else { this.onEvent(event) }