From 9f3f4bdbd4fd90e127c5d42f60b542d304d3de29 Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Thu, 30 Dec 2021 21:16:20 +0100
Subject: [PATCH] better column selection

---
 .../web/src/datagrid/ColumnManager.svelte     | 22 +++++++++++++------
 .../web/src/datagrid/ColumnManagerRow.svelte  |  3 +++
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/packages/web/src/datagrid/ColumnManager.svelte b/packages/web/src/datagrid/ColumnManager.svelte
index ab42c3d61..59bdcd14c 100644
--- a/packages/web/src/datagrid/ColumnManager.svelte
+++ b/packages/web/src/datagrid/ColumnManager.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import _, { indexOf } from 'lodash';
+  import _, { indexOf, range } from 'lodash';
   import { GridDisplay } from 'dbgate-datalib';
   import { filterName } from 'dbgate-tools';
   import CloseSearchButton from '../elements/CloseSearchButton.svelte';
@@ -129,12 +129,17 @@
         currentColumnUniqueName = column.uniqueName;
       }}
       on:mousemove={e => {
-        if (e.buttons == 1 && !selectedColumns.includes(column.uniqueName)) {
-          selectedColumns = [...selectedColumns, column.uniqueName];
-          if (domFocusField) domFocusField.focus();
-          currentColumnUniqueName = column.uniqueName;
-          if (!isJsonView) {
-            display.focusColumn(column.uniqueName);
+        if (e.buttons == 1 && dragStartColumnIndex != null && dragStartColumnIndex >= 0) {
+          const index = _.findIndex(items, x => x.uniqueName == column.uniqueName);
+          if (index >= 0) {
+            selectedColumns = _.range(
+              Math.min(dragStartColumnIndex, index),
+              Math.max(dragStartColumnIndex, index) + 1
+            ).map(i => items[i].uniqueName);
+            currentColumnUniqueName = column.uniqueName;
+            if (!isJsonView) {
+              display.focusColumn(column.uniqueName);
+            }
           }
         }
       }}
@@ -143,6 +148,9 @@
         selectedColumns = [column.uniqueName];
         if (domFocusField) domFocusField.focus();
         currentColumnUniqueName = column.uniqueName;
+        if (!isJsonView) {
+          display.focusColumn(column.uniqueName);
+        }
       }}
       on:setvisibility={e => {
         for (const name of selectedColumns) {
diff --git a/packages/web/src/datagrid/ColumnManagerRow.svelte b/packages/web/src/datagrid/ColumnManagerRow.svelte
index 406d4febd..63b028e1f 100644
--- a/packages/web/src/datagrid/ColumnManagerRow.svelte
+++ b/packages/web/src/datagrid/ColumnManagerRow.svelte
@@ -42,6 +42,9 @@
       on:click={e => {
         e.stopPropagation();
       }}
+      on:mousedown={e => {
+        e.stopPropagation();
+      }}
       on:change={() => {
         const newValue = !column.isChecked;
         display.setColumnVisibility(column.uniquePath, newValue);