Provide GridLayout size and cell elements to JS and TB (#9019)

1 files changed, 44 insertions, 0 deletions

diff --git a/client/src/main/java/com/vaadin/client/ui/VGridLayout.java b/client/src/main/java/com/vaadin/client/ui/VGridLayout.java
index f34c7eabde..c8c6cce0f3 100644
--- a/client/src/main/java/com/vaadin/client/ui/VGridLayout.java
+++ b/client/src/main/java/com/vaadin/client/ui/VGridLayout.java
@@ -88,8 +88,24 @@ public class VGridLayout extends ComplexPanel {
 
         setStyleName(CLASSNAME);
         addStyleName(StyleConstants.UI_LAYOUT);
+
+        publishJSHelpers(getElement());
     }
 
+    private native void publishJSHelpers(Element root)
+    /*-{
+        var self = this;
+        root.getRowCount = $entry(function () {
+           return self.@VGridLayout::getRowCount()();
+        });
+        root.getColumnCount = $entry(function () {
+           return self.@VGridLayout::getColumnCount()();
+        });
+        root.getCell = $entry(function (row,column) {
+           return self.@VGridLayout::getCellElement(*)(row, column);
+        });
+    }-*/;
+
     private GridLayoutConnector getConnector() {
         return (GridLayoutConnector) ConnectorMap.get(client)
                 .getConnector(this);
@@ -623,6 +639,10 @@ public class VGridLayout extends ComplexPanel {
 
     Cell[][] cells;
 
+    private int rowCount;
+
+    private int columnCount;
+
     /**
      * Private helper class.
      */
@@ -781,6 +801,20 @@ public class VGridLayout extends ComplexPanel {
         return cells[col][row];
     }
 
+    private Element getCellElement(int row, int col) {
+        if (row < 0 || row >= getRowCount() || col < 0
+                || col >= getColumnCount()) {
+            return null;
+        }
+
+        Cell cell = cells[col][row];
+        if (cell == null || cell.slot == null) {
+            return null;
+        }
+
+        return cell.slot.getWrapperElement();
+    }
+
     /**
      * Creates a new Cell with the given coordinates.
      * <p>
@@ -882,6 +916,8 @@ public class VGridLayout extends ComplexPanel {
     }
 
     public void setSize(int rows, int cols) {
+        rowCount = rows;
+        columnCount = cols;
         if (cells == null) {
             cells = new Cell[cols][rows];
         } else if (cells.length != cols || cells[0].length != rows) {
@@ -897,6 +933,14 @@ public class VGridLayout extends ComplexPanel {
         }
     }
 
+    private int getRowCount() {
+        return rowCount;
+    }
+
+    private int getColumnCount() {
+        return columnCount;
+    }
+
     @Override
     public boolean remove(Widget w) {
         boolean removed = super.remove(w);