Skip to content

Commit ae911bc

Browse files
committed
removes nested ternary expression
1 parent f83e9f2 commit ae911bc

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

src/Menu.tsx

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -399,13 +399,14 @@ const Menu = React.forwardRef<MenuRef, MenuProps>((props, ref) => {
399399
const { elements, key2element, element2key } = refreshElements(keys, uuid);
400400
const focusableElements = getFocusableElements(containerRef.current, elements);
401401

402-
const shouldFocusKey =
403-
mergedActiveKey && keys.includes(mergedActiveKey)
404-
? mergedActiveKey
405-
: focusableElements[0]
406-
? element2key.get(focusableElements[0])
407-
: childList.find(node => !node.props.disabled)?.key;
408-
402+
let shouldFocusKey: string;
403+
if (mergedActiveKey && keys.includes(mergedActiveKey)) {
404+
shouldFocusKey = mergedActiveKey;
405+
} else {
406+
shouldFocusKey = focusableElements[0]
407+
? element2key.get(focusableElements[0])
408+
: childList.find(node => !node.props.disabled)?.key;
409+
}
409410
const elementToFocus = key2element.get(shouldFocusKey);
410411

411412
if (shouldFocusKey && elementToFocus) {

0 commit comments

Comments
 (0)