Skip to content

Commit 3709ed5

Browse files
committed
only passthrough the aria-disabled prop when true
Drop the disabled prop itself because doesn't make much sense
1 parent 2747745 commit 3709ed5

File tree

2 files changed

+4
-6
lines changed
  • packages
    • @headlessui-react/src/components/menu
    • @headlessui-vue/src/components/menu

2 files changed

+4
-6
lines changed

packages/@headlessui-react/src/components/menu/menu.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ function Item<TTag extends React.ElementType = typeof DEFAULT_ITEM_TAG>(
524524
const active =
525525
state.activeItemIndex !== null ? state.items[state.activeItemIndex].id === id : false
526526

527-
const bag = React.useRef<MenuItemDataRef['current']>({ disabled: disabled })
527+
const bag = React.useRef<MenuItemDataRef['current']>({ disabled })
528528

529529
useIsoMorphicEffect(() => {
530530
bag.current.disabled = disabled
@@ -584,8 +584,7 @@ function Item<TTag extends React.ElementType = typeof DEFAULT_ITEM_TAG>(
584584
role: 'menuitem',
585585
tabIndex: -1,
586586
className: resolvePropValue(className, propsBag),
587-
disabled: disabled,
588-
'aria-disabled': disabled,
587+
'aria-disabled': disabled === true ? true : undefined,
589588
onClick: handleClick,
590589
onFocus: handleFocus,
591590
onMouseMove: handleMouseMove,

packages/@headlessui-vue/src/components/menu/menu.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ export const MenuItem = defineComponent({
411411
: false
412412
})
413413

414-
const dataRef = ref<MenuItemDataRef['value']>({ disabled: disabled, textValue: '' })
414+
const dataRef = ref<MenuItemDataRef['value']>({ disabled, textValue: '' })
415415
onMounted(() => {
416416
const textValue = document
417417
.getElementById(id)
@@ -462,8 +462,7 @@ export const MenuItem = defineComponent({
462462
role: 'menuitem',
463463
tabIndex: -1,
464464
class: resolvePropValue(className, slot),
465-
disabled: disabled === true ? disabled : undefined,
466-
'aria-disabled': disabled === true ? disabled : undefined,
465+
'aria-disabled': disabled === true ? true : undefined,
467466
onClick: handleClick,
468467
onFocus: handleFocus,
469468
onMouseMove: handleMouseMove,

0 commit comments

Comments
 (0)