nsw-design-system 3.11.0 → 3.11.2

package/dist/js/main.js

@@ -1333,7 +1333,7 @@
       this.updateTriggerAria(ariaLabel);
     }
     initButtonSelect() {
-      const triggerLabel = this.getSelectedOptionText(this.element);
+      const triggerLabel = this.getSelectedOptionText();
       const button = `<button class="nsw-button nsw-multi-select__button" aria-label="${triggerLabel[1]}" aria-expanded="false" aria-controls="${this.selectId}-dropdown">
       <span aria-hidden="true" class="nsw-multi-select__label">${triggerLabel[0]}</span>
       <span class="material-icons nsw-material-icons" focusable="false" aria-hidden="true">keyboard_arrow_down</span>
@@ -1358,15 +1358,16 @@
       let label = '';
       let ariaLabel = '';
       const count = this.getSelectedOptionCount();
-      if (count === this.options.length) {
+      if (count === this.options.length && this.dropdown) {
         label = `All ${this.textSelected}`;
         ariaLabel = `All ${this.textSelected}`;
       } else if (count > 1) {
         label = `${count} ${this.textSelected}`;
         ariaLabel = `${count} ${this.textSelected}, Please select`;
-      } else if (count > 0) {
-        ariaLabel += `${this.options[0].text}, Please select`;
-        label = this.options[0].text;
+      } else if (count === 1) {
+        const selectedOption = this.getSelectedOption();
+        label = selectedOption.closest('.nsw-multi-select__option').getAttribute('data-label');
+        ariaLabel = `${label}, Please select`;
       } else {
         label = noSelectionText;
         ariaLabel = 'Please select';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nsw-design-system",
-  "version": "3.11.0",
+  "version": "3.11.2",
   "description": "Design system for Digital NSW",
   "main": "dist/main.js",
   "style": "dist/main.css",

package/src/components/select/select.js

@@ -215,7 +215,7 @@ class Select {
   }
 
   initButtonSelect() {
-    const triggerLabel = this.getSelectedOptionText(this.element)
+    const triggerLabel = this.getSelectedOptionText()
 
     const button = `<button class="nsw-button nsw-multi-select__button" aria-label="${triggerLabel[1]}" aria-expanded="false" aria-controls="${this.selectId}-dropdown">
       <span aria-hidden="true" class="nsw-multi-select__label">${triggerLabel[0]}</span>
@@ -246,15 +246,16 @@ class Select {
     let ariaLabel = ''
     const count = this.getSelectedOptionCount()
 
-    if (count === this.options.length) {
+    if (count === this.options.length && this.dropdown) {
       label = `All ${this.textSelected}`
       ariaLabel = `All ${this.textSelected}`
     } else if (count > 1) {
       label = `${count} ${this.textSelected}`
       ariaLabel = `${count} ${this.textSelected}, Please select`
-    } else if (count > 0) {
-      ariaLabel += `${this.options[0].text}, Please select`
-      label = this.options[0].text
+    } else if (count === 1) {
+      const selectedOption = this.getSelectedOption()
+      label = selectedOption.closest('.nsw-multi-select__option').getAttribute('data-label')
+      ariaLabel = `${label}, Please select`
     } else {
       label = noSelectionText
       ariaLabel = 'Please select'