aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--client/src/com/vaadin/client/widgets/Grid.java45
-rw-r--r--uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java274
2 files changed, 306 insertions, 13 deletions
diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java
index f9c6ed28fe..73dcccfd1e 100644
--- a/client/src/com/vaadin/client/widgets/Grid.java
+++ b/client/src/com/vaadin/client/widgets/Grid.java
@@ -453,6 +453,8 @@ public class Grid<T> extends ResizeComposite implements
}
HashSet<Column<?, ?>> columnGroup = new HashSet<Column<?, ?>>();
+ // NOTE: this doesn't care about hidden columns, those are
+ // filtered in calculateColspans()
for (Column<?, ?> column : columns) {
if (!cells.containsKey(column)) {
throw new IllegalArgumentException(
@@ -516,39 +518,46 @@ public class Grid<T> extends ResizeComposite implements
}
void calculateColspans() {
-
// Reset all cells
for (CELLTYPE cell : this.cells.values()) {
cell.setColspan(1);
}
-
- List<Column<?, ?>> columnOrder = new ArrayList<Column<?, ?>>(
- section.grid.getColumns());
// Set colspan for grouped cells
for (Set<Column<?, ?>> group : cellGroups.keySet()) {
- if (!checkCellGroupAndOrder(columnOrder, group)) {
+ if (!checkMergedCellIsContinuous(group)) {
+ // on error simply break the merged cell
cellGroups.get(group).setColspan(1);
} else {
- int colSpan = group.size();
- cellGroups.get(group).setColspan(colSpan);
+ int colSpan = 0;
+ for (Column<?, ?> column : group) {
+ if (!column.isHidden()) {
+ colSpan++;
+ }
+ }
+ // colspan can't be 0
+ cellGroups.get(group).setColspan(Math.max(1, colSpan));
}
}
}
- private boolean checkCellGroupAndOrder(
- List<Column<?, ?>> columnOrder, Set<Column<?, ?>> cellGroup) {
- if (!columnOrder.containsAll(cellGroup)) {
+ private boolean checkMergedCellIsContinuous(
+ Set<Column<?, ?>> mergedCell) {
+ // no matter if hidden or not, just check for continuous order
+ final List<Column<?, ?>> columnOrder = new ArrayList<Column<?, ?>>(
+ section.grid.getColumns());
+
+ if (!columnOrder.containsAll(mergedCell)) {
return false;
}
for (int i = 0; i < columnOrder.size(); ++i) {
- if (!cellGroup.contains(columnOrder.get(i))) {
+ if (!mergedCell.contains(columnOrder.get(i))) {
continue;
}
- for (int j = 1; j < cellGroup.size(); ++j) {
- if (!cellGroup.contains(columnOrder.get(i + j))) {
+ for (int j = 1; j < mergedCell.size(); ++j) {
+ if (!mergedCell.contains(columnOrder.get(i + j))) {
return false;
}
}
@@ -791,6 +800,14 @@ public class Grid<T> extends ResizeComposite implements
assert grid != null;
return grid;
}
+
+ protected void updateColSpans() {
+ for (ROWTYPE row : rows) {
+ if (row.hasSpannedCells()) {
+ row.calculateColspans();
+ }
+ }
+ }
}
/**
@@ -4092,6 +4109,8 @@ public class Grid<T> extends ResizeComposite implements
}
}
grid.columnHider.updateToggleValue(this);
+ grid.header.updateColSpans();
+ grid.footer.updateColSpans();
scheduleColumnWidthRecalculator();
this.grid.fireEvent(new ColumnVisibilityChangeEvent<T>(this,
hidden, userOriginated));
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java
index ac04ed1a56..1213e02799 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java
@@ -31,12 +31,18 @@ import org.openqa.selenium.Keys;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
+import com.vaadin.testbench.TestBenchElement;
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.parallel.TestCategory;
@TestCategory("grid")
public class GridColumnHidingTest extends GridBasicClientFeaturesTest {
+ private static final String CAPTION_0_1 = "Join column cells 0, 1";
+ private static final String CAPTION_1_2 = "Join columns 1, 2";
+ private static final String CAPTION_3_4_5 = "Join columns 3, 4, 5";
+ private static final String CAPTION_ALL = "Join all columns";
+
@Before
public void before() {
openTestURL();
@@ -618,11 +624,258 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest {
verifyColumnIsNotFrozen(4);
}
+ @Test
+ public void testSpannedCells_hidingColumnInBeginning_rendersSpannedCellCorrectly() {
+ loadSpannedCellsFixture();
+ verifySpannedCellsFixtureStart();
+
+ toggleHideColumnAPI(0);
+
+ verifyNumberOfCellsInHeader(0, 7);
+ verifyNumberOfCellsInHeader(1, 5);
+ verifyNumberOfCellsInHeader(2, 6);
+ verifyNumberOfCellsInHeader(3, 1);
+ verifyHeaderCellContent(1, 0, CAPTION_0_1);
+ verifyHeaderCellContent(1, 2, CAPTION_3_4_5);
+ verifyHeaderCellContent(2, 0, CAPTION_1_2);
+ verifyHeaderCellContent(3, 0, CAPTION_ALL);
+ verifyHeaderCellColspan(1, 0, 1);
+ verifyHeaderCellColspan(1, 2, 3);
+ verifyHeaderCellColspan(2, 1, 2);
+
+ toggleHideColumnAPI(0);
+
+ verifySpannedCellsFixtureStart();
+
+ toggleHideColumnAPI(1);
+
+ verifyNumberOfCellsInHeader(0, 7);
+ verifyNumberOfCellsInHeader(1, 5);
+ verifyNumberOfCellsInHeader(2, 7);
+ verifyNumberOfCellsInHeader(3, 1);
+ verifyHeaderCellContent(1, 0, CAPTION_0_1);
+ verifyHeaderCellContent(1, 2, CAPTION_3_4_5);
+ verifyHeaderCellContent(2, 1, CAPTION_1_2);
+ verifyHeaderCellContent(3, 0, CAPTION_ALL);
+ verifyHeaderCellColspan(1, 0, 1);
+ verifyHeaderCellColspan(1, 2, 3);
+ verifyHeaderCellColspan(2, 1, 1);
+
+ toggleHideColumnAPI(3);
+
+ verifyNumberOfCellsInHeader(0, 6);
+ verifyNumberOfCellsInHeader(1, 5);
+ verifyNumberOfCellsInHeader(2, 6);
+ verifyNumberOfCellsInHeader(3, 1);
+ verifyHeaderCellContent(1, 0, CAPTION_0_1);
+ verifyHeaderCellContent(1, 2, CAPTION_3_4_5);
+ verifyHeaderCellContent(2, 1, CAPTION_1_2);
+ verifyHeaderCellContent(3, 0, CAPTION_ALL);
+ verifyHeaderCellColspan(1, 0, 1);
+ verifyHeaderCellColspan(1, 2, 2);
+ verifyHeaderCellColspan(2, 1, 1);
+
+ toggleHideColumnAPI(1);
+
+ verifyNumberOfCellsInHeader(0, 7);
+ verifyNumberOfCellsInHeader(1, 5);
+ verifyNumberOfCellsInHeader(2, 6);
+ verifyNumberOfCellsInHeader(3, 1);
+ verifyHeaderCellContent(1, 0, CAPTION_0_1);
+ verifyHeaderCellContent(1, 3, CAPTION_3_4_5);
+ verifyHeaderCellContent(2, 1, CAPTION_1_2);
+ verifyHeaderCellContent(3, 0, CAPTION_ALL);
+ verifyHeaderCellColspan(1, 0, 2);
+ verifyHeaderCellColspan(1, 3, 2);
+ verifyHeaderCellColspan(2, 1, 2);
+
+ toggleHideColumnAPI(3);
+
+ verifySpannedCellsFixtureStart();
+ }
+
+ @Test
+ public void testSpannedCells_hidingColumnInMiddle_rendersSpannedCellCorrectly() {
+ loadSpannedCellsFixture();
+ verifySpannedCellsFixtureStart();
+
+ toggleHideColumnAPI(4);
+
+ verifyNumberOfCellsInHeader(0, 7);
+ verifyNumberOfCellsInHeader(1, 5);
+ verifyNumberOfCellsInHeader(2, 6);
+ verifyNumberOfCellsInHeader(3, 1);
+ verifyHeaderCellContent(1, 0, CAPTION_0_1);
+ verifyHeaderCellContent(1, 3, CAPTION_3_4_5);
+ verifyHeaderCellContent(2, 1, CAPTION_1_2);
+ verifyHeaderCellContent(3, 0, CAPTION_ALL);
+ verifyHeaderCellColspan(1, 0, 2);
+ verifyHeaderCellColspan(1, 3, 2);
+ verifyHeaderCellColspan(2, 1, 2);
+
+ toggleHideColumnAPI(4);
+
+ verifySpannedCellsFixtureStart();
+ }
+
+ @Test
+ public void testSpannedCells_hidingColumnInEnd_rendersSpannedCellCorrectly() {
+ loadSpannedCellsFixture();
+ verifySpannedCellsFixtureStart();
+
+ toggleHideColumnAPI(1);
+
+ verifyNumberOfCellsInHeader(0, 7);
+ verifyNumberOfCellsInHeader(1, 5);
+ verifyNumberOfCellsInHeader(2, 7);
+ verifyNumberOfCellsInHeader(3, 1);
+ verifyHeaderCellContent(1, 0, CAPTION_0_1);
+ verifyHeaderCellContent(1, 2, CAPTION_3_4_5);
+ verifyHeaderCellContent(2, 1, CAPTION_1_2);
+ verifyHeaderCellContent(3, 1, CAPTION_ALL);
+ verifyHeaderCellColspan(1, 0, 1);
+ verifyHeaderCellColspan(1, 2, 3);
+ verifyHeaderCellColspan(2, 1, 1);
+
+ toggleHideColumnAPI(1);
+
+ verifySpannedCellsFixtureStart();
+
+ toggleHideColumnAPI(2);
+
+ verifyNumberOfCellsInHeader(0, 7);
+ verifyNumberOfCellsInHeader(1, 4);
+ verifyNumberOfCellsInHeader(2, 7);
+ verifyNumberOfCellsInHeader(3, 1);
+ verifyHeaderCellContent(1, 0, CAPTION_0_1);
+ verifyHeaderCellContent(1, 3, CAPTION_3_4_5);
+ verifyHeaderCellContent(2, 1, CAPTION_1_2);
+ verifyHeaderCellContent(3, 0, CAPTION_ALL);
+ verifyHeaderCellColspan(1, 0, 2);
+ verifyHeaderCellColspan(1, 3, 3);
+ verifyHeaderCellColspan(2, 1, 1);
+
+ toggleHideColumnAPI(5);
+
+ verifyNumberOfCellsInHeader(0, 6);
+ verifyNumberOfCellsInHeader(1, 4);
+ verifyNumberOfCellsInHeader(2, 6);
+ verifyNumberOfCellsInHeader(3, 1);
+ verifyHeaderCellContent(1, 0, CAPTION_0_1);
+ verifyHeaderCellContent(1, 3, CAPTION_3_4_5);
+ verifyHeaderCellContent(2, 1, CAPTION_1_2);
+ verifyHeaderCellContent(3, 0, CAPTION_ALL);
+ verifyHeaderCellColspan(1, 0, 2);
+ verifyHeaderCellColspan(1, 3, 2);
+ verifyHeaderCellColspan(2, 1, 1);
+
+ toggleHideColumnAPI(5);
+ toggleHideColumnAPI(2);
+
+ verifySpannedCellsFixtureStart();
+ }
+
+ @Test
+ public void testSpannedCells_spanningCellOverHiddenColumn_rendersSpannedCellCorrectly() {
+ selectMenuPath("Component", "State", "Width", "1000px");
+ appendHeaderRow();
+ toggleHideColumnAPI(4);
+ toggleHideColumnAPI(8);
+ toggleHideColumnAPI(9);
+ toggleHideColumnAPI(10);
+ toggleHideColumnAPI(11);
+ assertColumnHeaderOrder(0, 1, 2, 3, 5, 6, 7);
+ verifyNumberOfCellsInHeader(1, 7);
+
+ mergeHeaderCellsTwoThreeFour(2);
+
+ verifyNumberOfCellsInHeader(1, 6);
+ verifyHeaderCellContent(1, 3, CAPTION_3_4_5);
+ verifyHeaderCellColspan(1, 3, 2);
+ }
+
+ @Test
+ public void testSpannedCells_spanningCellAllHiddenColumns_rendersSpannedCellCorrectly() {
+ selectMenuPath("Component", "State", "Width", "1000px");
+ appendHeaderRow();
+ toggleHideColumnAPI(3);
+ toggleHideColumnAPI(4);
+ toggleHideColumnAPI(5);
+ toggleHideColumnAPI(8);
+ toggleHideColumnAPI(9);
+ toggleHideColumnAPI(10);
+ toggleHideColumnAPI(11);
+ assertColumnHeaderOrder(0, 1, 2, 6, 7);
+ verifyNumberOfCellsInHeader(1, 5);
+
+ mergeHeaderCellsTwoThreeFour(2);
+
+ verifyNumberOfCellsInHeader(1, 5);
+ verifyHeaderCellColspan(1, 0, 1);
+ verifyHeaderCellColspan(1, 1, 1);
+ verifyHeaderCellColspan(1, 2, 1);
+ verifyHeaderCellColspan(1, 3, 1);
+ verifyHeaderCellColspan(1, 4, 1);
+ }
+
+ private void loadSpannedCellsFixture() {
+ selectMenuPath("Component", "State", "Width", "1000px");
+ appendHeaderRow();
+ appendHeaderRow();
+ appendHeaderRow();
+ mergeHeaderCellsTwoThreeFour(2);
+ mergeHeaderCellsZeroOne(2);
+ mergeHeaderCellsOneTwo(3);
+ mergeHeaderCellsAll(4);
+ toggleHideColumnAPI(8);
+ toggleHideColumnAPI(9);
+ toggleHideColumnAPI(10);
+ toggleHideColumnAPI(11);
+ }
+
+ private void verifySpannedCellsFixtureStart() {
+ assertColumnHeaderOrder(0, 1, 2, 3, 4, 5, 6, 7);
+ verifyNumberOfCellsInHeader(0, 8);
+ verifyNumberOfCellsInHeader(1, 5);
+ verifyNumberOfCellsInHeader(2, 7);
+ verifyNumberOfCellsInHeader(3, 1);
+ verifyHeaderCellContent(1, 0, CAPTION_0_1);
+ verifyHeaderCellContent(1, 3, CAPTION_3_4_5);
+ verifyHeaderCellContent(2, 1, CAPTION_1_2);
+ verifyHeaderCellContent(3, 0, CAPTION_ALL);
+ verifyHeaderCellColspan(1, 0, 2);
+ verifyHeaderCellColspan(1, 3, 3);
+ verifyHeaderCellColspan(2, 1, 2);
+ }
+
private void toggleFrozenColumns(int count) {
selectMenuPath("Component", "State", "Frozen column count", count
+ " columns");
}
+ private void verifyHeaderCellColspan(int row, int column, int colspan) {
+ assertEquals(Integer.valueOf(colspan), Integer.valueOf(Integer
+ .parseInt(getGridElement().getHeaderCell(row, column)
+ .getAttribute("colspan"))));
+ }
+
+ private void verifyNumberOfCellsInHeader(int row, int numberOfCells) {
+ int size = 0;
+ for (TestBenchElement cell : getGridElement().getHeaderCells(row)) {
+ if (cell.isDisplayed()) {
+ size++;
+ }
+ }
+ assertEquals(numberOfCells, size);
+ }
+
+ private void verifyHeaderCellContent(int row, int column, String content) {
+ GridCellElement headerCell = getGridElement()
+ .getHeaderCell(row, column);
+ assertEquals(content.toLowerCase(), headerCell.getText().toLowerCase());
+ assertTrue(headerCell.isDisplayed());
+ }
+
private void verifyColumnIsFrozen(int index) {
assertTrue(getGridElement().getHeaderCell(0, index).isFrozen());
}
@@ -714,4 +967,25 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest {
selectMenuPath("Component", "Columns", "Column " + columnIndex,
"Hidden");
}
+
+ private void appendHeaderRow() {
+ selectMenuPath("Component", "Header", "Append row");
+ }
+
+ private void mergeHeaderCellsZeroOne(int row) {
+ selectMenuPath("Component", "Header", "Row " + row, CAPTION_0_1);
+ }
+
+ private void mergeHeaderCellsOneTwo(int row) {
+ selectMenuPath("Component", "Header", "Row " + row, CAPTION_1_2);
+ }
+
+ private void mergeHeaderCellsTwoThreeFour(int row) {
+ selectMenuPath("Component", "Header", "Row " + row, CAPTION_3_4_5);
+ }
+
+ private void mergeHeaderCellsAll(int row) {
+ selectMenuPath("Component", "Header", "Row " + row, CAPTION_ALL);
+ }
+
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-28 06:36:52 +0000