refactor: create PureStatusReplyMentions component and use it in PureStatus component

merge-requests/3281/merge
P. Reis 2024-12-05 22:21:14 -03:00
rodzic 575fd24ec1
commit 4632cb4964
2 zmienionych plików z 115 dodań i 2 usunięć

Wyświetl plik

@ -0,0 +1,113 @@
import { FormattedList, FormattedMessage } from 'react-intl';
import { Link } from 'react-router-dom';
import { openModal } from 'soapbox/actions/modals.ts';
import HoverRefWrapper from 'soapbox/components/hover-ref-wrapper.tsx';
import HoverStatusWrapper from 'soapbox/components/hover-status-wrapper.tsx';
import { Entities, EntityTypes } from 'soapbox/entity-store/entities.ts';
import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts';
import { shortenNostr } from 'soapbox/utils/nostr.ts';
interface IPureStatusReplyMentions {
status: EntityTypes[Entities.STATUSES];
hoverable?: boolean;
}
const PureStatusReplyMentions: React.FC<IPureStatusReplyMentions> = ({ status, hoverable = true }) => {
const dispatch = useAppDispatch();
const handleOpenMentionsModal: React.MouseEventHandler<HTMLSpanElement> = (e) => {
e.stopPropagation();
const account = status.account;
dispatch(openModal('MENTIONS', {
username: account.acct,
statusId: status.id,
}));
};
if (!status.in_reply_to_id) {
return null;
}
const to = status.mentions;
// The post is a reply, but it has no mentions.
// Rare, but it can happen.
if (to.length === 0) {
return (
<div className='mb-1 text-sm text-gray-700 dark:text-gray-600'>
<FormattedMessage
id='reply_mentions.reply_empty'
defaultMessage='Replying to post'
/>
</div>
);
}
// The typical case with a reply-to and a list of mentions.
const accounts = to.slice(0, 2).map(account => {
const link = (
<Link
key={account.id}
to={`/@${account.acct}`}
className='inline-block max-w-[200px] truncate align-bottom text-primary-600 no-underline hover:text-primary-700 hover:underline dark:text-accent-blue dark:hover:text-accent-blue' style={{ direction: 'ltr' }}
onClick={(e) => e.stopPropagation()}
> {/* eslint-disable-line formatjs/no-literal-string-in-jsx */}
@{shortenNostr(account.username)}
</Link>
);
if (hoverable) {
return (
<HoverRefWrapper key={account.id} accountId={account.id} inline>
{link}
</HoverRefWrapper>
);
} else {
return link;
}
});
if (to.length > 2) {
accounts.push(
<span key='more' className='cursor-pointer hover:underline' role='button' onClick={handleOpenMentionsModal} tabIndex={0}>
<FormattedMessage id='reply_mentions.more' defaultMessage='{count} more' values={{ count: to.length - 2 }} />
</span>,
);
}
return (
<div className='mb-1 text-sm text-gray-700 dark:text-gray-600'>
<FormattedMessage
id='reply_mentions.reply.hoverable'
defaultMessage='<hover>Replying to</hover> {accounts}'
values={{
accounts: <FormattedList type='conjunction' value={accounts} />,
// @ts-ignore wtf?
hover: (children: React.ReactNode) => {
if (hoverable) {
return (
<HoverStatusWrapper statusId={status.in_reply_to_id} inline>
<span
key='hoverstatus'
className='cursor-pointer hover:underline'
role='presentation'
>
{children}
</span>
</HoverStatusWrapper>
);
} else {
return children;
}
},
}}
/>
</div>
);
};
export default PureStatusReplyMentions;

Wyświetl plik

@ -8,6 +8,7 @@ import { Link, useHistory } from 'react-router-dom';
import { openModal } from 'soapbox/actions/modals.ts';
import { unfilterStatus } from 'soapbox/actions/statuses.ts';
import PureStatusReplyMentions from 'soapbox/components/pure-status-reply-mentions.tsx';
import TranslateButton from 'soapbox/components/translate-button.tsx';
import { Card } from 'soapbox/components/ui/card.tsx';
import Icon from 'soapbox/components/ui/icon.tsx';
@ -33,7 +34,6 @@ import EventPreview from './event-preview.tsx';
import StatusActionBar from './status-action-bar.tsx';
import StatusContent from './status-content.tsx';
import StatusMedia from './status-media.tsx';
import StatusReplyMentions from './status-reply-mentions.tsx';
import SensitiveContentOverlay from './statuses/sensitive-content-overlay.tsx';
import StatusInfo from './statuses/status-info.tsx';
import Tombstone from './tombstone.tsx';
@ -451,7 +451,7 @@ const PureStatus: React.FC<IPureStatus> = (props) => {
/>
<div className='status--content-wrapper'>
<StatusReplyMentions status={statusImmutable} hoverable={hoverable} /> {/* fix later */}
<PureStatusReplyMentions status={status} hoverable={hoverable} />
<Stack
className='relative z-0'