Skip to content

Commit ee2a828

Browse files
authored
fix(hooks): return boolean for aria-selected (#1603)
1 parent 4bf894b commit ee2a828

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

src/hooks/useCombobox/__tests__/getItemProps.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ describe('getItemProps', () => {
4949
const {result} = renderUseCombobox({highlightedIndex: 2})
5050
const itemProps = result.current.getItemProps({index: 2})
5151

52-
expect(itemProps['aria-selected']).toEqual('true')
52+
expect(itemProps['aria-selected']).toEqual(true)
5353
})
5454

5555
test("assign 'false' to aria-selected if item is not highlighted", () => {
5656
const {result} = renderUseCombobox({highlightedIndex: 1})
5757
const itemProps = result.current.getItemProps({index: 2})
5858

59-
expect(itemProps['aria-selected']).toEqual('false')
59+
expect(itemProps['aria-selected']).toEqual(false)
6060
})
6161

6262
test("click handler is not called if it's disabled", () => {

src/hooks/useCombobox/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ function useCombobox(userProps = {}) {
321321
}
322322
}),
323323
'aria-disabled': disabled,
324-
'aria-selected': `${index === latestState.highlightedIndex}`,
324+
'aria-selected': index === latestState.highlightedIndex,
325325
id: elementIds.getItemId(index),
326326
role: 'option',
327327
...(!disabled && {

src/hooks/useSelect/__tests__/getItemProps.test.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ describe('getItemProps', () => {
5353
const item2Props = result.current.getItemProps({index: 2})
5454
const item3Props = result.current.getItemProps({index: 3})
5555

56-
expect(item2Props['aria-selected']).toEqual('false')
57-
expect(item3Props['aria-selected']).toEqual('true')
56+
expect(item2Props['aria-selected']).toEqual(false)
57+
expect(item3Props['aria-selected']).toEqual(true)
5858
})
5959

6060
test("assign 'false' to aria-selected if item is not highlighted", () => {
6161
const {result} = renderUseSelect({highlightedIndex: 1})
6262
const itemProps = result.current.getItemProps({index: 2})
6363

64-
expect(itemProps['aria-selected']).toEqual('false')
64+
expect(itemProps['aria-selected']).toEqual(false)
6565
})
6666

6767
test('omit click handler when disabled', () => {

src/hooks/useSelect/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ function useSelect(userProps = {}) {
467467
}
468468
}),
469469
'aria-disabled': disabled,
470-
'aria-selected': `${item === latestState.selectedItem}`,
470+
'aria-selected': item === latestState.selectedItem,
471471
id: elementIds.getItemId(index),
472472
role: 'option',
473473
...rest,

src/hooks/useSelect/testUtils.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export function DropdownSelect({renderSpy, renderItem, ...props}) {
8888
<li
8989
data-testid={dataTestIds.item(index)}
9090
key={`${stringItem}${index}`}
91-
{...getItemProps({item, index, disabled: item.disabled})}
91+
{...getItemProps({item, index})}
9292
>
9393
{stringItem}
9494
</li>

0 commit comments

Comments
 (0)