From ac9c090c6efdc313f2220f89e6a55f4ec1d5b68e Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewjs@google.com>
Date: Fri, 10 Feb 2017 14:25:14 -0800
Subject: [PATCH] fix(select): set select value to trigger height and center
 text (#3021)

* fix(select): change styling to always center select value text

* move border to its own div; make value ellipsis

* add more room for arrow, account for margin

* minor fixes
---
 src/lib/select/_select-theme.scss | 15 ++++++++---
 src/lib/select/select.html        |  5 +++-
 src/lib/select/select.scss        | 42 ++++++++++++++++++++++---------
 3 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/src/lib/select/_select-theme.scss b/src/lib/select/_select-theme.scss
index 5cc54c91fe63..3b009f5306ba 100644
--- a/src/lib/select/_select-theme.scss
+++ b/src/lib/select/_select-theme.scss
@@ -9,16 +9,25 @@
 
   .mat-select-trigger {
     color: mat-color($foreground, hint-text);
-    border-bottom: 1px solid mat-color($foreground, divider);
 
     .mat-select:focus:not(.mat-select-disabled) & {
       color: mat-color($primary);
-      border-bottom: 1px solid mat-color($primary);
     }
 
     .mat-select.ng-invalid.ng-touched:not(.mat-select-disabled) & {
       color: mat-color($warn);
-      border-bottom: 1px solid mat-color($warn);
+    }
+  }
+
+  .mat-select-underline {
+    background-color: mat-color($foreground, divider);
+
+    .mat-select:focus:not(.mat-select-disabled) & {
+      background-color: mat-color($primary);
+    }
+
+    .mat-select.ng-invalid.ng-touched:not(.mat-select-disabled) & {
+      background-color: mat-color($warn);
     }
   }
 
diff --git a/src/lib/select/select.html b/src/lib/select/select.html
index ca7ae280db9f..4e36b2187800 100644
--- a/src/lib/select/select.html
+++ b/src/lib/select/select.html
@@ -1,8 +1,11 @@
 <div class="mat-select-trigger" cdk-overlay-origin (click)="toggle()" #origin="cdkOverlayOrigin" #trigger>
   <span class="mat-select-placeholder" [class.mat-floating-placeholder]="this.selected"
    [@transformPlaceholder]="_placeholderState" [style.width.px]="_selectedValueWidth"> {{ placeholder }} </span>
-  <span class="mat-select-value" *ngIf="selected"> {{ selected?.viewValue }} </span>
+  <span class="mat-select-value" *ngIf="selected">
+    <span class="mat-select-value-text">{{ selected?.viewValue }}</span>
+  </span>
   <span class="mat-select-arrow"></span>
+  <span class="mat-select-underline"></span>
 </div>
 
 <template cdk-connected-overlay [origin]="origin" [open]="panelOpen" hasBackdrop (backdropClick)="close()"
diff --git a/src/lib/select/select.scss b/src/lib/select/select.scss
index b95435bb562e..e024c72e12ec 100644
--- a/src/lib/select/select.scss
+++ b/src/lib/select/select.scss
@@ -19,7 +19,6 @@ $mat-select-trigger-font-size: 16px !default;
 
 .mat-select-trigger {
   display: flex;
-  justify-content: space-between;
   align-items: center;
   height: $mat-select-trigger-height;
   min-width: $mat-select-trigger-min-width;
@@ -29,18 +28,30 @@ $mat-select-trigger-font-size: 16px !default;
   font-size: $mat-select-trigger-font-size;
 
   [aria-disabled='true'] & {
-    @include mat-control-disabled-underline();
-    border-bottom: transparent;
-    background-position: 0 bottom;
     cursor: default;
     user-select: none;
   }
 }
 
+.mat-select-underline {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 1px;
+
+  [aria-disabled='true'] & {
+    @include mat-control-disabled-underline();
+    background-color: transparent;
+    background-position: 0 bottom;
+  }
+}
+
 .mat-select-placeholder {
   position: relative;
   padding: 0 2px;
   transform-origin: left top;
+  flex-grow: 1;
 
   // These values are duplicated from animation code in order to
   // allow placeholders to sometimes float without animating,
@@ -69,22 +80,24 @@ $mat-select-trigger-font-size: 16px !default;
 }
 
 .mat-select-value {
-  @include mat-truncate-line();
   position: absolute;
-  max-width: calc(100% - #{$mat-select-arrow-size * 2});
+  max-width: calc(100% - #{($mat-select-arrow-size + $mat-select-arrow-margin) * 2});
+  flex-grow: 1;
 
   // Firefox and some versions of IE incorrectly keep absolutely
   // positioned children of flex containers in the flex flow when calculating
   // position. This has been fixed for Firefox 52, slated for early 2017.
   // Bug report: https://bugzilla.mozilla.org/show_bug.cgi?id=874718
   //
-  // In the meantime, we must adjust the left position to 0 to mimic where it
-  // would be if it were correctly taken out of the flex flow. It's also necessary
-  // to adjust the top value because absolutely positioned elements should not be
-  // affected by the flex container's "align-items" property either. To center the text,
-  // we must offset by 6px (6px top + 6px bottom + 18px text height = 30px total height).
+  // In the meantime, we must adjust the position to fit the top, left, and bottom edge of the
+  // containing trigger element. In doing so, we can use align-items: center to allow the text to
+  // correctly position itself in the middle of the container.
+  top: 0;
   left: 0;
-  top: 6px;
+  bottom: 0;
+
+  display: flex;
+  align-items: center;
 
   [dir='rtl'] & {
     left: auto;
@@ -92,6 +105,11 @@ $mat-select-trigger-font-size: 16px !default;
   }
 }
 
+.mat-select-value-text {
+  @include mat-truncate-line();
+  line-height: $mat-select-trigger-height;
+}
+
 .mat-select-arrow {
   width: 0;
   height: 0;