diff --git a/tensorboard/components/vz_line_chart2/panZoomDragLayer.ts b/tensorboard/components/vz_line_chart2/panZoomDragLayer.ts index c198a0678e..7372a1c6a2 100644 --- a/tensorboard/components/vz_line_chart2/panZoomDragLayer.ts +++ b/tensorboard/components/vz_line_chart2/panZoomDragLayer.ts @@ -44,7 +44,7 @@ export class PanZoomDragLayer extends Plottable.Components.Group { this.panZoom = new Plottable.Interactions.PanZoom(xScale, yScale); this.panZoom.dragInteraction().mouseFilter((event: MouseEvent) => { - return Boolean(event.altKey) && event.button === 0; + return PanZoomDragLayer.isPanKey(event) && event.button === 0; }); this.panZoom.attachTo(this); @@ -53,7 +53,7 @@ export class PanZoomDragLayer extends Plottable.Components.Group { yScale, unzoomMethod); this.dragZoomLayer.dragInteraction().mouseFilter((event: MouseEvent) => { - return !Boolean(event.altKey) && event.button === 0; + return !PanZoomDragLayer.isPanKey(event) && event.button === 0; }); this.append(this.dragZoomLayer); @@ -78,6 +78,10 @@ export class PanZoomDragLayer extends Plottable.Components.Group { }); } + static isPanKey(event: MouseEvent): boolean { + return Boolean(event.shiftKey); + } + setState(nextState: State): void { if (this.state == nextState) return; const prevState = this.state; diff --git a/tensorboard/components/vz_line_chart2/vz-line-chart2.html b/tensorboard/components/vz_line_chart2/vz-line-chart2.html index fb46a5e0ab..0165f9b5c9 100644 --- a/tensorboard/components/vz_line_chart2/vz-line-chart2.html +++ b/tensorboard/components/vz_line_chart2/vz-line-chart2.html @@ -61,7 +61,7 @@ cursor: crosshair; } - :host.altdown #chartdiv :not(.drag-zooming) .main { + :host.pankey #chartdiv :not(.drag-zooming) .main { cursor: -webkit-grab; cursor: grab; } diff --git a/tensorboard/components/vz_line_chart2/vz-line-chart2.ts b/tensorboard/components/vz_line_chart2/vz-line-chart2.ts index 2b7c3031a2..d9dc40544a 100644 --- a/tensorboard/components/vz_line_chart2/vz-line-chart2.ts +++ b/tensorboard/components/vz_line_chart2/vz-line-chart2.ts @@ -293,11 +293,11 @@ Polymer({ }, _onKeyDown(event) { - this.toggleClass('altdown', event.altKey); + this.toggleClass('pankey', PanZoomDragLayer.isPanKey(event)); }, _onKeyUp(event) { - this.toggleClass('altdown', event.altKey); + this.toggleClass('pankey', PanZoomDragLayer.isPanKey(event)); }, _onMouseDown(event) {