Publish Escalator.getBodyRowCount to JS (#20344)

This is needed to be able to get the information from e.g. TestBench

Change-Id: I95ec6064f602e6a8b24e35cc59d467e9c8b31c1e

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 76b9c284db0a0b4ca940d77417cf43eeacf5e743..8dbbfc437d4cddeaedb2b24fe7203860c95409a2 100644 (file)
--- a/client/src/main/java/com/vaadin/client/widgets/Escalator.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Escalator.java
@@ -673,13 +673,13 @@ public class Escalator extends Widget
         /*-{
             var vScroll = esc.@com.vaadin.client.widgets.Escalator::verticalScrollbar;
             var vScrollElem = vScroll.@com.vaadin.client.widget.escalator.ScrollbarBundle::getElement()();
-
+        
             var hScroll = esc.@com.vaadin.client.widgets.Escalator::horizontalScrollbar;
             var hScrollElem = hScroll.@com.vaadin.client.widget.escalator.ScrollbarBundle::getElement()();
-
+        
             return $entry(function(e) {
                 var target = e.target || e.srcElement; // IE8 uses e.scrElement
-
+        
                 // in case the scroll event was native (i.e. scrollbars were dragged, or
                 // the scrollTop/Left was manually modified), the bundles have old cache
                 // values. We need to make sure that the caches are kept up to date.
@@ -700,29 +700,29 @@ public class Escalator extends Widget
             return $entry(function(e) {
                 var deltaX = e.deltaX ? e.deltaX : -0.5*e.wheelDeltaX;
                 var deltaY = e.deltaY ? e.deltaY : -0.5*e.wheelDeltaY;
-
+        
                 // Delta mode 0 is in pixels; we don't need to do anything...
-
+        
                 // A delta mode of 1 means we're scrolling by lines instead of pixels
                 // We need to scale the number of lines by the default line height
                 if(e.deltaMode === 1) {
                     var brc = esc.@com.vaadin.client.widgets.Escalator::body;
                     deltaY *= brc.@com.vaadin.client.widgets.Escalator.AbstractRowContainer::getDefaultRowHeight()();
                 }
-
+        
                 // Other delta modes aren't supported
                 if((e.deltaMode !== undefined) && (e.deltaMode >= 2 || e.deltaMode < 0)) {
                     var msg = "Unsupported wheel delta mode \"" + e.deltaMode + "\"";
-
+        
                     // Print warning message
                     esc.@com.vaadin.client.widgets.Escalator::logWarning(*)(msg);
                 }
-
+        
                 // IE8 has only delta y
                 if (isNaN(deltaY)) {
                     deltaY = -0.5*e.wheelDelta;
                 }
-
+        
                 @com.vaadin.client.widgets.Escalator.JsniUtil::moveScrollFromEvent(*)(esc, deltaX, deltaY, e);
             });
         }-*/;
@@ -1070,7 +1070,8 @@ public class Escalator extends Widget
         /**
          * The table section element ({@code <thead>}, {@code <tbody>} or
          * {@code <tfoot>}) the rows (i.e. {@code 
-         * <tr>
+         * 
+        <tr>
          * } tags) are contained in.
          */
         protected final TableSectionElement root;
@@ -1761,7 +1762,8 @@ public class Escalator extends Widget
          * <p>
          * <em>Note:</em> In contrast to {@link #reapplyColumnWidths()}, this
          * method only modifies the width of the {@code 
-         * <tr>
+         * 
+        <tr>
          * } element, not the cells within.
          */
         protected void reapplyRowWidths() {
@@ -5603,8 +5605,22 @@ public class Escalator extends Widget
         // init default dimensions
         setHeight(null);
         setWidth(null);
+
+        publishJSHelpers(root);
+    }
+
+    private int getBodyRowCount() {
+        return getBody().getRowCount();
     }
 
+    private native void publishJSHelpers(Element root)
+    /*-{
+        var self = this;
+        root.getBodyRowCount = $entry(function () {
+           return self.@Escalator::getBodyRowCount()();
+        });
+    }-*/;
+
     private void setupScrollbars(final Element root) {
 
         ScrollHandler scrollHandler = new ScrollHandler() {

diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java
index f8a4bd3e95124a4aff82d9ba43238c2916c194be..67cec7bef087a4967149ab18b0f0decc43377214 100644 (file)
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java
@@ -514,4 +514,18 @@ public class GridStructureTest extends GridBasicFeaturesTest {
         selectMenuPath("Component", "Body rows", "Add third row");
         assertFalse(logContainsText("Exception occured"));
     }
+
+    @Test
+    public void getBodyRowCountJS() {
+        openTestURL();
+        GridElement grid = $(GridElement.class).first();
+        assertEquals(1000L,
+                executeScript("return arguments[0].getBodyRowCount()", grid));
+        selectMenuPath("Component", "Body rows", "Remove all rows");
+        assertEquals(0L,
+                executeScript("return arguments[0].getBodyRowCount()", grid));
+        selectMenuPath("Component", "Body rows", "Add first row");
+        assertEquals(1L,
+                executeScript("return arguments[0].getBodyRowCount()", grid));
+    }
 }