From 3540d24eddd04f461a720a5dbe0cb144f87106a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D5=A1=C9=A8=D5=BC=C9=A2=D3=84=D5=A1=D6=85=D5=BC=C9=A2?= Date: Tue, 5 Mar 2024 18:59:05 +0800 Subject: [PATCH 1/4] fix(dropdown): getMenuTriggerProps mergeProps --- packages/components/dropdown/src/use-dropdown.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/dropdown/src/use-dropdown.ts b/packages/components/dropdown/src/use-dropdown.ts index 8040b72cb7..575123cec1 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: !!props?.isDisabled}, originalProps), ref: mergeRefs(_ref, triggerRef), }; }; From 0720330a457fdc8699e42bf286f4a66df22c29f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D5=A1=C9=A8=D5=BC=C9=A2=D3=84=D5=A1=D6=85=D5=BC=C9=A2?= Date: Tue, 5 Mar 2024 19:00:35 +0800 Subject: [PATCH 2/4] feat(changeset): fixed getMenuTriggerProps mergeProps --- .changeset/silly-seas-tie.md | 5 +++++ 1 file changed, 5 insertions(+) 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 0000000000..213b5f7084 --- /dev/null +++ b/.changeset/silly-seas-tie.md @@ -0,0 +1,5 @@ +--- +"@nextui-org/dropdown": patch +--- + +fixed getMenuTriggerProps mergeProps (#2450) From 5d3b8417e745b8946dda887f674841bc0434182d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D5=A1=C9=A8=D5=BC=C9=A2=D3=84=D5=A1=D6=85=D5=BC=C9=A2?= Date: Tue, 5 Mar 2024 19:03:23 +0800 Subject: [PATCH 3/4] refactor(dropdown): use isDisabled directly --- packages/components/dropdown/src/use-dropdown.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/dropdown/src/use-dropdown.ts b/packages/components/dropdown/src/use-dropdown.ts index 575123cec1..d71afed1d1 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), }; }; From bb8a863dec47ff3464c9a482d1a251421deb107f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D5=A1=C9=A8=D5=BC=C9=A2=D3=84=D5=A1=D6=85=D5=BC=C9=A2?= Date: Tue, 5 Mar 2024 19:04:11 +0800 Subject: [PATCH 4/4] chore(changeset): correct issue number --- .changeset/silly-seas-tie.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/silly-seas-tie.md b/.changeset/silly-seas-tie.md index 213b5f7084..e917acdd43 100644 --- a/.changeset/silly-seas-tie.md +++ b/.changeset/silly-seas-tie.md @@ -2,4 +2,4 @@ "@nextui-org/dropdown": patch --- -fixed getMenuTriggerProps mergeProps (#2450) +fixed getMenuTriggerProps mergeProps (#2448)