Skip to content

Commit 02b5812

Browse files
authored
Merge pull request #1481 from bbc/upstream/fix-eventlistener-in-segmenttimeline
2 parents 0923906 + 49778d5 commit 02b5812

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

packages/webui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@fortawesome/fontawesome-svg-core": "^6.7.2",
3939
"@fortawesome/free-solid-svg-icons": "^6.7.2",
4040
"@fortawesome/react-fontawesome": "^0.2.2",
41-
"@jstarpl/react-contextmenu": "^2.15.0",
41+
"@jstarpl/react-contextmenu": "^2.15.1",
4242
"@nrk/core-icons": "^9.6.0",
4343
"@popperjs/core": "^2.11.8",
4444
"@sofie-automation/blueprints-integration": "1.53.0-in-development",

packages/webui/src/client/ui/SegmentTimeline/SegmentTimeline.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,9 @@ export class SegmentTimelineClass extends React.Component<Translated<WithTiming<
290290
componentWillUnmount(): void {
291291
super.componentWillUnmount?.()
292292
clearTimeout(this.highlightTimeout)
293+
if (this.segmentBlock) {
294+
this.segmentBlock.removeEventListener('wheel', this.onTimelineWheel, { capture: true })
295+
}
293296

294297
RundownViewEventBus.off(RundownViewEvents.HIGHLIGHT, this.onHighlight)
295298
RundownViewEventBus.off(RundownViewEvents.SEGMENT_ZOOM_ON, this.onRundownEventSegmentZoomOn)

0 commit comments

Comments
 (0)