sirtimbly/IronCalc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX: Ranges selected should be absolute.

Browse Source 
Sheet1!$D$1 rather than Sheet1!D1

There reason is that if we extend a formula that has those will behave in
surprising ways.
This commit is contained in:
Nicolás Hatcher
2025-01-01 17:39:32 +01:00
committed by Nicolás Hatcher Andrés
parent ea194ee730
commit b7f7e73824
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/src/components/tests/util.test.ts
View File

@@ -41,5 +41,5 @@ test("format range to get the full formula", async () => {
}; };
const worksheetNames = ["Sheet1", "Notes"]; const worksheetNames = ["Sheet1", "Notes"];
expect(getFullRangeToString(selectedView, worksheetNames)).toBe("Sheet1!H1"); expect(getFullRangeToString(selectedView, worksheetNames)).toBe("Sheet1!$H$1");
}); });

26
webapp/src/components/util.ts
View File

@@ -26,7 +26,7 @@ export type NavigationKey =
export const isNavigationKey = (key: string): key is NavigationKey => export const isNavigationKey = (key: string): key is NavigationKey =>
["ArrowRight", "ArrowLeft", "ArrowDown", "ArrowUp", "Home", "End"].includes( ["ArrowRight", "ArrowLeft", "ArrowDown", "ArrowUp", "Home", "End"].includes(
key, key
); );
export const getCellAddress = (selectedArea: Area, selectedCell: Cell) => { export const getCellAddress = (selectedArea: Area, selectedCell: Cell) => {
@@ -50,30 +50,32 @@ export function rangeToStr(
columnEnd: number; columnEnd: number;
}, },
referenceSheet: number, referenceSheet: number,
referenceName: string, referenceName: string
): string { ): string {
const { sheet, rowStart, rowEnd, columnStart, columnEnd } = range; const { sheet, rowStart, rowEnd, columnStart, columnEnd } = range;
const sheetName = sheet === referenceSheet ? "" : `'${referenceName}'!`; const sheetName = sheet === referenceSheet ? "" : `'${referenceName}'!`;
if (rowStart === rowEnd && columnStart === columnEnd) { if (rowStart === rowEnd && columnStart === columnEnd) {
return `${sheetName}${columnNameFromNumber(columnStart)}${rowStart}`; return `${sheetName}${columnNameFromNumber(columnStart)}${rowStart}`;
} }
return `${sheetName}${columnNameFromNumber(columnStart)}${rowStart}:${columnNameFromNumber( return `${sheetName}${columnNameFromNumber(
columnEnd, columnStart
)}${rowEnd}`; )}${rowStart}:${columnNameFromNumber(columnEnd)}${rowEnd}`;
} }
// Returns the full range of the selected view as a string in absolute form
// e.g. 'Sheet1!$A$1:$B$2' or 'Sheet1!$A$1'
export function getFullRangeToString( export function getFullRangeToString(
selectedView: SelectedView, selectedView: SelectedView,
worksheetNames: string[], worksheetNames: string[]
): string { ): string {
// order of values is confusing compared to rangeToStr range type, needs refactoring for consistency
const [rowStart, columnStart, rowEnd, columnEnd] = selectedView.range; const [rowStart, columnStart, rowEnd, columnEnd] = selectedView.range;
const sheetName = `${worksheetNames[selectedView.sheet]}!`; const sheetName = `${worksheetNames[selectedView.sheet]}`;
if (rowStart === rowEnd && columnStart === columnEnd) { if (rowStart === rowEnd && columnStart === columnEnd) {
return `${sheetName}${columnNameFromNumber(columnStart)}${rowStart}`; return `${sheetName}!$${columnNameFromNumber(columnStart)}$${rowStart}`;
} }
return `${sheetName}${columnNameFromNumber(columnStart)}${rowStart}:${columnNameFromNumber( return `${sheetName}!$${columnNameFromNumber(
columnEnd, columnStart
)}${rowEnd}`; )}$${rowStart}:$${columnNameFromNumber(columnEnd)}$${rowEnd}`;
} }