From 7f51faee45a4ce815ea02fcc08878a149d5b7815 Mon Sep 17 00:00:00 2001 From: braks <78412429+bcakmakoglu@users.noreply.github.com> Date: Tue, 16 Apr 2024 18:19:14 +0200 Subject: [PATCH] fix(core): allow wheel to bubble if not used by vf --- packages/core/src/container/Viewport/Viewport.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/core/src/container/Viewport/Viewport.vue b/packages/core/src/container/Viewport/Viewport.vue index d2bdf064..7d0ab50f 100644 --- a/packages/core/src/container/Viewport/Viewport.vue +++ b/packages/core/src/container/Viewport/Viewport.vue @@ -333,7 +333,13 @@ onMounted(() => { function (this: any, event: WheelEvent, d: any) { // we still want to enable pinch zooming even if preventScrolling is set to false const invalidEvent = !preventScrolling.value && event.type === 'wheel' && !event.ctrlKey - if (invalidEvent || isWrappedWithClass(event, noWheelClassName.value)) { + + const zoomScroll = zoomKeyPressed.value || zoomOnScroll.value + const pinchZoom = zoomOnPinch.value && event.ctrlKey + + const scrollEventsDisabled = !zoomScroll && !panOnScroll.value && !pinchZoom && event.type === 'wheel' + + if (scrollEventsDisabled || invalidEvent || isWrappedWithClass(event, noWheelClassName.value)) { return null }