Skip to content

Commit

Permalink
fix(dropdown): getMenuTriggerProps mergeProps (#2450)
Browse files Browse the repository at this point in the history
* fix(dropdown): getMenuTriggerProps mergeProps

* feat(changeset): fixed getMenuTriggerProps mergeProps

* refactor(dropdown): use isDisabled directly

* chore(changeset): correct issue number
  • Loading branch information
wingkwong committed Mar 5, 2024
1 parent f864dc3 commit 0a9982d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .changeset/silly-seas-tie.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/dropdown": patch
---

fixed getMenuTriggerProps mergeProps (#2448)
2 changes: 1 addition & 1 deletion packages/components/dropdown/src/use-dropdown.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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),
};
};
Expand Down

0 comments on commit 0a9982d

Please sign in to comment.