0004813: Improved multi-select grid behavior (#142)

JumpMind · Feb 5, 2021 · 46ad787 · 46ad787
1 parent 08b7d79
commit 46ad787
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 20 deletions.
diff --git a/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/CommonUiUtils.java b/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/CommonUiUtils.java
@@ -195,8 +195,10 @@ public static Grid<List<Object>> putResultsInGrid(final ResultSet rs, int maxRes
         grid.setSelectionMode(SelectionMode.MULTI);
         grid.setColumnReorderingAllowed(true);
         grid.addItemClickListener(event -> {
-            grid.deselectAll();
-            grid.select(event.getItem());
+            if (event.getColumn() != null) {
+                grid.deselectAll();
+                grid.select(event.getItem());
+            }
         });
 
         List<List<Object>> outerList = new ArrayList<List<Object>>();

diff --git a/...etric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/DatabaseInfoPanel.java b/...etric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/DatabaseInfoPanel.java
@@ -177,8 +177,10 @@ private Grid<List<Object>> createGridWithReflection(Class<?> reflectionClass, Ob
         grid.setSelectionMode(SelectionMode.MULTI);
         grid.setSizeFull();
         grid.addItemClickListener(event -> {
-            grid.deselectAll();
-            grid.select(event.getItem());
+            if (event.getColumn() != null) {
+                grid.deselectAll();
+                grid.select(event.getItem());
+            }
         });
 
         grid.addColumn(row -> row.get(0)).setCaption("Property").setWidth(400);
@@ -231,8 +233,10 @@ private Grid<String> createGridFromString(String data, String columnName) {
         grid.setSelectionMode(SelectionMode.MULTI);
         grid.setSizeFull();
         grid.addItemClickListener(event -> {
-            grid.deselectAll();
-            grid.select(event.getItem());
+            if (event.getColumn() != null) {
+                grid.deselectAll();
+                grid.select(event.getItem());
+            }
         });
 
         grid.addColumn(row -> row).setCaption(columnName);

diff --git a/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/SqlHistoryDialog.java b/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/SqlHistoryDialog.java
@@ -90,8 +90,10 @@ public SqlHistoryDialog(ISettingsProvider settingsProvider, QueryPanel queryPane
         logTextFilterCell.setComponent(filterField);
 
         grid.addItemClickListener(event -> {
-            grid.deselectAll();
-            grid.select(event.getItem());
+            if (event.getColumn() != null) {
+                grid.deselectAll();
+                grid.select(event.getItem());
+            }
             if (event.getMouseEventDetails().isDoubleClick()) {
                 select();
             }

diff --git a/...ic-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/TableSelectionLayout.java b/...ic-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/TableSelectionLayout.java
@@ -139,8 +139,10 @@ protected void createTableSelectionLayout(String titleKey) {
         listOfTablesGrid.setSizeFull();
         listOfTablesGrid.setSelectionMode(SelectionMode.MULTI);
         listOfTablesGrid.addItemClickListener(event -> {
-           listOfTablesGrid.deselectAll();
-           listOfTablesGrid.select(event.getItem());
+            if (event.getColumn() != null) {
+                listOfTablesGrid.deselectAll();
+                listOfTablesGrid.select(event.getItem());
+            }
         });
         listOfTablesGrid.addSelectionListener(event -> {
             selectedTablesSet.clear();

diff --git a/...ric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/TabularResultLayout.java b/...ric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/TabularResultLayout.java
@@ -64,7 +64,6 @@
 import com.vaadin.data.Binder.Binding;
 import com.vaadin.data.provider.Query;
 import com.vaadin.icons.VaadinIcons;
-import com.vaadin.shared.MouseEventDetails.MouseButton;
 import com.vaadin.shared.ui.MarginInfo;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.HorizontalLayout;
@@ -225,14 +224,6 @@ public void menuSelected(MenuItem selectedItem) {
                 followToMenu = menu.addItem("Follow to", null);
                 buildFollowToMenu();
             }
-
-            grid.addItemClickListener(event -> {
-                MouseButton button = event.getMouseEventDetails().getButton();
-                if (button == MouseButton.LEFT) {
-                    grid.deselectAll();
-                    grid.select(event.getItem());
-                }
-            });
 
             Editor<List<Object>> editor = grid.getEditor();
             Binder<List<Object>> binder = editor.getBinder();

diff --git a/...tric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/TriggerTableLayout.java b/...tric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/TriggerTableLayout.java
@@ -79,7 +79,7 @@ public void menuSelected(MenuItem selectedItem) {
 
         grid.addItemClickListener(event -> {
             MouseButton button = event.getMouseEventDetails().getButton();
-            if (button == MouseButton.LEFT) {
+            if (button == MouseButton.LEFT && event.getColumn() != null) {
                 if (event.getMouseEventDetails().isDoubleClick()) {
                     String colId = event.getColumn().getId();
                     if (colId.equals("property")) {