Skip to content
Merged
Changes from all commits
Commits
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
28 changes: 25 additions & 3 deletions src/renderview.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -636,15 +638,25 @@ class BaseRenderView {
)

let pendingMoveEvent = null
let moveEventTimer = null

const sendMoveEvent = () => {
moveEventTimer = null
if (pendingMoveEvent !== null) {
const event = pendingMoveEvent
pendingMoveEvent = null
this.onEvent(event)
}
}

// 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) {
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -811,15 +823,25 @@ class BaseRenderView {
// ----- wheel ---------------

let pendingWheelEvent = null
let wheelEventTimer = null

const sendWheelEvent = () => {
wheelEventTimer = null
if (pendingWheelEvent !== null) {
const event = pendingWheelEvent
pendingWheelEvent = null
this.onEvent(event)
}
}

// 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) {
Expand Down Expand Up @@ -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)
}
Expand Down
Loading