Skip to content

Commit 1cd1298

Browse files
committed
Avoid menuitem checks with early return.
1 parent 8da4419 commit 1cd1298

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/index.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,16 @@ function shouldCommit(details: Element, menu: DetailsMenuElement, event: Event)
174174

175175
if (event.type === 'click') {
176176
const menuitem = target.closest('[role="menuitem"], [role="menuitemradio"]')
177+
if (!menuitem) return
177178

178179
// Ignore double event caused by inputs nested in labels
179-
if (menuitem?.tagName === 'LABEL' && target !== menuitem) return
180+
if (menuitem.tagName === 'LABEL' && target !== menuitem) return
180181

181-
const input = menuitem?.querySelector('input')
182+
const input = menuitem.querySelector('input')
182183
// An input inside a label will be committed as a change event (we assume it's a radio input),
183184
// unless the input is already checked, so we need to commit on click (to close the popup)
184-
const onlyCommitOnChangeEvent = menuitem?.tagName === 'LABEL' && input && !input.checked
185-
if (menuitem && !onlyCommitOnChangeEvent) {
185+
const onlyCommitOnChangeEvent = menuitem.tagName === 'LABEL' && input && !input.checked
186+
if (!onlyCommitOnChangeEvent) {
186187
commit(menuitem, details)
187188
}
188189
} else if (event.type === 'change') {

0 commit comments

Comments
 (0)