Adopt upstream's design for preview cards (#2634)

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Christian Schmidt <github@chsc.dk>
This commit is contained in:
Claire 2024-02-19 22:47:01 +01:00 committed by GitHub
parent 89ea492d70
commit 0a2b95c4f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 139 additions and 136 deletions

View File

@ -729,7 +729,6 @@ class Status extends ImmutablePureComponent {
<Card <Card
onOpenMedia={this.handleOpenMedia} onOpenMedia={this.handleOpenMedia}
card={status.get('card')} card={status.get('card')}
compact
sensitive={status.get('sensitive')} sensitive={status.get('sensitive')}
/>, />,
); );

View File

@ -8,12 +8,12 @@ import classNames from 'classnames';
import Immutable from 'immutable'; import Immutable from 'immutable';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import DescriptionIcon from '@/material-icons/400-24px/description-fill.svg?react'; import DescriptionIcon from '@/material-icons/400-24px/description-fill.svg?react';
import OpenInNewIcon from '@/material-icons/400-24px/open_in_new.svg?react'; import OpenInNewIcon from '@/material-icons/400-24px/open_in_new.svg?react';
import PlayArrowIcon from '@/material-icons/400-24px/play_arrow-fill.svg?react'; import PlayArrowIcon from '@/material-icons/400-24px/play_arrow-fill.svg?react';
import { Blurhash } from 'flavours/glitch/components/blurhash'; import { Blurhash } from 'flavours/glitch/components/blurhash';
import { Icon } from 'flavours/glitch/components/icon'; import { Icon } from 'flavours/glitch/components/icon';
import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
import { useBlurhash } from 'flavours/glitch/initial_state'; import { useBlurhash } from 'flavours/glitch/initial_state';
import { decode as decodeIDNA } from 'flavours/glitch/utils/idna'; import { decode as decodeIDNA } from 'flavours/glitch/utils/idna';
@ -51,14 +51,9 @@ export default class Card extends PureComponent {
static propTypes = { static propTypes = {
card: ImmutablePropTypes.map, card: ImmutablePropTypes.map,
onOpenMedia: PropTypes.func.isRequired, onOpenMedia: PropTypes.func.isRequired,
compact: PropTypes.bool,
sensitive: PropTypes.bool, sensitive: PropTypes.bool,
}; };
static defaultProps = {
compact: false,
};
state = { state = {
previewLoaded: false, previewLoaded: false,
embedded: false, embedded: false,
@ -69,6 +64,7 @@ export default class Card extends PureComponent {
if (!Immutable.is(this.props.card, nextProps.card)) { if (!Immutable.is(this.props.card, nextProps.card)) {
this.setState({ embedded: false, previewLoaded: false }); this.setState({ embedded: false, previewLoaded: false });
} }
if (this.props.sensitive !== nextProps.sensitive) { if (this.props.sensitive !== nextProps.sensitive) {
this.setState({ revealed: !nextProps.sensitive }); this.setState({ revealed: !nextProps.sensitive });
} }
@ -82,35 +78,8 @@ export default class Card extends PureComponent {
window.removeEventListener('resize', this.handleResize); window.removeEventListener('resize', this.handleResize);
} }
handlePhotoClick = () => {
const { card, onOpenMedia } = this.props;
onOpenMedia(
Immutable.fromJS([
{
type: 'image',
url: card.get('embed_url'),
description: card.get('title'),
meta: {
original: {
width: card.get('width'),
height: card.get('height'),
},
},
},
]),
0,
);
};
handleEmbedClick = () => { handleEmbedClick = () => {
const { card } = this.props;
if (card.get('type') === 'photo') {
this.handlePhotoClick();
} else {
this.setState({ embedded: true }); this.setState({ embedded: true });
}
}; };
setRef = c => { setRef = c => {
@ -136,13 +105,13 @@ export default class Card extends PureComponent {
ref={this.setRef} ref={this.setRef}
className='status-card__image status-card-video' className='status-card__image status-card-video'
dangerouslySetInnerHTML={content} dangerouslySetInnerHTML={content}
style={{ aspectRatio: `${card.get('width')} / ${card.get('height')}` }} style={{ aspectRatio: '16 / 9' }}
/> />
); );
} }
render () { render () {
const { card, compact } = this.props; const { card } = this.props;
const { embedded, revealed } = this.state; const { embedded, revealed } = this.state;
if (card === null) { if (card === null) {
@ -150,29 +119,37 @@ export default class Card extends PureComponent {
} }
const provider = card.get('provider_name').length === 0 ? decodeIDNA(getHostname(card.get('url'))) : card.get('provider_name'); const provider = card.get('provider_name').length === 0 ? decodeIDNA(getHostname(card.get('url'))) : card.get('provider_name');
const horizontal = (!compact && card.get('width') > card.get('height')) || card.get('type') !== 'link' || embedded; const interactive = card.get('type') === 'video';
const interactive = card.get('type') !== 'link';
const className = classNames('status-card', { horizontal, compact, interactive });
const title = interactive ? <a className='status-card__title' href={card.get('url')} title={card.get('title')} rel='noopener noreferrer' target='_blank'><strong>{card.get('title')}</strong></a> : <strong className='status-card__title' title={card.get('title')}>{card.get('title')}</strong>;
const language = card.get('language') || ''; const language = card.get('language') || '';
const largeImage = (card.get('image')?.length > 0 && card.get('width') > card.get('height')) || interactive;
const description = ( const description = (
<div className='status-card__content' lang={language}> <div className='status-card__content'>
{title} <span className='status-card__host'>
{!(horizontal || compact) && <p className='status-card__description' title={card.get('description')}>{card.get('description')}</p>} <span lang={language}>{provider}</span>
<span className='status-card__host'>{provider}</span> {card.get('published_at') && <> · <RelativeTimestamp timestamp={card.get('published_at')} /></>}
</span>
<strong className='status-card__title' title={card.get('title')} lang={language}>{card.get('title')}</strong>
{card.get('author_name').length > 0 ? <span className='status-card__author'><FormattedMessage id='link_preview.author' defaultMessage='By {name}' values={{ name: <strong>{card.get('author_name')}</strong> }} /></span> : <span className='status-card__description' lang={language}>{card.get('description')}</span>}
</div> </div>
); );
const thumbnailStyle = { const thumbnailStyle = {
visibility: revealed? null : 'hidden', visibility: revealed ? null : 'hidden',
}; };
if (horizontal) { if (largeImage && card.get('type') === 'video') {
thumbnailStyle.aspectRatio = (compact && !embedded) ? '16 / 9' : `${card.get('width')} / ${card.get('height')}`; thumbnailStyle.aspectRatio = `16 / 9`;
} else if (largeImage) {
thumbnailStyle.aspectRatio = '1.91 / 1';
} else {
thumbnailStyle.aspectRatio = 1;
} }
let embed = ''; let embed;
let canvas = ( let canvas = (
<Blurhash <Blurhash
className={classNames('status-card__image-preview', { className={classNames('status-card__image-preview', {
@ -205,22 +182,16 @@ export default class Card extends PureComponent {
if (embedded) { if (embedded) {
embed = this.renderVideo(); embed = this.renderVideo();
} else { } else {
let iconVariant = 'play';
if (card.get('type') === 'photo') {
iconVariant = 'search-plus';
}
embed = ( embed = (
<div className='status-card__image'> <div className='status-card__image'>
{canvas} {canvas}
{thumbnail} {thumbnail}
{revealed ? ( {revealed ? (
<div className='status-card__actions'> <div className='status-card__actions' onClick={this.handleEmbedClick} role='none'>
<div> <div>
<button type='button' onClick={this.handleEmbedClick}><Icon id={iconVariant} icon={PlayArrowIcon} /></button> <button type='button' onClick={this.handleEmbedClick}><Icon id='play' icon={PlayArrowIcon} /></button>
{horizontal && <a href={card.get('url')} target='_blank' rel='noopener noreferrer'><Icon id='external-link' icon={OpenInNewIcon} /></a>} <a href={card.get('url')} target='_blank' rel='noopener noreferrer'><Icon id='external-link' icon={OpenInNewIcon} /></a>
</div> </div>
</div> </div>
) : spoilerButton} ) : spoilerButton}
@ -229,9 +200,9 @@ export default class Card extends PureComponent {
} }
return ( return (
<div className={className} ref={this.setRef} onClick={revealed ? null : this.handleReveal} role={revealed ? 'button' : null}> <div className={classNames('status-card', { expanded: largeImage })} ref={this.setRef} onClick={revealed ? null : this.handleReveal} role={revealed ? 'button' : null}>
{embed} {embed}
{!compact && description} <a href={card.get('url')} target='_blank' rel='noopener noreferrer'>{description}</a>
</div> </div>
); );
} else if (card.get('image')) { } else if (card.get('image')) {
@ -250,7 +221,7 @@ export default class Card extends PureComponent {
} }
return ( return (
<a href={card.get('url')} className={className} target='_blank' rel='noopener noreferrer' ref={this.setRef}> <a href={card.get('url')} className={classNames('status-card', { expanded: largeImage })} target='_blank' rel='noopener noreferrer' ref={this.setRef}>
{embed} {embed}
{description} {description}
</a> </a>

View File

@ -3486,15 +3486,16 @@ input.glitch-setting-text {
} }
.status-card { .status-card {
position: relative;
display: flex; display: flex;
align-items: center;
position: relative;
font-size: 14px; font-size: 14px;
border: 1px solid lighten($ui-base-color, 8%); color: $darker-text-color;
border-radius: 4px;
color: $dark-text-color;
margin-top: 14px; margin-top: 14px;
text-decoration: none; text-decoration: none;
overflow: hidden; overflow: hidden;
border: 1px solid lighten($ui-base-color, 8%);
border-radius: 8px;
&__actions { &__actions {
bottom: 0; bottom: 0;
@ -3505,11 +3506,13 @@ input.glitch-setting-text {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
cursor: pointer;
& > div { & > div {
background: rgba($base-shadow-color, 0.6); background: rgba($base-shadow-color, 0.6);
border-radius: 8px; border-radius: 8px;
padding: 12px 9px; padding: 12px 9px;
backdrop-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);
flex: 0 0 auto; flex: 0 0 auto;
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -3539,19 +3542,37 @@ input.glitch-setting-text {
position: relative; position: relative;
bottom: -1px; bottom: -1px;
} }
a .fa,
a:hover .fa {
color: inherit;
}
} }
} }
a.status-card { a.status-card {
cursor: pointer; cursor: pointer;
&:hover { &:hover,
background: lighten($ui-base-color, 8%); &:focus,
&:active {
.status-card__title,
.status-card__host,
.status-card__author,
.status-card__description {
color: $highlight-text-color;
}
}
}
.status-card a {
color: inherit;
text-decoration: none;
&:hover,
&:focus,
&:active {
.status-card__title,
.status-card__host,
.status-card__author,
.status-card__description {
color: $highlight-text-color;
}
} }
} }
@ -3577,41 +3598,66 @@ a.status-card {
.status-card__title { .status-card__title {
display: block; display: block;
font-weight: 500; font-weight: 700;
margin-bottom: 5px; font-size: 19px;
color: $darker-text-color; line-height: 24px;
color: $primary-text-color;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
text-decoration: none; text-overflow: ellipsis;
}
.status-card.expanded .status-card__title {
white-space: normal;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
} }
.status-card__content { .status-card__content {
flex: 1 1 auto; flex: 1 1 auto;
overflow: hidden; overflow: hidden;
padding: 14px; padding: 8px 10px; // intentional glitch-soc change to reduce padding
padding-inline-start: 8px; box-sizing: border-box;
} max-width: 100%;
.status-card__description {
color: $darker-text-color;
overflow: hidden;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
} }
.status-card__host { .status-card__host {
display: block; display: block;
margin-top: 5px; font-size: 14px;
font-size: 13px; margin-bottom: 8px;
white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
}
.status-card__author {
display: block;
margin-top: 8px;
font-size: 14px;
color: $primary-text-color;
white-space: nowrap; white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
strong {
font-weight: 500;
}
}
.status-card__description {
display: block;
margin-top: 8px;
font-size: 14px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
.status-card__image { .status-card__image {
flex: 0 0 100px; flex: 0 0 auto;
width: 96px; // intentional glitch-soc change to better use space
aspect-ratio: 1;
background: lighten($ui-base-color, 8%); background: lighten($ui-base-color, 8%);
position: relative; position: relative;
@ -3626,50 +3672,7 @@ a.status-card {
} }
} }
.status-card.horizontal {
display: block;
.status-card__image {
width: 100%;
}
.status-card__image-image,
.status-card__image-preview {
border-radius: 4px 4px 0 0;
}
.status-card__title {
white-space: inherit;
}
}
.status-card.compact {
border-color: lighten($ui-base-color, 4%);
&.interactive {
border: 0;
}
.status-card__content {
padding: 8px;
padding-top: 10px;
}
.status-card__title {
white-space: nowrap;
}
.status-card__image {
flex: 0 0 60px;
}
}
a.status-card.compact:hover {
background-color: lighten($ui-base-color, 4%);
}
.status-card__image-image { .status-card__image-image {
border-radius: 4px 0 0 4px;
display: block; display: block;
margin: 0; margin: 0;
width: 100%; width: 100%;
@ -3680,7 +3683,6 @@ a.status-card.compact:hover {
} }
.status-card__image-preview { .status-card__image-preview {
border-radius: 4px 0 0 4px;
display: block; display: block;
margin: 0; margin: 0;
width: 100%; width: 100%;
@ -3697,6 +3699,37 @@ a.status-card.compact:hover {
} }
} }
.status-card.expanded {
flex-direction: column;
align-items: flex-start;
}
.status-card.expanded .status-card__image {
width: 100%;
aspect-ratio: auto;
}
.status-card__image,
.status-card__image-image,
.status-card__image-preview {
border-start-start-radius: 8px;
border-start-end-radius: 0;
border-end-end-radius: 0;
border-end-start-radius: 8px;
}
.status-card.expanded .status-card__image,
.status-card.expanded .status-card__image-image,
.status-card.expanded .status-card__image-preview {
border-start-end-radius: 8px;
border-end-end-radius: 0;
border-end-start-radius: 0;
}
.status-card.expanded > a {
width: 100%;
}
.notification, .notification,
.status { .status {
position: relative; position: relative;