From 565eeb5b5a85e6ce6310e0098977f853869f01ba Mon Sep 17 00:00:00 2001 From: Tatu Lund Date: Mon, 20 Apr 2020 14:55:01 +0300 Subject: Add multiselect column compensation (#11951) --- client/src/main/java/com/vaadin/client/widgets/Grid.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/client/src/main/java/com/vaadin/client/widgets/Grid.java b/client/src/main/java/com/vaadin/client/widgets/Grid.java index 908446dfee..01c069143b 100755 --- a/client/src/main/java/com/vaadin/client/widgets/Grid.java +++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java @@ -5322,8 +5322,12 @@ public class Grid extends ResizeComposite implements HasSelectionHandlers, } else { this.hidden = hidden; - final int columnIndex = grid.getVisibleColumns() + int columnIndex = grid.getVisibleColumns() .indexOf(this); + // Correct column index for multiselect mode + if (grid.getSelectionColumn().isPresent()) { + columnIndex--; + } grid.escalator.getColumnConfiguration() .insertColumns(columnIndex, 1); -- cgit v1.2.3