diff --git a/.yarn/versions/780ba100.yml b/.yarn/versions/780ba100.yml new file mode 100644 index 000000000..d1dcf7110 --- /dev/null +++ b/.yarn/versions/780ba100.yml @@ -0,0 +1,4 @@ +releases: + "@radix-ui/react-context-menu": patch + "@radix-ui/react-dropdown-menu": patch + "@radix-ui/react-menubar": patch 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, }} /> ); 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, }} /> ); 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 );