Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions src/hooks/utils/__tests__/getHighlightedIndexOnOpen.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -186,3 +186,33 @@ test('returns -1 when no conditions match', () => {
),
).toBe(-1)
})

test('returns -1 when defaultHighlightedIndex is -1, even when selectedItem is set', () => {
expect(
getHighlightedIndexOnOpen(
items,
undefined,
-1,
isItemDisabled,
itemToKey,
'b',
-1,
1,
),
).toBe(-1)
})

test('returns -1 when initialHighlightedIndex is -1 and highlightedIndex matches', () => {
expect(
getHighlightedIndexOnOpen(
items,
-1,
undefined,
isItemDisabled,
itemToKey,
'b',
-1,
1,
),
).toBe(-1)
})
9 changes: 5 additions & 4 deletions src/hooks/utils/getHighlightedIndexOnOpen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,17 @@ export function getHighlightedIndexOnOpen<Item>(
if (
initialHighlightedIndex !== undefined &&
highlightedIndex === initialHighlightedIndex &&
items[initialHighlightedIndex] &&
!isItemDisabled(items[initialHighlightedIndex], initialHighlightedIndex)
(items[initialHighlightedIndex] === undefined ||
!isItemDisabled(items[initialHighlightedIndex], initialHighlightedIndex))
) {
return initialHighlightedIndex
}

if (
defaultHighlightedIndex !== undefined &&
items[defaultHighlightedIndex] &&
!isItemDisabled(items[defaultHighlightedIndex], defaultHighlightedIndex)
(defaultHighlightedIndex === -1 ||
items[defaultHighlightedIndex] === undefined ||
!isItemDisabled(items[defaultHighlightedIndex], defaultHighlightedIndex))
) {
return defaultHighlightedIndex
}
Comment thread
silviuaavram marked this conversation as resolved.
Expand Down
Loading