diff --git a/packages/web/components/elements/DropdownElements.tsx b/packages/web/components/elements/DropdownElements.tsx index 853bc71bc..61dfeaac2 100644 --- a/packages/web/components/elements/DropdownElements.tsx +++ b/packages/web/components/elements/DropdownElements.tsx @@ -8,6 +8,7 @@ import { Arrow, Label, } from '@radix-ui/react-dropdown-menu' +import { PopperContentProps } from '@radix-ui/react-popover'; import { CSS } from '@stitches/react'; import { styled } from './../tokens/stitches.config' @@ -104,18 +105,19 @@ export function DropdownOption(props: DropdownOptionProps): JSX.Element { ) } -export function Dropdown({ - children, - align, - triggerElement, - labelText, - showArrow = true, - disabled = false, - side = 'bottom', - sideOffset = 0, - css -}: DropdownProps): JSX.Element { - console.log('side', side) +export function Dropdown(props: DropdownProps & PopperContentProps): JSX.Element { + const { + children, + align, + triggerElement, + labelText, + showArrow = true, + disabled = false, + side = 'bottom', + sideOffset = 0, + alignOffset = 0, + css + } = props return ( {triggerElement} @@ -128,6 +130,7 @@ export function Dropdown({ side={side} sideOffset={sideOffset} align={align ? align : 'center'} + alignOffset={alignOffset} > {labelText && {labelText}} {children} diff --git a/packages/web/components/templates/article/ArticleActionsMenu.tsx b/packages/web/components/templates/article/ArticleActionsMenu.tsx index 72e5417e2..a97a4370d 100644 --- a/packages/web/components/templates/article/ArticleActionsMenu.tsx +++ b/packages/web/components/templates/article/ArticleActionsMenu.tsx @@ -19,7 +19,7 @@ type MenuSeparatorProps = { layout: ArticleActionsMenuLayout } -export function MenuSeparator(props: MenuSeparatorProps) { +const MenuSeparator = (props: MenuSeparatorProps): JSX.Element => { const LineSeparator = styled(Separator, { width: '100%', margin: 0, @@ -29,6 +29,26 @@ export function MenuSeparator(props: MenuSeparatorProps) { return (props.layout == 'vertical' ? : <>) } +type ActionDropdownProps = { + layout: ArticleActionsMenuLayout + triggerElement: JSX.Element + children: JSX.Element +} + +const ActionDropdown = (props: ActionDropdownProps): JSX.Element => { + return + {props.children} + +} + export function ArticleActionsMenu(props: ArticleActionsMenuProps): JSX.Element { const { preferencesData } = useGetUserPreferences() @@ -47,38 +67,29 @@ export function ArticleActionsMenu(props: ArticleActionsMenuProps): JSX.Element m: '0px', }} > - } - css={{ m: '0px', p: '0px' }} > - + - } - css={{ m: '0px', p: '0px' }} > - {/* */} - + - {/* - {}} /> + { + console.log('changed line spacing') + }} /> - */} + ) }