Merge pull request #478 from ianhi/always-capture

ianhi · web-flow · commit 92ad7e51b476 · 2023-02-15T13:02:22.000-05:00
Ensure throttling does not break `capture_scroll`
diff --git a/src/mpl_widget.ts b/src/mpl_widget.ts
@@ -544,6 +544,11 @@ export class MPLCanvasView extends DOMWidgetView {
                 this.model.get('pan_zoom_throttle')
             )
         );
+        top_canvas.addEventListener('wheel', (event: any) => {
+            if (this.model.get('capture_scroll')) {
+                event.preventDefault();
+            }
+        });
 
         canvas_div.appendChild(canvas);
         canvas_div.appendChild(top_canvas);
@@ -708,9 +713,6 @@ export class MPLCanvasView extends DOMWidgetView {
                 } else {
                     event.step = -1;
                 }
-                if (this.model.get('capture_scroll')) {
-                    event.preventDefault();
-                }
             }
 
             if (name === 'button_press') {

Original file line number	Diff line number	Diff line change
`@@ -544,6 +544,11 @@ export class MPLCanvasView extends DOMWidgetView {`
`544`	`544`	`this.model.get('pan_zoom_throttle')`
`545`	`545`	`)`
`546`	`546`	`);`
	`547`	`+ top_canvas.addEventListener('wheel', (event: any) => {`
	`548`	`+ if (this.model.get('capture_scroll')) {`
	`549`	`+ event.preventDefault();`
	`550`	`+ }`
	`551`	`+ });`
`547`	`552`
`548`	`553`	`canvas_div.appendChild(canvas);`
`549`	`554`	`canvas_div.appendChild(top_canvas);`
`@@ -708,9 +713,6 @@ export class MPLCanvasView extends DOMWidgetView {`
`708`	`713`	`} else {`
`709`	`714`	`event.step = -1;`
`710`	`715`	`}`
`711`		`- if (this.model.get('capture_scroll')) {`
`712`		`- event.preventDefault();`
`713`		`- }`
`714`	`716`	`}`
`715`	`717`
`716`	`718`	`if (name === 'button_press') {`