fix: disable reordering when the grid is sorted

FlowingCode · Jan 28, 2022 · da2e630 · da2e630
1 parent 549a7b0
commit da2e630
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
@@ -102,6 +102,10 @@ ListDataProvider<T> getDataProvider() {
     Collection<T> getItems() {
       return getDataProvider().getItems();
     }
+
+    boolean isReorderingEnabled() {
+      return allowReordering && grid.getSortOrder().isEmpty();
+    }
   }
 
   /** enumeration of all available orientation for TwinGolGrid component */
@@ -750,8 +754,10 @@ private void configDragAndDrop(
             draggedItems.addAll(event.getDraggedItems());
           }
 
-          sourceModel.grid.setDropMode(sourceModel.allowReordering ? GridDropMode.BETWEEN : null);
-          targetModel.grid.setDropMode(targetModel.allowReordering ? GridDropMode.BETWEEN : GridDropMode.ON_GRID);
+          sourceModel.grid
+              .setDropMode(sourceModel.isReorderingEnabled() ? GridDropMode.BETWEEN : null);
+          targetModel.grid.setDropMode(
+              targetModel.isReorderingEnabled() ? GridDropMode.BETWEEN : GridDropMode.ON_GRID);
         });
 
     sourceModel.grid.addDragEndListener(
@@ -787,7 +793,7 @@ private void configDragAndDrop(
 
     sourceModel.grid.addDropListener(event -> {
       event.getDropTargetItem().ifPresent(dropOverItem -> {
-        if (sourceModel.allowReordering
+        if (sourceModel.isReorderingEnabled()
             && event.getSource() == draggedGrid
             && !draggedItems.contains(dropOverItem)
             && !draggedItems.isEmpty()) {