fix selection row/col while shift hold (#396)

* fix selction row/col while shift hold

* update package

Author: mritunjayz

package-lock.json

@@ -2,7 +2,7 @@
   "name": "@fileverse-dev/dsheet",
   "private": false,
   "description": "DSheet",
-  "version": "2.0.35",
+  "version": "2.0.36",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",
   "exports": {

package.json

@@ -61,6 +61,7 @@ import {
 } from '../modules/protection';
 import {
   normalizeSelection,
+  seletedHighlistByindex,
   syncPrimaryCellActiveFromSelection,
   pasteHandlerOfPaintModel,
 } from '../modules/selection';
@@ -4930,49 +4931,34 @@ export function handleRowHeaderMouseDown(
       const last = _.cloneDeep(
         ctx.luckysheet_select_save?.[ctx.luckysheet_select_save.length - 1],
       ); // 选区最后一个
-      if (
-        !last ||
-        _.isNil(last.top) ||
-        _.isNil(last.height) ||
-        _.isNil(last.row_focus)
-      ) {
-        return;
-      }
-
-      let _top = 0;
-      let _height = 0;
-      let _rowseleted = [];
-      if (last.top > row_pre) {
-        _top = row_pre;
-        _height = last.top + last.height - row_pre;
-
-        if (last.row[1] > last.row_focus) {
-          last.row[1] = last.row_focus;
+      if (last) {
+        const anchor = last.row_focus ?? last.row?.[0] ?? row_index;
+        const rStart = Math.min(anchor, row_index);
+        const rEnd = Math.max(anchor, row_index);
+        const bounds = seletedHighlistByindex(ctx, rStart, rEnd, 0, col_index);
+
+        last.row = [rStart, rEnd];
+        last.column = [0, col_index];
+        if (bounds) {
+          last.left = bounds.left;
+          last.width = bounds.width;
+          last.top = bounds.top;
+          last.height = bounds.height;
+          last.left_move = bounds.left;
+          last.width_move = bounds.width;
+          last.top_move = bounds.top;
+          last.height_move = bounds.height;
         }
-
-        _rowseleted = [row_index, last.row[1]];
-      } else if (last.top === row_pre) {
-        _top = row_pre;
-        _height = last.top + last.height - row_pre;
-        _rowseleted = [row_index, last.row[0]];
-      } else {
-        _top = last.top;
-        _height = row - last.top - 1;
-
-        if (last.row[0] < last.row_focus) {
-          last.row[0] = last.row_focus;
+        last.row_select = true;
+        last.column_select = false;
+        last.column_focus = 0;
+        if (_.isNil(last.row_focus)) {
+          last.row_focus = anchor;
         }
 
-        _rowseleted = [last.row[0], row_index];
+        ctx.luckysheet_select_save![ctx.luckysheet_select_save!.length - 1] =
+          last;
       }
-
-      last.row = _rowseleted;
-
-      last.top_move = _top;
-      last.height_move = _height;
-
-      ctx.luckysheet_select_save![ctx.luckysheet_select_save!.length - 1] =
-        last;
     } else if (e.ctrlKey || e.metaKey) {
       ctx.luckysheet_select_save?.push({
         left: colLocationByIndex(0, ctx.visibledatacolumn)[0],
@@ -5347,51 +5333,40 @@ export function handleColumnHeaderMouseDown(
       const last = _.cloneDeep(
         ctx.luckysheet_select_save?.[ctx.luckysheet_select_save.length - 1],
       ); // 选区最后一个
+      if (last) {
+        const anchor = last.column_focus ?? last.column?.[0] ?? col_index;
+        const cStart = Math.min(anchor, col_index);
+        const cEnd = Math.max(anchor, col_index);
+        const bounds = seletedHighlistByindex(
+          ctx,
+          0,
+          row_index,
+          cStart,
+          cEnd,
+        );
 
-      let _left = 0;
-      let _width = 0;
-      let _columnseleted = [];
-
-      if (
-        !last ||
-        _.isNil(last.left) ||
-        _.isNil(last.width) ||
-        _.isNil(last.column_focus)
-      ) {
-        return;
-      }
-
-      if (last.left > col_pre) {
-        _left = col_pre;
-        _width = last.left + last.width - col_pre;
-
-        if (last.column[1] > last.column_focus) {
-          last.column[1] = last.column_focus;
+        last.column = [cStart, cEnd];
+        last.row = [0, row_index];
+        if (bounds) {
+          last.left = bounds.left;
+          last.width = bounds.width;
+          last.top = bounds.top;
+          last.height = bounds.height;
+          last.left_move = bounds.left;
+          last.width_move = bounds.width;
+          last.top_move = bounds.top;
+          last.height_move = bounds.height;
         }
-
-        _columnseleted = [col_index, last.column[1]];
-      } else if (last.left === col_pre) {
-        _left = col_pre;
-        _width = last.left + last.width - col_pre;
-        _columnseleted = [col_index, last.column[0]];
-      } else {
-        _left = last.left;
-        _width = col - last.left - 1;
-
-        if (last.column[0] < last.column_focus) {
-          last.column[0] = last.column_focus;
+        last.column_select = true;
+        last.row_select = false;
+        last.row_focus = 0;
+        if (_.isNil(last.column_focus)) {
+          last.column_focus = anchor;
         }
 
-        _columnseleted = [last.column[0], col_index];
+        ctx.luckysheet_select_save![ctx.luckysheet_select_save!.length - 1] =
+          last;
       }
-
-      last.column = _columnseleted;
-
-      last.left_move = _left;
-      last.width_move = _width;
-
-      ctx.luckysheet_select_save![ctx.luckysheet_select_save!.length - 1] =
-        last;
     } else if (e.ctrlKey || e.metaKey) {
       // 选区添加
       ctx.luckysheet_select_save?.push({

src/sheet-engine/core/events/mouse.ts

@@ -148,8 +148,8 @@ const ColumnHeader: React.FC = () => {
       const clickedColIndex = getColIndexClicked(e.pageX, headerEl);
       if (clickedColIndex < 0) return;
 
-      const sel = api.getSelection(context);
-      const lastSelectedRow = sel?.[0].row?.[1];
+      const sel = context.luckysheet_select_save;
+      const lastSelectedRow = sel?.[0]?.row?.[1];
       let data = getFlowdata(context);
       if (!data) data = [];
 
@@ -160,6 +160,7 @@ const ColumnHeader: React.FC = () => {
         });
       }
       if (
+        e.shiftKey ||
         !allColSel ||
         (allColSel && sel && clickedColIndex < sel?.[0].column?.[0]) ||
         // @ts-ignore
@@ -203,6 +204,8 @@ const ColumnHeader: React.FC = () => {
       refs.globalCache,
       refs.cellInput,
       refs.fxInput,
+      context.luckysheet_select_save,
+      context.isFlvReadOnly,
       setContext,
       getColIndexClicked,
       isColDoubleClicked,

src/sheet-engine/react/components/SheetOverlay/ColumnHeader.tsx

@@ -162,8 +162,8 @@ const RowHeader: React.FC = () => {
       const clickedRowIndex = getRowIndexClicked(e.pageY, headerEl);
       if (clickedRowIndex < 0) return;
 
-      const sel = api.getSelection(context);
-      const lastSelectedCol = sel?.[0].column?.[1];
+      const sel = context.luckysheet_select_save;
+      const lastSelectedCol = sel?.[0]?.column?.[1];
       let data = getFlowdata(context);
       if (!data) data = [];
 
@@ -175,6 +175,7 @@ const RowHeader: React.FC = () => {
         });
       }
       if (
+        e.shiftKey ||
         !allRowSel ||
         (allRowSel && sel && clickedRowIndex < sel?.[0].row[0]) ||
         // @ts-expect-error: `sel?.[0].row` may be missing in some selection shapes.
@@ -218,6 +219,8 @@ const RowHeader: React.FC = () => {
       refs.globalCache,
       context.visibledatarow,
       context.currentSheetId,
+      context.luckysheet_select_save,
+      context.isFlvReadOnly,
       setContext,
       getRowIndexClicked,
       isRowDoubleClicked,