moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EmbeddedStatus: add SiteLogo

This commit is contained in:
Alex Gleason 2022-08-21 14:47:23 -04:00
parent 9ca87c1eec
commit c013dcf01b
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/soapbox/components/status.tsx
View File

@ -49,6 +49,7 @@ export interface IStatus {
hoverable?: boolean, hoverable?: boolean,
variant?: 'default' | 'rounded', variant?: 'default' | 'rounded',
withDismiss?: boolean, withDismiss?: boolean,
accountAction?: React.ReactElement,
} }
const Status: React.FC<IStatus> = (props) => { const Status: React.FC<IStatus> = (props) => {
@ -68,6 +69,7 @@ const Status: React.FC<IStatus> = (props) => {
variant = 'rounded', variant = 'rounded',
withDismiss, withDismiss,
} = props; } = props;
const intl = useIntl(); const intl = useIntl();
const history = useHistory(); const history = useHistory();
const dispatch = useAppDispatch(); const dispatch = useAppDispatch();
@ -295,6 +297,8 @@ const Status: React.FC<IStatus> = (props) => {
const statusUrl = `/@${actualStatus.getIn(['account', 'acct'])}/posts/${actualStatus.id}`; const statusUrl = `/@${actualStatus.getIn(['account', 'acct'])}/posts/${actualStatus.id}`;
const accountAction = props.accountAction || reblogElement;
return ( return (
<HotKeys handlers={handlers} data-testid='status'> <HotKeys handlers={handlers} data-testid='status'>
<div <div
@ -335,8 +339,8 @@ const Status: React.FC<IStatus> = (props) => {
id={String(actualStatus.getIn(['account', 'id']))} id={String(actualStatus.getIn(['account', 'id']))}
timestamp={actualStatus.created_at} timestamp={actualStatus.created_at}
timestampUrl={statusUrl} timestampUrl={statusUrl}
action={reblogElement} action={accountAction}
hideActions={!reblogElement} hideActions={!accountAction}
showEdit={!!actualStatus.edited_at} showEdit={!!actualStatus.edited_at}
showProfileHoverCard={hoverable} showProfileHoverCard={hoverable}
withLinkToProfile={hoverable} withLinkToProfile={hoverable}

9
app/soapbox/features/embedded-status/index.tsx
View File

@ -3,6 +3,7 @@ import { useHistory } from 'react-router-dom';
import { fetchStatus } from 'soapbox/actions/statuses'; import { fetchStatus } from 'soapbox/actions/statuses';
import MissingIndicator from 'soapbox/components/missing_indicator'; import MissingIndicator from 'soapbox/components/missing_indicator';
import SiteLogo from 'soapbox/components/site-logo';
import Status from 'soapbox/components/status'; import Status from 'soapbox/components/status';
import { Spinner } from 'soapbox/components/ui'; import { Spinner } from 'soapbox/components/ui';
import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
@ -43,11 +44,17 @@ const EmbeddedStatus: React.FC<IEmbeddedStatus> = ({ params }) => {
}, '*'); }, '*');
}, [status, loading]); }, [status, loading]);
const logo = (
<div className='flex align-middle justify-center ml-4'>
<SiteLogo className='h-10' />
</div>
);
const renderInner = () => { const renderInner = () => {
if (loading) { if (loading) {
return <Spinner />; return <Spinner />;
} else if (status) { } else if (status) {
return <Status status={status} variant='default' />; return <Status status={status} accountAction={logo} variant='default' />;
} else { } else {
return <MissingIndicator nested />; return <MissingIndicator nested />;
} }