sforkowany z mirror/soapbox
Default header should not be clickable
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>theme-editor-hsl
rodzic
90513f1807
commit
761061c9a8
|
@ -21,6 +21,7 @@ import StillImage from 'soapbox/components/still-image';
|
||||||
import { Avatar, HStack, IconButton, Menu, MenuButton, MenuDivider, MenuItem, MenuLink, MenuList } from 'soapbox/components/ui';
|
import { Avatar, HStack, IconButton, Menu, MenuButton, MenuDivider, MenuItem, MenuLink, MenuList } from 'soapbox/components/ui';
|
||||||
import SvgIcon from 'soapbox/components/ui/icon/svg-icon';
|
import SvgIcon from 'soapbox/components/ui/icon/svg-icon';
|
||||||
import MovedNote from 'soapbox/features/account-timeline/components/moved-note';
|
import MovedNote from 'soapbox/features/account-timeline/components/moved-note';
|
||||||
|
import { isDefaultHeader } from 'soapbox/features/onboarding/steps/cover-photo-selection-step';
|
||||||
import ActionButton from 'soapbox/features/ui/components/action-button';
|
import ActionButton from 'soapbox/features/ui/components/action-button';
|
||||||
import SubscriptionButton from 'soapbox/features/ui/components/subscription-button';
|
import SubscriptionButton from 'soapbox/features/ui/components/subscription-button';
|
||||||
import { useAppDispatch, useFeatures, useOwnAccount } from 'soapbox/hooks';
|
import { useAppDispatch, useFeatures, useOwnAccount } from 'soapbox/hooks';
|
||||||
|
@ -502,6 +503,29 @@ const Header: React.FC<IHeader> = ({ account }) => {
|
||||||
return info;
|
return info;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const renderHeader = () => {
|
||||||
|
let header: React.ReactNode;
|
||||||
|
|
||||||
|
if (account.header) {
|
||||||
|
header = (
|
||||||
|
<StillImage
|
||||||
|
src={account.header}
|
||||||
|
alt={intl.formatMessage(messages.header)}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!isDefaultHeader(account.header)) {
|
||||||
|
header = (
|
||||||
|
<a href={account.header} onClick={handleHeaderClick} target='_blank'>
|
||||||
|
{header}
|
||||||
|
</a>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return header;
|
||||||
|
};
|
||||||
|
|
||||||
const renderMessageButton = () => {
|
const renderMessageButton = () => {
|
||||||
if (features.chatsWithFollowers) { // Truth Social
|
if (features.chatsWithFollowers) { // Truth Social
|
||||||
if (!ownAccount || !account || account.id === ownAccount?.id) {
|
if (!ownAccount || !account || account.id === ownAccount?.id) {
|
||||||
|
@ -570,14 +594,7 @@ const Header: React.FC<IHeader> = ({ account }) => {
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<div className='relative flex flex-col justify-center h-32 w-full lg:h-48 md:rounded-t-xl bg-gray-200 dark:bg-gray-900/50 overflow-hidden isolate'>
|
<div className='relative flex flex-col justify-center h-32 w-full lg:h-48 md:rounded-t-xl bg-gray-200 dark:bg-gray-900/50 overflow-hidden isolate'>
|
||||||
{account.header && (
|
{renderHeader()}
|
||||||
<a href={account.header} onClick={handleHeaderClick} target='_blank'>
|
|
||||||
<StillImage
|
|
||||||
src={account.header}
|
|
||||||
alt={intl.formatMessage(messages.header)}
|
|
||||||
/>
|
|
||||||
</a>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<div className='absolute top-2 left-2'>
|
<div className='absolute top-2 left-2'>
|
||||||
<HStack alignItems='center' space={1}>
|
<HStack alignItems='center' space={1}>
|
||||||
|
|
|
@ -95,6 +95,7 @@ const EventHeader: React.FC<IEventHeader> = ({ status }) => {
|
||||||
const username = account.username;
|
const username = account.username;
|
||||||
|
|
||||||
const handleHeaderClick: React.MouseEventHandler<HTMLAnchorElement> = (e) => {
|
const handleHeaderClick: React.MouseEventHandler<HTMLAnchorElement> = (e) => {
|
||||||
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
|
|
||||||
dispatch(openModal('MEDIA', { media: ImmutableList([event.banner]) }));
|
dispatch(openModal('MEDIA', { media: ImmutableList([event.banner]) }));
|
||||||
|
|
|
@ -24,8 +24,8 @@ const DEFAULT_HEADERS = [
|
||||||
];
|
];
|
||||||
|
|
||||||
/** Check if the avatar is a default avatar */
|
/** Check if the avatar is a default avatar */
|
||||||
const isDefaultHeader = (url: string) => {
|
export const isDefaultHeader = (url: string) => {
|
||||||
return DEFAULT_HEADERS.every(header => url.endsWith(header));
|
return DEFAULT_HEADERS.some(header => url.endsWith(header));
|
||||||
};
|
};
|
||||||
|
|
||||||
const CoverPhotoSelectionStep = ({ onNext }: { onNext: () => void }) => {
|
const CoverPhotoSelectionStep = ({ onNext }: { onNext: () => void }) => {
|
||||||
|
|
Ładowanie…
Reference in New Issue