From f7c66c28905c4e050856391854fbd616cbc953f4 Mon Sep 17 00:00:00 2001 From: Jeongjin Oh Date: Thu, 10 Oct 2024 06:28:18 +0900 Subject: [PATCH 1/2] fix: select disabled when fieldset have disabled attr --- packages/react/select/src/Select.tsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/react/select/src/Select.tsx b/packages/react/select/src/Select.tsx index 5e848d8caf..7b885efd05 100644 --- a/packages/react/select/src/Select.tsx +++ b/packages/react/select/src/Select.tsx @@ -288,10 +288,18 @@ const SelectTrigger = React.forwardRef target.releasePointerCapture(event.pointerId); } + const fieldset = target.closest('fieldset'); + const fieldsetDisabled = fieldset ? fieldset.disabled : false; + // only call handler if it's the left button (mousedown gets triggered by all mouse buttons) // but not when the control key is pressed (avoiding MacOS right click); also not for touch // devices because that would open the menu on scroll. (pen devices behave as touch on iOS). - if (event.button === 0 && event.ctrlKey === false && event.pointerType === 'mouse') { + if ( + event.button === 0 && + event.ctrlKey === false && + event.pointerType === 'mouse' && + !fieldsetDisabled + ) { handleOpen(event); // prevent trigger from stealing focus from the active item after opening. event.preventDefault(); From ff4288274bbfeca8ba11d1c7db5777e82787cef8 Mon Sep 17 00:00:00 2001 From: Jeongjin Oh Date: Thu, 10 Oct 2024 14:21:07 +0900 Subject: [PATCH 2/2] add version bump --- .yarn/versions/a4fe86bf.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .yarn/versions/a4fe86bf.yml diff --git a/.yarn/versions/a4fe86bf.yml b/.yarn/versions/a4fe86bf.yml new file mode 100644 index 0000000000..5179392316 --- /dev/null +++ b/.yarn/versions/a4fe86bf.yml @@ -0,0 +1,5 @@ +releases: + "@radix-ui/react-select": patch + +declined: + - primitives