Merge eb74d68 into e33b94b

vaadin · Mar 14, 2017 · 86ed1ae · 86ed1ae
2 parents e33b94b + eb74d68
commit 86ed1ae
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/test/resizing.html b/test/resizing.html
@@ -119,6 +119,17 @@
             .to.be.closeTo(bodyRows[1].getBoundingClientRect().top, 1);
         });
 
+        it('should align height with number of rows', function(done) {
+          grid.style.height = 'auto';
+          Polymer.RenderStatus.afterNextRender(grid, function() {
+            var headerHeight = scroller.$.header.clientHeight;
+            var bodyHeight = scroller.$.items.clientHeight;
+            var footerHeight = scroller.$.footer.clientHeight;
+            expect(grid.clientHeight).to.equal(headerHeight + bodyHeight + footerHeight);
+            done();
+          });
+        });
+
       });
 
 

diff --git a/vaadin-grid-sizer.html b/vaadin-grid-sizer.html
@@ -5,8 +5,6 @@
     <style>
       :host {
         display: flex;
-        position: relative;
-        width: 100%;
         visibility: hidden;
       }
 

diff --git a/vaadin-grid-table.html b/vaadin-grid-table.html
@@ -38,9 +38,7 @@
       }
 
       #items {
-        position: absolute;
-        top: 0;
-        width: 100%;
+        position: relative;
       }
 
       #items,
@@ -150,11 +148,15 @@
         display: none;
       }
 
+      #sizerwrapper {
+        position: absolute;
+        width: 100%;
+        z-index: -100;
+      }
+
       vaadin-grid-sizer {
         position: relative;
-        padding: 0;
         width: 100%;
-        z-index: -100;
       }
 
       ::slotted(vaadin-grid-column),
@@ -276,7 +278,9 @@
 
     <div id="spinner"></div>
     <vaadin-grid-table-table id="table" overflow-hidden$="[[_hideTableOverflow(scrollbarWidth, safari)]]">
-      <vaadin-grid-sizer id="fixedsizer" top="[[_estScrollHeight]]" column-tree="[[columnTree]]"></vaadin-grid-sizer>
+      <div id="sizerwrapper">
+        <vaadin-grid-sizer id="fixedsizer" top="[[_estScrollHeight]]" column-tree="[[columnTree]]"></vaadin-grid-sizer>
+      </div>
       <vaadin-grid-table-header id="header" target="[[target]]" column-tree="[[columnTree]]"></vaadin-grid-table-header>
       <vaadin-grid-table-body id="items"></vaadin-grid-table-body>
       <vaadin-grid-table-footer id="footer" target="[[target]]" column-tree="[[columnTree]]"></vaadin-grid-table-footer>
@@ -509,7 +513,7 @@
     _sizeChanged: function(size, bindData, hasData) {
       if (size === undefined || bindData === undefined || hasData === undefined) {
         return;
-      } 
+      }
 
       var scrollTop = this._scrollTop;
       var firstVisibleIndex = this.firstVisibleIndex + this._vidxOffset;