Skip to content

Commit 2327868

Browse files
committed
fix: add sheet name to more internal cell references
1 parent e874832 commit 2327868

File tree

1 file changed

+11
-2
lines changed
  • vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow/src/main/java/com/vaadin/flow/component/spreadsheet

1 file changed

+11
-2
lines changed

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,11 @@ protected void onSheetAddressChanged(String value,
256256
cellReference.getCol() + 1,
257257
cellReference.getRow() + 1,
258258
cellReference.getCol() + 1);
259-
selectedCellReference = cellReference;
259+
final CellReference cellReferenceWithSheetName = new CellReference(
260+
spreadsheet.getActiveSheet().getSheetName(),
261+
cellReference.getRow(), cellReference.getCol(),
262+
false, false);
263+
selectedCellReference = cellReferenceWithSheetName;
260264
cellRangeAddresses.clear();
261265
}
262266
}
@@ -403,7 +407,12 @@ protected void handleCellRangeSelection(String name, CellRangeAddress cra) {
403407
protected void handleCellRangeSelection(CellReference startingPoint,
404408
CellRangeAddress cellsToSelect, boolean scroll) {
405409

406-
handleCellRangeSelection(null, startingPoint, cellsToSelect, scroll);
410+
final CellReference startingPointWithSheetName = new CellReference(
411+
spreadsheet.getActiveSheet().getSheetName(),
412+
startingPoint.getRow(), startingPoint.getCol(), false, false);
413+
414+
handleCellRangeSelection(null, startingPointWithSheetName,
415+
cellsToSelect, scroll);
407416
}
408417

409418
private void handleCellRangeSelection(String name,

0 commit comments

Comments
 (0)