From c5a61aa91c52f75fc8d1d78dbd3c3dfff792011f Mon Sep 17 00:00:00 2001
From: emyarod <emyarod@users.noreply.github.com>
Date: Fri, 8 Feb 2019 15:33:12 -0600
Subject: [PATCH] feat(dropdown): support new experimental error state (#1733)

* feat(dropdown): support new experimental error state

* fix(dropdown): center dropdown list item text

* docs(dropdown): display error state examples experimental env only

* fix(dropdown): reposition alert svg
---
 src/components/dropdown/_dropdown.scss | 20 ++++++++
 src/components/dropdown/dropdown.hbs   | 70 +++++++++++++++++++++-----
 2 files changed, 77 insertions(+), 13 deletions(-)

diff --git a/src/components/dropdown/_dropdown.scss b/src/components/dropdown/_dropdown.scss
index 7d05f9587443..69bc0923fd95 100644
--- a/src/components/dropdown/_dropdown.scss
+++ b/src/components/dropdown/_dropdown.scss
@@ -252,6 +252,24 @@
     }
   }
 
+  .#{$prefix}--dropdown[data-invalid] {
+    @include focus-outline('invalid');
+
+    + .#{$prefix}--form-requirement {
+      display: inline-block;
+      max-height: rem(200px);
+      color: $support-01;
+    }
+  }
+
+  .#{$prefix}--dropdown__invalid {
+    position: absolute;
+    top: 50%;
+    right: rem(34px);
+    fill: $support-01;
+    transform: translateY(-50%);
+  }
+
   .#{$prefix}--dropdown--open:focus {
     outline: 1px solid transparent;
     box-shadow: none;
@@ -286,6 +304,8 @@
   }
 
   .#{$prefix}--dropdown-text {
+    display: flex;
+    align-items: center;
     height: rem(40px);
     padding-top: rem(12px);
     padding-bottom: rem(12px);
diff --git a/src/components/dropdown/dropdown.hbs b/src/components/dropdown/dropdown.hbs
index 7cdddb2bde8c..a34d30e58432 100644
--- a/src/components/dropdown/dropdown.hbs
+++ b/src/components/dropdown/dropdown.hbs
@@ -1,40 +1,84 @@
-<!-- 
+<!--
   Copyright IBM Corp. 2016, 2018
 
   This source code is licensed under the Apache-2.0 license found in the
   LICENSE file in the root directory of this source tree.
 -->
 
-<ul data-dropdown{{#if inline}} data-dropdown-type="inline" {{/if}} data-value class="{{@root.prefix}}--dropdown{{#if up}} {{@root.prefix}}--dropdown--up{{/if}}{{#if light}} {{@root.prefix}}--dropdown--light{{/if}}{{#if inline}} {{@root.prefix}}--dropdown--inline{{/if}}"
+<ul data-dropdown{{#if inline}} data-dropdown-type="inline" {{/if}} data-value
+  class="{{@root.prefix}}--dropdown{{#if up}} {{@root.prefix}}--dropdown--up{{/if}}{{#if light}} {{@root.prefix}}--dropdown--light{{/if}}{{#if inline}} {{@root.prefix}}--dropdown--inline{{/if}}"
   tabindex="0">
   <li class="{{@root.prefix}}--dropdown-text">
     {{#unless inline}} Dropdown label {{else}}
     <span class="{{@root.prefix}}--dropdown-text__inner">Inline Dropdown label</span>
     {{#if featureFlags.componentsX}}
-      {{ carbon-icon 'ChevronDownGlyph' class=(add @root.prefix '--dropdown__arrow') }}
+    {{ carbon-icon 'ChevronDownGlyph' class=(add @root.prefix '--dropdown__arrow') }}
     {{else}}
-      <svg class="{{@root.prefix}}--dropdown__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
-        <path d="M10 0L5 5 0 0z"></path>
-      </svg>
+    <svg class="{{@root.prefix}}--dropdown__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
+      <path d="M10 0L5 5 0 0z"></path>
+    </svg>
     {{/if}}
     {{/unless}}
   </li>
   {{#unless inline}}
   {{#if featureFlags.componentsX}}
-    {{ carbon-icon 'ChevronDownGlyph' class=(add @root.prefix '--dropdown__arrow') }}
+  {{ carbon-icon 'ChevronDownGlyph' class=(add @root.prefix '--dropdown__arrow') }}
   {{else}}
-    <svg class="{{@root.prefix}}--dropdown__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
-      <path d="M10 0L5 5 0 0z"></path>
-    </svg>
+  <svg class="{{@root.prefix}}--dropdown__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
+    <path d="M10 0L5 5 0 0z"></path>
+  </svg>
   {{/if}}
   {{/unless}}
   <li>
     <ul class="{{@root.prefix}}--dropdown-list">
       {{#each items}}
-        <li data-option data-value="{{value}}" class="{{@root.prefix}}--dropdown-item">
-          <a class="{{@root.prefix}}--dropdown-link" href="javascript:void(0)" tabindex="-1">{{label}}</a>
-        </li>
+      <li data-option data-value="{{value}}" class="{{@root.prefix}}--dropdown-item">
+        <a class="{{@root.prefix}}--dropdown-link" href="javascript:void(0)" tabindex="-1">{{label}}</a>
+      </li>
       {{/each}}
     </ul>
   </li>
 </ul>
+<br>
+{{#if featureFlags.componentsX}}
+  <div class="{{@root.prefix}}--form-item">
+    <ul data-dropdown{{#if inline}} data-dropdown-type="inline" {{/if}} data-value
+      class="{{@root.prefix}}--dropdown{{#if up}} {{@root.prefix}}--dropdown--up{{/if}}{{#if light}} {{@root.prefix}}--dropdown--light{{/if}}{{#if inline}} {{@root.prefix}}--dropdown--inline{{/if}}"
+      tabindex="0" data-invalid>
+      {{ carbon-icon 'WarningFilled16' class=(add @root.prefix '--dropdown__invalid')}}
+      <li class="{{@root.prefix}}--dropdown-text">
+        {{#unless inline}} Dropdown label {{else}}
+        <span class="{{@root.prefix}}--dropdown-text__inner">Inline Dropdown label</span>
+        {{#if featureFlags.componentsX}}
+        {{ carbon-icon 'ChevronDownGlyph' class=(add @root.prefix '--dropdown__arrow') }}
+        {{else}}
+        <svg class="{{@root.prefix}}--dropdown__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
+          <path d="M10 0L5 5 0 0z"></path>
+        </svg>
+        {{/if}}
+        {{/unless}}
+      </li>
+      {{#unless inline}}
+      {{#if featureFlags.componentsX}}
+      {{ carbon-icon 'ChevronDownGlyph' class=(add @root.prefix '--dropdown__arrow') }}
+      {{else}}
+      <svg class="{{@root.prefix}}--dropdown__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
+        <path d="M10 0L5 5 0 0z"></path>
+      </svg>
+      {{/if}}
+      {{/unless}}
+      <li>
+        <ul class="{{@root.prefix}}--dropdown-list">
+          {{#each items}}
+          <li data-option data-value="{{value}}" class="{{@root.prefix}}--dropdown-item">
+            <a class="{{@root.prefix}}--dropdown-link" href="javascript:void(0)" tabindex="-1">{{label}}</a>
+          </li>
+          {{/each}}
+        </ul>
+      </li>
+    </ul>
+    <div class="{{@root.prefix}}--form-requirement">
+      This is not a validation message
+    </div>
+  </div>
+{{/if}}
\ No newline at end of file