From d07710e59c3b611547e7a379800c681cd6ce4824 Mon Sep 17 00:00:00 2001
From: Dylan Praul <dylan.praul@gmail.com>
Date: Wed, 21 Feb 2018 11:01:34 -0500
Subject: [PATCH] fix(select): pre-selected option correctly floats label

---
 packages/mdc-select/foundation.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/mdc-select/foundation.js b/packages/mdc-select/foundation.js
index a3b3db60984..7676fa0ee27 100644
--- a/packages/mdc-select/foundation.js
+++ b/packages/mdc-select/foundation.js
@@ -105,9 +105,6 @@ export default class MDCSelectFoundation extends MDCFoundation {
     };
     this.cancelHandler_ = () => {
       this.close_();
-      if (this.selectedIndex_ === -1) {
-        this.adapter_.floatLabel(false);
-      }
     };
   }
 
@@ -155,6 +152,9 @@ export default class MDCSelectFoundation extends MDCFoundation {
     if (this.selectedIndex_ >= 0) {
       selectedTextContent = this.adapter_.getTextForOptionAtIndex(this.selectedIndex_).trim();
       this.adapter_.setAttrForOptionAtIndex(this.selectedIndex_, 'aria-selected', 'true');
+      this.adapter_.floatLabel(true);
+    } else {
+      this.adapter_.floatLabel(false);
     }
     this.adapter_.setSelectedTextContent(selectedTextContent);
   }
@@ -212,7 +212,6 @@ export default class MDCSelectFoundation extends MDCFoundation {
     const focusIndex = this.selectedIndex_ < 0 ? 0 : this.selectedIndex_;
 
     this.setMenuStylesForOpenAtIndex_(focusIndex);
-    this.adapter_.floatLabel(true);
     this.adapter_.addClassToBottomLine(cssClasses.BOTTOM_LINE_ACTIVE);
     this.adapter_.addClass(OPEN);
     this.animationRequestId_ = requestAnimationFrame(() => {