From 1d04e3ababe12e5030cf848d720fa34a0bf7487b Mon Sep 17 00:00:00 2001
From: samunohito <46447427+samunohito@users.noreply.github.com>
Date: Wed, 7 Feb 2024 19:51:50 +0900
Subject: [PATCH] fix range select

---
 .../frontend/src/components/grid/MkGrid.vue   | 77 ++++++++++++++++---
 1 file changed, 68 insertions(+), 9 deletions(-)

diff --git a/packages/frontend/src/components/grid/MkGrid.vue b/packages/frontend/src/components/grid/MkGrid.vue
index d05279901f..870a5b70e9 100644
--- a/packages/frontend/src/components/grid/MkGrid.vue
+++ b/packages/frontend/src/components/grid/MkGrid.vue
@@ -482,29 +482,88 @@ function onLeftMouseDown(ev: MouseEvent) {
 				registerMouseMove();
 				state.value = 'cellSelecting';
 			} else if (isColumnHeaderCellAddress(cellAddress)) {
-				unSelectionRangeAll();
+				if (ev.shiftKey) {
+					const rangedColumnIndexes = rangedCells.value.map(it => it.address.col);
+					const targetColumnIndexes = [cellAddress.col, ...rangedColumnIndexes];
+					unSelectionRangeAll();
 
-				const colCells = cells.value.map(row => row.cells[cellAddress.col]);
-				selectionRange(...colCells.map(cell => cell.address));
+					const leftTop = {
+						col: Math.min(...targetColumnIndexes),
+						row: 0,
+					};
+
+					const rightBottom = {
+						col: Math.max(...targetColumnIndexes),
+						row: cells.value.length - 1,
+					};
+
+					expandCellRange(leftTop, rightBottom);
+
+					if (rangedColumnIndexes.length === 0) {
+						firstSelectionColumnIdx.value = cellAddress.col;
+					} else {
+						if (cellAddress.col > Math.min(...rangedColumnIndexes)) {
+							firstSelectionColumnIdx.value = Math.min(...rangedColumnIndexes);
+						} else {
+							firstSelectionColumnIdx.value = Math.max(...rangedColumnIndexes);
+						}
+					}
+				} else {
+					unSelectionRangeAll();
+
+					const colCells = cells.value.map(row => row.cells[cellAddress.col]);
+					selectionRange(...colCells.map(cell => cell.address));
+
+					firstSelectionColumnIdx.value = cellAddress.col;
+				}
 
 				registerMouseUp();
 				registerMouseMove();
-				firstSelectionColumnIdx.value = cellAddress.col;
+				previousCellAddress.value = cellAddress;
 				state.value = 'colSelecting';
 
 				// フォーカスを当てないとキーイベントが拾えないので
 				getCellElement(ev.target as HTMLElement)?.focus();
 			} else if (isRowNumberCellAddress(cellAddress)) {
-				unSelectionRangeAll();
+				if (ev.shiftKey) {
+					const rangedRowIndexes = rangedRows.value.map(it => it.index);
+					const targetRowIndexes = [cellAddress.row, ...rangedRowIndexes];
+					unSelectionRangeAll();
 
-				const rowCells = cells.value[cellAddress.row].cells;
-				selectionRange(...rowCells.map(cell => cell.address));
+					const leftTop = {
+						col: 0,
+						row: Math.min(...targetRowIndexes),
+					};
 
-				expandRowRange(cellAddress.row, cellAddress.row);
+					const rightBottom = {
+						col: Math.min(...cells.value.map(it => it.cells.length - 1)),
+						row: Math.max(...targetRowIndexes),
+					};
+
+					expandCellRange(leftTop, rightBottom);
+					expandRowRange(Math.min(...targetRowIndexes), Math.max(...targetRowIndexes));
+
+					if (rangedRowIndexes.length === 0) {
+						firstSelectionRowIdx.value = cellAddress.row;
+					} else {
+						if (cellAddress.col > Math.min(...rangedRowIndexes)) {
+							firstSelectionRowIdx.value = Math.min(...rangedRowIndexes);
+						} else {
+							firstSelectionRowIdx.value = Math.max(...rangedRowIndexes);
+						}
+					}
+				} else {
+					unSelectionRangeAll();
+					const rowCells = cells.value[cellAddress.row].cells;
+					selectionRange(...rowCells.map(cell => cell.address));
+					expandRowRange(cellAddress.row, cellAddress.row);
+
+					firstSelectionRowIdx.value = cellAddress.row;
+				}
 
 				registerMouseUp();
 				registerMouseMove();
-				firstSelectionRowIdx.value = cellAddress.row;
+				previousCellAddress.value = cellAddress;
 				state.value = 'rowSelecting';
 
 				// フォーカスを当てないとキーイベントが拾えないので