From 7cd420a2fe40452d9de665d0cbb480b74df48e52 Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Fri, 27 May 2016 08:21:04 -0700
Subject: [PATCH] fix(grid-list): account for gutter in total list height

---
 src/components/grid-list/tile-styler.ts | 30 +++++++++++++++++++------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/components/grid-list/tile-styler.ts b/src/components/grid-list/tile-styler.ts
index 9eaf04227409..2b0a170e8eef 100644
--- a/src/components/grid-list/tile-styler.ts
+++ b/src/components/grid-list/tile-styler.ts
@@ -97,16 +97,30 @@ export class TileStyler {
     tile.setStyle('width', calc(this.getTileSize(baseTileWidth, tile.colspan)));
   }
 
-  /** Sets the vertical placement of the tile in the list.
-   * This method will be implemented by each type of TileStyler.
+  /** Calculates the total size taken up by gutters across one axis of a list.
    * @internal
    */
-  setRowStyles(tile: MdGridTile, rowIndex: number, percentWidth: number, gutterWidth: number) {}
+  getGutterSpan(): string {
+    return `${this._gutterSize} * (${this._rowspan} - 1)`;
+  }
 
-  /** Calculates the computed height and returns the correct style property to set.
-   * This method will be implemented by each type of TileStyler.
+  /** Calculates the total size taken up by tiles across one axis of a list.
    * @internal
    */
+  getTileSpan(tileHeight: string): string {
+    return `${this._rowspan} * ${this.getTileSize(tileHeight, 1)}`;
+  }
+
+  /** Sets the vertical placement of the tile in the list.
+  * This method will be implemented by each type of TileStyler.
+* @internal
+*/
+  setRowStyles(tile: MdGridTile, rowIndex: number, percentWidth: number, gutterWidth: number) {}
+
+  /** Calculates the computed height and returns the correct style property to set.
+  * This method will be implemented by each type of TileStyler.
+* @internal
+*/
   getComputedHeight(): [string, string] { return null; }
 }
 
@@ -132,7 +146,9 @@ export class FixedTileStyler extends TileStyler {
 
   /** @internal */
   getComputedHeight(): [string, string] {
-    return ['height', calc(`${this._rowspan} * ${this.getTileSize(this.fixedRowHeight, 1)}`)];
+    return [
+      'height', calc(`${this.getTileSpan(this.fixedRowHeight)} + ${this.getGutterSpan()}`)
+    ];
   }
 }
 
@@ -165,7 +181,7 @@ export class RatioTileStyler extends TileStyler {
   /** @internal */
   getComputedHeight(): [string, string] {
     return [
-      'paddingBottom', calc(`${this._rowspan} * ${this.getTileSize(this.baseTileHeight, 1)}`)
+      'paddingBottom', calc(`${this.getTileSpan(this.baseTileHeight)} + ${this.getGutterSpan()}`)
     ];
   }