From d9c5d270f2680f93506e29c3dfb8b40e6964a840 Mon Sep 17 00:00:00 2001
From: Cory LaViska <cory@abeautifulsite.net>
Date: Fri, 21 Aug 2020 16:58:02 -0400
Subject: [PATCH] Fix select bugs

---
 CHANGELOG.md                     | 2 ++
 src/components/select/select.tsx | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64606cdc6..713b6ce9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@
 - Fixed a bug where `sl-color-picker` had the wrong border color in the dark theme
 - Fixed a bug where `sl-menu-item` had the wrong color in dark mode when disabled
 - Fixed a bug where WebKit's autocomplete styles made inputs looks broken
+- Fixed a bug where aria labels were wrong in `sl-select`
+- Fixed a bug where clicking the label wouldn't focus the control in `sl-select`
 
 ## 2.0.0-beta.14
 
diff --git a/src/components/select/select.tsx b/src/components/select/select.tsx
index 5da962333..fd31689e1 100644
--- a/src/components/select/select.tsx
+++ b/src/components/select/select.tsx
@@ -301,6 +301,7 @@ export class Select {
       >
         <label
           part="label"
+          id={this.labelId}
           class={{
             label: true,
             'label--small': this.size === 'small',
@@ -310,6 +311,7 @@ export class Select {
             'label--invalid': this.invalid
           }}
           htmlFor={this.inputId}
+          onClick={this.handleLabelClick}
         >
           {this.label}
         </label>
@@ -349,6 +351,7 @@ export class Select {
             valid={this.valid}
             invalid={this.invalid}
             aria-labelledby={this.labelId}
+            aria-describedby={this.helpTextId}
             onSlFocus={this.handleFocus}
             onSlBlur={this.handleBlur}
             onKeyDown={this.handleKeyDown}