diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-12-18 18:46:35 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2014-12-18 21:13:15 +0000 |
| commit | e4aa47017a1d99ad6dcc3e68a86a7014b0c59e28 (patch) | |
| tree | 29752532c17ae3d8ab00b6b239e2dc179281c8f5 | |
| parent | 6e35854213946f2400f50d9e1d1dee04b5c84cb2 (diff) | |
| download | vaadin-framework-e4aa47017a1d99ad6dcc3e68a86a7014b0c59e28.tar.gz vaadin-framework-e4aa47017a1d99ad6dcc3e68a86a7014b0c59e28.zip | |
Prevent scrolling when adding rows above the focused cell (#13334)
Change-Id: Ic9c9285bae16f7ddec72f621976667ee68a7c103
| -rw-r--r-- | client/src/com/vaadin/client/widgets/Grid.java | 3 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java index 1fad13ea7b..50a41cd324 100644 --- a/client/src/com/vaadin/client/widgets/Grid.java +++ b/client/src/com/vaadin/client/widgets/Grid.java @@ -1779,8 +1779,7 @@ public class Grid<T> extends ResizeComposite implements boolean bodyHasFocus = (containerWithFocus == escalator.getBody()); boolean insertionIsAboveFocusedCell = (added.getStart() <= rowWithFocus); if (bodyHasFocus && insertionIsAboveFocusedCell) { - setCellFocus(rowWithFocus + added.length(), - cellFocusRange.getStart(), containerWithFocus); + rowWithFocus += added.length(); } } diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java index 37e92830f3..337293d687 100644 --- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java +++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java @@ -372,11 +372,14 @@ public class GridStructureTest extends GridBasicFeaturesTest { setDebug(true); openTestURL(); - getGridElement().scrollToRow(500); + GridCellElement cell = getGridElement().getCell(500, 1); + String cellContent = cell.getText(); selectMenuPath("Component", "Body rows", "Add first row"); assertFalse("Error notification was present", isElementPresent(NotificationElement.class)); + + assertEquals("Grid scrolled unexpectedly", cellContent, cell.getText()); } private void assertPrimaryStylename(String stylename) { |