wip

Author: vursen

selection-grid-flow/src/main/java/com/vaadin/componentfactory/selectiongrid/SelectionTreeGrid.java

@@ -85,7 +85,7 @@ public SelectionTreeGrid(HierarchicalDataProvider<T, ?> dataProvider) {
     }
 
     /**
-     * Runs the super.onAttach and hides the multi selection column afterwards (if necessary).     * necessary).
+     * Runs the super.onAttach and hides the multi selection column afterwards (if necessary).
      *
      * @param attachEvent event
      */
@@ -162,7 +162,7 @@ private void selectionTreeGridSelectRange(String endItemKey, ObjectNode options)
             throw new IllegalArgumentException("Item with key %s not found".formatted(endItemKey));
         }
 
-        var range = fetchItemRange(rangeStartItem, rangeEndItem);
+        var range = fetchRange(rangeStartItem, rangeEndItem);
 
         var deselectOthers = options.get("deselectOthers").asBoolean(false);
         if (deselectOthers) {
@@ -172,7 +172,7 @@ private void selectionTreeGridSelectRange(String endItemKey, ObjectNode options)
         }
     }
 
-    private List<T> fetchItemRange(T startItem, T endItem) {
+    private List<T> fetchRange(T startItem, T endItem) {
         var items = fetchHierarchyRecursively(null);
         var startIndex = items.indexOf(startItem);
         var endIndex = items.indexOf(endItem);
@@ -194,7 +194,7 @@ protected void setSelectionModel(GridSelectionModel<T> model, SelectionMode sele
      * is not removed, but set to "hidden" explicitly.
      */
     protected void hideMultiSelectionColumn() {
-      this.setMultiSelectionColumnVisible(false);
+        this.setMultiSelectionColumnVisible(false);
     }
 
     @Override
@@ -270,7 +270,6 @@ public void setMultiSelectionColumnVisible(boolean multiSelectionColumnVisible)
 
     /**
 	 * Returns true if the checkbox selection is persistent, false otherwise.
-	 *
 	 * @return
 	 */
 	public boolean isPersistentCheckboxSelection() {
@@ -279,7 +278,6 @@ public boolean isPersistentCheckboxSelection() {
 
 	/**
 	 * Sets the checkbox selection to be persistent or not.
-	 *
 	 * @param persistentCheckboxSelection - true to make the checkbox selection persistent, false otherwise
 	 */
 	public void setPersistentCheckboxSelection(boolean persistentCheckboxSelection) {

selection-grid-flow/src/main/resources/META-INF/resources/frontend/src/helpers.js

@@ -70,6 +70,17 @@ export function _selectionGridSelectRowWithItem(e, item, index) {
     }
     // if ctrl click
     if (e.shiftKey && this.rangeSelectRowFrom >= 0) {
+        if((this.rangeSelectRowFrom - index) !== 0) { // clear text selection, if multiple rows are selected using shift
+            const sel = window.getSelection ? window.getSelection() : document.selection;
+            if (sel) {
+                if (sel.removeAllRanges) {
+                    sel.removeAllRanges();
+                } else if (sel.empty) {
+                    sel.empty();
+                }
+            }
+        }
+
         if (!ctrlKey) {
           if (this.$server?.selectionTreeGridSelectRange) {
             this.$server.selectionTreeGridSelectRange(item.key, { deselectOthers: true });