From 0a9982d3efe6ac8dfc25438f21598c8fe53de4db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D5=A1=D3=84=D5=A1?= Date: Tue, 5 Mar 2024 19:58:01 +0800 Subject: [PATCH] fix(dropdown): getMenuTriggerProps mergeProps (#2450) * fix(dropdown): getMenuTriggerProps mergeProps * feat(changeset): fixed getMenuTriggerProps mergeProps * refactor(dropdown): use isDisabled directly * chore(changeset): correct issue number --- .changeset/silly-seas-tie.md | 5 +++++ packages/components/dropdown/src/use-dropdown.ts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/silly-seas-tie.md diff --git a/.changeset/silly-seas-tie.md b/.changeset/silly-seas-tie.md new file mode 100644 index 000000000..e917acdd4 --- /dev/null +++ b/.changeset/silly-seas-tie.md @@ -0,0 +1,5 @@ +--- +"@nextui-org/dropdown": patch +--- + +fixed getMenuTriggerProps mergeProps (#2448) diff --git a/packages/components/dropdown/src/use-dropdown.ts b/packages/components/dropdown/src/use-dropdown.ts index 8040b72cb..d71afed1d 100644 --- a/packages/components/dropdown/src/use-dropdown.ts +++ b/packages/components/dropdown/src/use-dropdown.ts @@ -127,7 +127,7 @@ export function useDropdown(props: UseDropdownProps) { const {onKeyDown, onPress, onPressStart, ...otherMenuTriggerProps} = menuTriggerProps; return { - ...mergeProps(otherMenuTriggerProps, {isDisabled: props.isDisabled, originalProps}), + ...mergeProps(otherMenuTriggerProps, {isDisabled}, originalProps), ref: mergeRefs(_ref, triggerRef), }; };