Skip to content

Commit da2e630

Browse files
javier-godoypaodb
authored andcommitted
fix: disable reordering when the grid is sorted
1 parent 549a7b0 commit da2e630

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ ListDataProvider<T> getDataProvider() {
102102
Collection<T> getItems() {
103103
return getDataProvider().getItems();
104104
}
105+
106+
boolean isReorderingEnabled() {
107+
return allowReordering && grid.getSortOrder().isEmpty();
108+
}
105109
}
106110

107111
/** enumeration of all available orientation for TwinGolGrid component */
@@ -750,8 +754,10 @@ private void configDragAndDrop(
750754
draggedItems.addAll(event.getDraggedItems());
751755
}
752756

753-
sourceModel.grid.setDropMode(sourceModel.allowReordering ? GridDropMode.BETWEEN : null);
754-
targetModel.grid.setDropMode(targetModel.allowReordering ? GridDropMode.BETWEEN : GridDropMode.ON_GRID);
757+
sourceModel.grid
758+
.setDropMode(sourceModel.isReorderingEnabled() ? GridDropMode.BETWEEN : null);
759+
targetModel.grid.setDropMode(
760+
targetModel.isReorderingEnabled() ? GridDropMode.BETWEEN : GridDropMode.ON_GRID);
755761
});
756762

757763
sourceModel.grid.addDragEndListener(
@@ -787,7 +793,7 @@ private void configDragAndDrop(
787793

788794
sourceModel.grid.addDropListener(event -> {
789795
event.getDropTargetItem().ifPresent(dropOverItem -> {
790-
if (sourceModel.allowReordering
796+
if (sourceModel.isReorderingEnabled()
791797
&& event.getSource() == draggedGrid
792798
&& !draggedItems.contains(dropOverItem)
793799
&& !draggedItems.isEmpty()) {

0 commit comments

Comments
 (0)