Skip to content
Merged
Show file tree
Hide file tree
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
8 changes: 6 additions & 2 deletions tensorboard/components/vz_line_chart2/panZoomDragLayer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);

Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tensorboard/components/vz_line_chart2/vz-line-chart2.html
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions tensorboard/components/vz_line_chart2/vz-line-chart2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down