Fixed #3512 - DropdownMenu: Disabled dropdown can still be opened wit…

…h screen reader
primefaces · Jan 11, 2023 · df3f1ca · df3f1ca
1 parent c3c3edc
commit df3f1ca
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 0 deletions.
diff --git a/components/autocomplete/AutoComplete.vue b/components/autocomplete/AutoComplete.vue
@@ -407,6 +407,11 @@ export default {
             }, 0); // For ScreenReaders
         },
         onFocus(event) {
+            if (this.disabled) {
+                // For ScreenReaders
+                return;
+            }
+
             if (!this.dirty && this.completeOnFocus) {
                 this.search(event, event.target.value, 'focus');
             }
@@ -424,6 +429,12 @@ export default {
             this.$emit('blur', event);
         },
         onKeyDown(event) {
+            if (this.disabled) {
+                event.preventDefault();
+
+                return;
+            }
+
             switch (event.code) {
                 case 'ArrowDown':
                     this.onArrowDownKey(event);
@@ -529,13 +540,24 @@ export default {
             }
         },
         onMultipleContainerFocus() {
+            if (this.disabled) {
+                // For ScreenReaders
+                return;
+            }
+
             this.focused = true;
         },
         onMultipleContainerBlur() {
             this.focusedMultipleOptionIndex = -1;
             this.focused = false;
         },
         onMultipleContainerKeyDown(event) {
+            if (this.disabled) {
+                event.preventDefault();
+
+                return;
+            }
+
             switch (event.code) {
                 case 'ArrowLeft':
                     this.onArrowLeftKeyOnMultiple(event);

diff --git a/components/cascadeselect/CascadeSelect.vue b/components/cascadeselect/CascadeSelect.vue
@@ -278,6 +278,11 @@ export default {
             }, 0); // For ScreenReaders
         },
         onFocus(event) {
+            if (this.disabled) {
+                // For ScreenReaders
+                return;
+            }
+
             this.focused = true;
             this.$emit('focus', event);
         },

diff --git a/components/dropdown/Dropdown.vue b/components/dropdown/Dropdown.vue
@@ -397,6 +397,11 @@ export default {
             }, 0); // For ScreenReaders
         },
         onFocus(event) {
+            if (this.disabled) {
+                // For ScreenReaders
+                return;
+            }
+
             this.focused = true;
             this.focusedOptionIndex = this.focusedOptionIndex !== -1 ? this.focusedOptionIndex : this.overlayVisible && this.autoOptionFocus ? this.findFirstFocusedOptionIndex() : -1;
             this.overlayVisible && this.scrollInView(this.focusedOptionIndex);
@@ -409,6 +414,12 @@ export default {
             this.$emit('blur', event);
         },
         onKeyDown(event) {
+            if (this.disabled) {
+                event.preventDefault();
+
+                return;
+            }
+
             const metaKey = event.metaKey || event.ctrlKey;
 
             switch (event.code) {

diff --git a/components/multiselect/MultiSelect.vue b/components/multiselect/MultiSelect.vue
@@ -412,6 +412,11 @@ export default {
             }, 0); // For ScreenReaders
         },
         onFocus(event) {
+            if (this.disabled) {
+                // For ScreenReaders
+                return;
+            }
+
             this.focused = true;
             this.focusedOptionIndex = this.focusedOptionIndex !== -1 ? this.focusedOptionIndex : this.overlayVisible && this.autoOptionFocus ? this.findFirstFocusedOptionIndex() : -1;
             this.overlayVisible && this.scrollInView(this.focusedOptionIndex);
@@ -424,6 +429,12 @@ export default {
             this.$emit('blur', event);
         },
         onKeyDown(event) {
+            if (this.disabled) {
+                event.preventDefault();
+
+                return;
+            }
+
             const metaKey = event.metaKey || event.ctrlKey;
 
             switch (event.code) {