Skip to content

Commit 8760538

Browse files
committed
fix: use getSheet from SpreadsheetCommand to get the sheet
1 parent e380adc commit 8760538

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow/src/main/java/com/vaadin/flow/component/spreadsheet/command/CellShiftValuesCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public CellReference getSelectedCellReference() {
5353
return selectedCellReference;
5454
} else {
5555
return new CellReference(
56-
spreadsheet.getActiveSheet().getSheetName(),
56+
getSheet().getSheetName(),
5757
paintedCellRange.getFirstRow(),
5858
paintedCellRange.getFirstColumn(), false, false);
5959
}

vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow/src/main/java/com/vaadin/flow/component/spreadsheet/command/CellValueCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public void captureCellRangeValues(CellRangeAddress... cellRanges) {
148148

149149
@Override
150150
public CellReference getSelectedCellReference() {
151-
return new CellReference(spreadsheet.getActiveSheet().getSheetName(),
151+
return new CellReference(getSheet().getSheetName(),
152152
selectedCellRow, selectedcellCol, false, false);
153153
}
154154

@@ -341,7 +341,7 @@ public Set<CellReference> getChangedCells() {
341341
if (o instanceof CellValue) {
342342
CellValue cellValue = (CellValue) o;
343343
changedCells.add(new CellReference(
344-
spreadsheet.getActiveSheet().getSheetName(),
344+
getSheet().getSheetName(),
345345
cellValue.row, cellValue.col, false, false));
346346
} else {
347347
CellRangeValue cellRangeValue = (CellRangeValue) o;

vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow/src/main/java/com/vaadin/flow/component/spreadsheet/command/RowInsertOrDeleteCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void execute() {
4444

4545
@Override
4646
public CellReference getSelectedCellReference() {
47-
return new CellReference(spreadsheet.getActiveSheet().getSheetName(),
47+
return new CellReference(getSheet().getSheetName(),
4848
row, 0, false, false);
4949
}
5050

0 commit comments

Comments
 (0)