Skip to content

Commit

Permalink
Handle SHIFT key when moving cell reference range
Browse files Browse the repository at this point in the history
If the user is editing a cell reference range within a formula and is holding
the shift key while using the direction arrows to move the range, the start
of the range will be fixed.

This mirrors the behavior of Excel when editing a cell reference range.
  • Loading branch information
Jared Kirschner committed Sep 10, 2020
1 parent 5139bb8 commit f164400
Showing 1 changed file with 21 additions and 17 deletions.
38 changes: 21 additions & 17 deletions src/component/formula.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,43 +98,47 @@ export default class Formula {

this.el.addEventListener("keydown", (e) => {
const keyCode = e.keyCode || e.which;

if ([37, 38, 39, 40].indexOf(keyCode) == -1) return;

if (!this.cell || this.cell.from == this.cell.to) return;

e.preventDefault();
e.stopPropagation();

// Get values before merge cells applied
const cellRangeArgs = this.getCellRangeArgsFromSelectStartEnd();

// Account for merge cells
let cellRange = new CellRange(...cellRangeArgs);
let rowShift = 0;
let colShift = 0;

// Left
if (keyCode == 37) {
cellRange.translate(0, -1);
this.cellSelectStartRowCol[1] = Math.max(0, this.cellSelectStartRowCol[1] - 1);
this.cellSelectEndRowCol[1] = Math.max(0, this.cellSelectEndRowCol[1] - 1);
colShift = -1;
}
// Up
else if (keyCode == 38) {
cellRange.translate(-1, 0);
this.cellSelectStartRowCol[0] = Math.max(0, this.cellSelectStartRowCol[0] - 1);
this.cellSelectEndRowCol[0] = Math.max(0, this.cellSelectEndRowCol[0] - 1);
rowShift = -1;
}
// Right
else if (keyCode == 39) {
cellRange.translate(0, 1);
this.cellSelectStartRowCol[1] = this.cellSelectStartRowCol[1] + 1;
this.cellSelectEndRowCol[1] = this.cellSelectEndRowCol[1] + 1;
colShift = 1;
}
// Down
else if (keyCode == 40) {
cellRange.translate(1, 0);
this.cellSelectStartRowCol[0] = this.cellSelectStartRowCol[0] + 1;
this.cellSelectEndRowCol[0] = this.cellSelectEndRowCol[0] + 1;
rowShift = 1;
}

// If the shift key is applied, hold the start position fixed
if (!e.shiftKey) {
this.cellSelectStartRowCol[0] = Math.max(0, this.cellSelectStartRowCol[0] + rowShift);
this.cellSelectStartRowCol[1] = Math.max(0, this.cellSelectStartRowCol[1] + colShift);
}
this.cellSelectEndRowCol[0] = Math.max(0, this.cellSelectEndRowCol[0] + rowShift);
this.cellSelectEndRowCol[1] = Math.max(0, this.cellSelectEndRowCol[1] + colShift);

// Get values before merge cells applied
const cellRangeArgs = this.getCellRangeArgsFromSelectStartEnd();

// Account for merge cells
let cellRange = new CellRange(...cellRangeArgs);

// Reapply merge cells after translation
cellRange = this.editor.data.merges.union(cellRange)
Expand Down

0 comments on commit f164400

Please sign in to comment.