From 89c01fd88f4558b5406610a91c66f334110368f1 Mon Sep 17 00:00:00 2001 From: seongminn Date: Sat, 28 Dec 2024 19:45:32 +0900 Subject: [PATCH 1/6] feat(ContextMenu): re-order style prop --- packages/react/context-menu/src/ContextMenu.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/context-menu/src/ContextMenu.tsx b/packages/react/context-menu/src/ContextMenu.tsx index a1d252114..6a1bafa34 100644 --- a/packages/react/context-menu/src/ContextMenu.tsx +++ b/packages/react/context-menu/src/ContextMenu.tsx @@ -504,7 +504,6 @@ const ContextMenuSubContent = React.forwardRef< {...subContentProps} ref={forwardedRef} style={{ - ...props.style, // re-namespace exposed content custom properties ...{ '--radix-context-menu-content-transform-origin': 'var(--radix-popper-transform-origin)', @@ -513,6 +512,7 @@ const ContextMenuSubContent = React.forwardRef< '--radix-context-menu-trigger-width': 'var(--radix-popper-anchor-width)', '--radix-context-menu-trigger-height': 'var(--radix-popper-anchor-height)', }, + ...props.style, }} /> ); From 8a481748bb8a799e672df3310d2f71d2501a1d91 Mon Sep 17 00:00:00 2001 From: seongminn Date: Sat, 28 Dec 2024 19:46:29 +0900 Subject: [PATCH 2/6] chore: version check for context-menu --- .yarn/versions/780ba100.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .yarn/versions/780ba100.yml diff --git a/.yarn/versions/780ba100.yml b/.yarn/versions/780ba100.yml new file mode 100644 index 000000000..64ee217ad --- /dev/null +++ b/.yarn/versions/780ba100.yml @@ -0,0 +1,2 @@ +releases: + "@radix-ui/react-context-menu": patch From fbadb8f0b9ac852b0851f8160090c6e2c214ae53 Mon Sep 17 00:00:00 2001 From: seongminn Date: Sat, 28 Dec 2024 19:46:43 +0900 Subject: [PATCH 3/6] feat(DropdownMenu): re-order style prop --- packages/react/dropdown-menu/src/DropdownMenu.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react/dropdown-menu/src/DropdownMenu.tsx b/packages/react/dropdown-menu/src/DropdownMenu.tsx index 98e855390..dddd6a4bf 100644 --- a/packages/react/dropdown-menu/src/DropdownMenu.tsx +++ b/packages/react/dropdown-menu/src/DropdownMenu.tsx @@ -195,7 +195,6 @@ const DropdownMenuContent = React.forwardRef ); @@ -472,7 +472,6 @@ const DropdownMenuSubContent = React.forwardRef< {...subContentProps} ref={forwardedRef} style={{ - ...props.style, // re-namespace exposed content custom properties ...{ '--radix-dropdown-menu-content-transform-origin': 'var(--radix-popper-transform-origin)', @@ -481,6 +480,7 @@ const DropdownMenuSubContent = React.forwardRef< '--radix-dropdown-menu-trigger-width': 'var(--radix-popper-anchor-width)', '--radix-dropdown-menu-trigger-height': 'var(--radix-popper-anchor-height)', }, + ...props.style, }} /> ); From e906034eb10d44529690767bd1aea14f0a73e892 Mon Sep 17 00:00:00 2001 From: seongminn Date: Sat, 28 Dec 2024 19:46:57 +0900 Subject: [PATCH 4/6] chore: version check for dropdown-menu --- .yarn/versions/780ba100.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.yarn/versions/780ba100.yml b/.yarn/versions/780ba100.yml index 64ee217ad..d8da874b5 100644 --- a/.yarn/versions/780ba100.yml +++ b/.yarn/versions/780ba100.yml @@ -1,2 +1,3 @@ releases: "@radix-ui/react-context-menu": patch + "@radix-ui/react-dropdown-menu": patch From 148c7834f9e8c404d906a8a9d2cb5059208e1f3e Mon Sep 17 00:00:00 2001 From: seongminn Date: Sat, 28 Dec 2024 19:47:09 +0900 Subject: [PATCH 5/6] feat(Menubar): re-order style prop --- packages/react/menubar/src/Menubar.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react/menubar/src/Menubar.tsx b/packages/react/menubar/src/Menubar.tsx index eddb18ae5..f5de6ca8b 100644 --- a/packages/react/menubar/src/Menubar.tsx +++ b/packages/react/menubar/src/Menubar.tsx @@ -380,7 +380,6 @@ const MenubarContent = React.forwardRef ); @@ -658,7 +658,6 @@ const MenubarSubContent = React.forwardRef ); From ccb756c0b774c793145d842226829b2013afb9ae Mon Sep 17 00:00:00 2001 From: seongminn Date: Sat, 28 Dec 2024 19:47:20 +0900 Subject: [PATCH 6/6] chore: version check for menubar --- .yarn/versions/780ba100.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.yarn/versions/780ba100.yml b/.yarn/versions/780ba100.yml index d8da874b5..d1dcf7110 100644 --- a/.yarn/versions/780ba100.yml +++ b/.yarn/versions/780ba100.yml @@ -1,3 +1,4 @@ releases: "@radix-ui/react-context-menu": patch "@radix-ui/react-dropdown-menu": patch + "@radix-ui/react-menubar": patch