From 994f39b9ed46519ca3bfdc8914291e364e44694f Mon Sep 17 00:00:00 2001 From: Anna Koskinen Date: Mon, 20 May 2019 09:35:49 +0300 Subject: Don't attempt to scroll to the beginning or end if Grid has no rows. (#11570) Fixes #11558 --- client/src/main/java/com/vaadin/client/widgets/Grid.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'client') 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 7add1fd654..cb43bdd7d1 100755 --- a/client/src/main/java/com/vaadin/client/widgets/Grid.java +++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java @@ -7492,15 +7492,19 @@ public class Grid extends ResizeComposite implements HasSelectionHandlers, * Scrolls to the beginning of the very first row. */ public void scrollToStart() { - scrollToRow(0, ScrollDestination.START); + if (getEscalator().getBody().getRowCount() > 0) { + scrollToRow(0, ScrollDestination.START); + } } /** * Scrolls to the end of the very last row. */ public void scrollToEnd() { - scrollToRow(escalator.getBody().getRowCount() - 1, - ScrollDestination.END); + if (getEscalator().getBody().getRowCount() > 0) { + scrollToRow(escalator.getBody().getRowCount() - 1, + ScrollDestination.END); + } } /** -- cgit v1.2.3