From 9dec05852dbdc4425c3d83feb74cfddf0e43e503 Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco@fabscale.com>
Date: Fri, 3 Jul 2020 10:16:22 +0200
Subject: [PATCH] Add id, aria-label & aria-labelledby to all listboxes

---
 addon/components/power-select.hbs                | 16 ++++++++++++++--
 addon/components/power-select/search-message.hbs |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/addon/components/power-select.hbs b/addon/components/power-select.hbs
index 438f93302..e42d0188d 100644
--- a/addon/components/power-select.hbs
+++ b/addon/components/power-select.hbs
@@ -90,11 +90,23 @@
       {{/let}}
       {{#if this.mustShowSearchMessage}}
         {{#let (component (or @searchMessageComponent "power-select/search-message")) as |SearchMessage|}}
-          <SearchMessage @searchMessage={{this.searchMessage}} @select={{publicAPI}}/>
+          <SearchMessage 
+            @searchMessage={{this.searchMessage}} 
+            @select={{publicAPI}} 
+            id={{listboxId}} 
+            aria-label={{@ariaLabel}}
+            aria-labelledby={{@ariaLabelledBy}}  
+          />
         {{/let}}
       {{else if this.mustShowNoMessages}}
         {{#if this.noMatchesMessage}}
-          <ul class="ember-power-select-options" role="listbox">
+          <ul 
+            class="ember-power-select-options" 
+            role="listbox" 
+            id={{listboxId}}
+            aria-label={{@ariaLabel}}
+            aria-labelledby={{@ariaLabelledBy}}
+          >
             <li class="ember-power-select-option ember-power-select-option--no-matches-message" role="option">
               {{this.noMatchesMessage}}
             </li>
diff --git a/addon/components/power-select/search-message.hbs b/addon/components/power-select/search-message.hbs
index ff83e3a72..ac90ffd37 100644
--- a/addon/components/power-select/search-message.hbs
+++ b/addon/components/power-select/search-message.hbs
@@ -1,4 +1,4 @@
-<ul class="ember-power-select-options" role="listbox">
+<ul class="ember-power-select-options" role="listbox" ...attributes>
   <li class="ember-power-select-option ember-power-select-option--search-message" role="option">
     {{@searchMessage}}
   </li>