From 2b3d795b00821a13e05164d04df370e9d4ec53ec Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 4 Oct 2017 00:50:39 +0200
Subject: [PATCH] fix(paginator): page size selector not working (#7263)

---
 src/lib/paginator/paginator.html | 12 +++++++-----
 src/lib/paginator/paginator.scss |  7 +------
 src/lib/select/select-module.ts  |  3 ++-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/lib/paginator/paginator.html b/src/lib/paginator/paginator.html
index 06297e5fb288..c8b207b4c426 100644
--- a/src/lib/paginator/paginator.html
+++ b/src/lib/paginator/paginator.html
@@ -3,11 +3,13 @@
     {{_intl.itemsPerPageLabel}}
   </div>
 
-  <mat-form-field *ngIf="_displayedPageSizeOptions.length > 1">
-    <mat-select class="mat-paginator-page-size-select"
-               [value]="pageSize"
-               [aria-label]="_intl.itemsPerPageLabel"
-               (change)="_changePageSize($event.value)">
+  <mat-form-field
+    *ngIf="_displayedPageSizeOptions.length > 1"
+    class="mat-paginator-page-size-select">
+    <mat-select
+      [value]="pageSize"
+      [aria-label]="_intl.itemsPerPageLabel"
+      (change)="_changePageSize($event.value)">
       <mat-option *ngFor="let pageSizeOption of _displayedPageSizeOptions" [value]="pageSizeOption">
         {{pageSizeOption}}
       </mat-option>
diff --git a/src/lib/paginator/paginator.scss b/src/lib/paginator/paginator.scss
index 46fb48aaa944..4562996aa8ea 100644
--- a/src/lib/paginator/paginator.scss
+++ b/src/lib/paginator/paginator.scss
@@ -32,13 +32,8 @@ $mat-paginator-button-increment-icon-margin: 16px;
 }
 
 .mat-paginator-page-size-select {
-  // Since the select won't have a placeholder we can remove the space that is reserved for it.
-  padding-top: 0;
   margin: $mat-paginator-selector-margin;
-
-  .mat-select-trigger {
-    min-width: $mat-paginator-selector-trigger-min-width;
-  }
+  width: $mat-paginator-selector-trigger-min-width;
 }
 
 .mat-paginator-range-label {
diff --git a/src/lib/select/select-module.ts b/src/lib/select/select-module.ts
index 99b154bfc2e0..596cfefcb4bf 100644
--- a/src/lib/select/select-module.ts
+++ b/src/lib/select/select-module.ts
@@ -11,6 +11,7 @@ import {CommonModule} from '@angular/common';
 import {MatSelect, MatSelectTrigger, MAT_SELECT_SCROLL_STRATEGY_PROVIDER} from './select';
 import {MatCommonModule, MatOptionModule} from '@angular/material/core';
 import {OverlayModule} from '@angular/cdk/overlay';
+import {MatFormFieldModule} from '@angular/material/form-field';
 
 
 @NgModule({
@@ -20,7 +21,7 @@ import {OverlayModule} from '@angular/cdk/overlay';
     MatOptionModule,
     MatCommonModule,
   ],
-  exports: [MatSelect, MatSelectTrigger, MatOptionModule, MatCommonModule],
+  exports: [MatFormFieldModule, MatSelect, MatSelectTrigger, MatOptionModule, MatCommonModule],
   declarations: [MatSelect, MatSelectTrigger],
   providers: [MAT_SELECT_SCROLL_STRATEGY_PROVIDER]
 })