bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix links in actions modal

Browse source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak 2024-05-05 12:19:55 +02:00
parent 2fc245f871
commit 2c433c15e1
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/ui/hstack/hstack.tsx
View file

@ -41,7 +41,7 @@ interface IHStack extends Pick<React.HTMLAttributes<HTMLDivElement>, 'children'
/** Whether to let the flexbox grow. */
grow?: boolean;
/** HTML element to use for container. */
element?: keyof JSX.IntrinsicElements;
element?: React.ComponentType | keyof JSX.IntrinsicElements;
/** Whether to let the flexbox wrap onto multiple lines. */
wrap?: boolean;
}

2
src/components/ui/stack/stack.tsx
View file

@ -39,7 +39,7 @@ interface IStack extends React.HTMLAttributes<HTMLDivElement> {
/** Whether to let the flexbox grow. */
grow?: boolean;
/** HTML element to use for container. */
element?: keyof JSX.IntrinsicElements;
element?: React.ComponentType | keyof JSX.IntrinsicElements;
}
/** Vertical stack of child elements. */

9
src/features/ui/components/modals/actions-modal.tsx
View file

@ -2,6 +2,7 @@ import clsx from 'clsx';
import React from 'react';
import { FormattedMessage } from 'react-intl';
import { spring } from 'react-motion';
import { Link } from 'react-router-dom';
import Icon from 'soapbox/components/icon';
import { HStack } from 'soapbox/components/ui';
@ -25,15 +26,15 @@ const ActionsModal: React.FC<IActionsModal> = ({ status, actions, onClick, onClo
return <li key={`sep-${i}`} className='m-2 block h-[1px] bg-gray-200 black:bg-gray-800 dark:bg-gray-600' />;
}
const { icon = null, text, meta = null, href = '#', destructive } = action;
const { icon = null, text, meta = null, href = '#', to, destructive } = action;
const Comp = href === '#' ? 'button' : 'a';
const compProps = href === '#' ? { onClick: onClick } : { href: href, rel: 'noopener' };
const Comp = href === '#' ? to ? Link : 'button' : 'a';
const compProps = href === '#' ? to ? { to, onClick } : { onClick } : { href: href, rel: 'noopener' };
return (
<li key={`${text}-${i}`}>
<HStack
{...compProps}
{...compProps as any}
space={2.5}
data-index={i}
className={clsx(