Fix #1413/#5836: Dropdown ScreenReader support (#5991)

primefaces · Feb 16, 2024 · f7dc3b1 · f7dc3b1
1 parent 9cc3b35
commit f7dc3b1
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/components/lib/dropdown/Dropdown.js b/components/lib/dropdown/Dropdown.js
@@ -840,6 +840,11 @@ export const Dropdown = React.memo(
         const updateEditableLabel = (option) => {
             if (inputRef.current) {
                 inputRef.current.value = option ? getOptionLabel(option) : props.value || '';
+
+                // #1413 NVDA screenreader
+                if (focusInputRef.current) {
+                    focusInputRef.current.value = inputRef.current.value;
+                }
             }
         };
 
@@ -885,6 +890,11 @@ export const Dropdown = React.memo(
                 const value = label || props.value || '';
 
                 inputRef.current.value = value;
+
+                // #1413 NVDA screenreader
+                if (focusInputRef.current) {
+                    focusInputRef.current.value = value;
+                }
             }
         };
 
@@ -996,6 +1006,12 @@ export const Dropdown = React.memo(
         };
 
         const createKeyboardHelper = () => {
+            let value = ObjectUtils.isNotEmpty(selectedOption) ? getOptionLabel(selectedOption) : null;
+
+            if (props.editable) {
+                value = value || props.value || '';
+            }
+
             const hiddenSelectedMessageProps = mergeProps(
                 {
                     className: 'p-hidden-accessible'
@@ -1007,6 +1023,7 @@ export const Dropdown = React.memo(
                 {
                     ref: focusInputRef,
                     id: props.inputId,
+                    defaultValue: value,
                     type: 'text',
                     readOnly: true,
                     'aria-haspopup': 'listbox',