From a4a3b1185846e99f6b42a70b4a8c16b40029d22e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Hatcher?= Date: Mon, 9 Dec 2024 22:33:22 +0100 Subject: [PATCH] FIX: Avoid freezing the app on frozen columns or rows --- .../WorksheetCanvas/worksheetCanvas.ts | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/webapp/src/components/WorksheetCanvas/worksheetCanvas.ts b/webapp/src/components/WorksheetCanvas/worksheetCanvas.ts index d66b631..a1a2b5c 100644 --- a/webapp/src/components/WorksheetCanvas/worksheetCanvas.ts +++ b/webapp/src/components/WorksheetCanvas/worksheetCanvas.ts @@ -867,14 +867,18 @@ export default class WorksheetCanvas { frozenRows, frozenColumns, ); - xFrozenEnd += this.getColumnWidth( - this.model.getSelectedSheet(), - frozenColumns, - ); - yFrozenEnd += this.getRowHeight( - this.model.getSelectedSheet(), - frozenRows, - ); + if (frozenColumns > 0) { + xFrozenEnd += this.getColumnWidth( + this.model.getSelectedSheet(), + frozenColumns, + ); + } + if (frozenRows > 0) { + yFrozenEnd += this.getRowHeight( + this.model.getSelectedSheet(), + frozenRows, + ); + } if (startRow <= frozenRows && endRow > frozenRows) { yEnd = Math.max(yEnd, yFrozenEnd); }