Skip to content

Commit 271d1d6

Browse files
committed
Passing tests
1 parent bd444d3 commit 271d1d6

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ function focusFirstItem(details: Element) {
147147
}
148148

149149
function sibling(details: Element, next: boolean): HTMLElement | null {
150-
const options = Array.from(details.querySelectorAll<HTMLElement>('[role^="menuitem"]:not([hidden])'))
150+
const options = Array.from(details.querySelectorAll<HTMLElement>('[role^="menuitem"]:not([hidden]):not([disabled])'))
151151
const selected = document.activeElement
152152
const index = selected instanceof HTMLElement ? options.indexOf(selected) : -1
153153
const found = next ? options[index + 1] : options[index - 1]

test/test.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ describe('details-menu element', function () {
9090
summary.dispatchEvent(new KeyboardEvent('keydown', {key: 'ArrowUp', bubbles: true}))
9191
assert(details.open, 'menu is open')
9292

93-
const last = [...details.querySelectorAll('[role="menuitem"]:not([disabled]):not([aria-disabled])')].pop()
93+
const last = [...details.querySelectorAll('[role="menuitem"]:not([disabled])')].pop()
9494
assert.equal(last, document.activeElement, 'arrow focuses last item')
9595
})
9696

@@ -219,7 +219,7 @@ describe('details-menu element', function () {
219219
summary.dispatchEvent(new MouseEvent('click', {bubbles: true}))
220220
details.dispatchEvent(new KeyboardEvent('keydown', {key: 'ArrowUp', bubbles: true}))
221221

222-
const notDisabled = details.querySelectorAll('[role="menuitem"]')[2]
222+
const notDisabled = details.querySelectorAll('[role="menuitem"]')[3]
223223
assert.equal(notDisabled, document.activeElement, 'arrow focuses on the last non-disabled item')
224224

225225
const disabled = details.querySelector('[aria-disabled="true"]')
@@ -423,7 +423,6 @@ describe('details-menu element', function () {
423423
<details>
424424
<summary>Click</summary>
425425
<details-menu>
426-
<button type="button" role="menuitem" aria-disabled="true">Hubot</button>
427426
<button type="button" role="menuitem" disabled>Bender</button>
428427
</details-menu>
429428
</details>

0 commit comments

Comments
 (0)