Grid merging header cells

Change-Id: Ia52bbef412fc8701f6b862960dfed9c08c17ff7a

1 files changed, 4 insertions, 0 deletions

diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/SectionState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/SectionState.java
index 39d2d2f2e9..dda6d3fe9f 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/grid/SectionState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/SectionState.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import com.vaadin.shared.Connector;
 
@@ -37,6 +38,9 @@ public class SectionState implements Serializable {
         /** The map from column ids to the cells in this row. */
         public Map<String, CellState> cells = new HashMap<>();
 
+        /** The map from a joint cell to column id sets in this row. */
+        public Map<CellState, Set<String>> cellGroups = new HashMap<>();
+
         /**
          * Whether this row is the default header row. Always false for footer
          * rows.