aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--client/src/main/java/com/vaadin/client/widgets/Escalator.java1
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridScrollDownResize.java34
2 files changed, 35 insertions, 0 deletions
diff --git a/client/src/main/java/com/vaadin/client/widgets/Escalator.java b/client/src/main/java/com/vaadin/client/widgets/Escalator.java
index 1cd24297f3..bbc26b2437 100644
--- a/client/src/main/java/com/vaadin/client/widgets/Escalator.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Escalator.java
@@ -3770,6 +3770,7 @@ public class Escalator extends Widget
visualRowOrder.getLast()) + 1;
moveAndUpdateEscalatorRows(Range.withOnly(0),
visualRowOrder.size(), newLogicalIndex);
+ updateTopRowLogicalIndex(1);
}
}
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrollDownResize.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrollDownResize.java
new file mode 100644
index 0000000000..8a89347500
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrollDownResize.java
@@ -0,0 +1,34 @@
+package com.vaadin.tests.components.grid;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.tests.minitutorials.v7_4.GridExampleHelper;
+import com.vaadin.ui.Grid;
+import com.vaadin.ui.VerticalLayout;
+
+public class GridScrollDownResize extends AbstractTestUI {
+
+ @Override
+ protected void setup(VaadinRequest request) {
+ // container with at least 100 rows
+ final Grid grid = new Grid(GridExampleHelper.createContainer());
+ grid.setSizeFull();
+ addComponent(grid);
+ getLayout().setSizeFull();
+ getLayout().setExpandRatio(grid, 2);
+ ((VerticalLayout) getLayout().getParent()).setSizeFull();
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return 11893;
+ };
+
+ @Override
+ protected String getTestDescription() {
+ return "Scrolling all the way down, resizing the browser window smaller "
+ + "so that one row gets completely hidden, and scrolling down "
+ + "again should keep the row contents consistent and in expected "
+ + "sequence.";
+ }
+}