Skip to content

Commit f83e9f2

Browse files
committed
fixes issue with keyboard not working after focused menu item is removed
1 parent c1b586d commit f83e9f2

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

src/Menu.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -400,10 +400,11 @@ const Menu = React.forwardRef<MenuRef, MenuProps>((props, ref) => {
400400
const focusableElements = getFocusableElements(containerRef.current, elements);
401401

402402
const shouldFocusKey =
403-
mergedActiveKey ??
404-
(focusableElements[0]
405-
? element2key.get(focusableElements[0])
406-
: childList.find(node => !node.props.disabled)?.key);
403+
mergedActiveKey && keys.includes(mergedActiveKey)
404+
? mergedActiveKey
405+
: focusableElements[0]
406+
? element2key.get(focusableElements[0])
407+
: childList.find(node => !node.props.disabled)?.key;
407408

408409
const elementToFocus = key2element.get(shouldFocusKey);
409410

0 commit comments

Comments
 (0)