#5720 TreeSelect tab fixes

primefaces · Jan 10, 2024 · f993a21 · f993a21
1 parent 1a05a21
commit f993a21
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/components/lib/treeselect/TreeSelect.js b/components/lib/treeselect/TreeSelect.js
@@ -234,7 +234,13 @@ export const TreeSelect = React.memo(
                     break;
 
                 case 'Tab':
-                    onTabKey(event);
+                    if (overlayVisibleState) {
+                        event.preventDefault();
+
+                        if (event.shiftKey) setFocusToFocusableFirstNode();
+                        else onTabKey(event);
+                    }
+
                     break;
 
                 default:
@@ -856,6 +862,7 @@ export const TreeSelect = React.memo(
                     scrollHeight={props.scrollHeight}
                     onClick={onOverlayClick}
                     header={header}
+                    hide={hide}
                     footer={footer}
                     firstHiddenFocusableElementOnOverlay={<span {...firstHiddenFocusableElementOnOverlayProps}></span>}
                     lastHiddenFocusableElementOnOverlay={<span {...lastHiddenFocusableElementOnOverlayProps}></span>}

diff --git a/components/lib/treeselect/TreeSelectPanel.js b/components/lib/treeselect/TreeSelectPanel.js
@@ -15,13 +15,21 @@ export const TreeSelectPanel = React.forwardRef((props, ref) => {
         });
     };
 
+    const onKeyDown = (event) => {
+        if (event.key === 'Escape') {
+            event.preventDefault();
+            props.hide();
+        }
+    };
+
     const createElement = () => {
         const wrapperStyle = { maxHeight: props.scrollHeight || 'auto' };
 
         const panelProps = mergeProps(
             {
                 className: cx('panel', { panelProps: props, context }),
                 style: props.panelStyle,
+                onKeyDown: onKeyDown,
                 onClick: props.onClick
             },
             getPTOptions('panel')