chinwag/chinwagsocial
chinwag/chinwagsocial
2
0
Fork 0
Code Issues Pull requests Releases 5 Wiki Activity

Change aspect ratios on link previews in web UI (#26250)

Browse source
This commit is contained in:
Eugen Rochko 2023-07-30 03:35:17 +02:00 committed by GitHub
parent d76f79f647
commit d4807a5e64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 97 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
app/javascript/mastodon/features/status/components/card.jsx
View file

@ -5,7 +5,7 @@ import { PureComponent } from 'react';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import classnames from 'classnames'; import classNames from 'classnames';
import Immutable from 'immutable'; import Immutable from 'immutable';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
@ -71,6 +71,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 });
} }
@ -84,35 +85,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; this.setState({ embedded: true });
if (card.get('type') === 'photo') {
this.handlePhotoClick();
} else {
this.setState({ embedded: true });
}
}; };
setRef = c => { setRef = c => {
@ -130,15 +104,15 @@ export default class Card extends PureComponent {
}; };
renderVideo () { renderVideo () {
const { card } = this.props; const { card } = this.props;
const content = { __html: addAutoPlay(card.get('html')) }; const content = { __html: addAutoPlay(card.get('html')) };
return ( return (
<div <div
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' }}
/> />
); );
} }
@ -152,30 +126,40 @@ 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 interactive = card.get('type') !== 'link'; const interactive = card.get('type') === 'video';
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'> <div className='status-card__content'>
<span className='status-card__host'> <span className='status-card__host'>
<span lang={language}>{provider}</span> <span lang={language}>{provider}</span>
{card.get('published_at') && <> · <RelativeTimestamp timestamp={card.get('published_at')} /></>} {card.get('published_at') && <> · <RelativeTimestamp timestamp={card.get('published_at')} /></>}
</span> </span>
<strong className='status-card__title' title={card.get('title')} lang={language}>{card.get('title')}</strong> <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>}
{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'>{card.get('description')}</span>}
</div> </div>
); );
const thumbnailStyle = { const thumbnailStyle = {
visibility: revealed ? null : 'hidden', visibility: revealed ? null : 'hidden',
aspectRatio: `${card.get('width')} / ${card.get('height')}`
}; };
if (largeImage && card.get('type') === 'video') {
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', {
'status-card__image-preview--hidden': revealed && this.state.previewLoaded, 'status-card__image-preview--hidden': revealed && this.state.previewLoaded,
})} })}
hash={card.get('blurhash')} hash={card.get('blurhash')}
@ -195,7 +179,7 @@ export default class Card extends PureComponent {
); );
spoilerButton = ( spoilerButton = (
<div className={classnames('spoiler-button', { 'spoiler-button--minified': revealed })}> <div className={classNames('spoiler-button', { 'spoiler-button--minified': revealed })}>
{spoilerButton} {spoilerButton}
</div> </div>
); );
@ -204,33 +188,25 @@ 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} /></button> <button type='button' onClick={this.handleEmbedClick}><Icon id='play' /></button>
<a href={card.get('url')} target='_blank' rel='noopener noreferrer'><Icon id='external-link' /></a> <a href={card.get('url')} target='_blank' rel='noopener noreferrer'><Icon id='external-link' /></a>
</div> </div>
</div> </div>
)} ) : spoilerButton}
{!revealed && spoilerButton}
</div> </div>
); );
} }
return ( return (
<div className='status-card' 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}
<a href={card.get('url')} target='_blank' rel='noopener noreferrer'>{description}</a> <a href={card.get('url')} target='_blank' rel='noopener noreferrer'>{description}</a>
</div> </div>
@ -244,14 +220,14 @@ export default class Card extends PureComponent {
); );
} else { } else {
embed = ( embed = (
<div className='status-card__image' style={{ aspectRatio: '1.9 / 1' }}> <div className='status-card__image'>
<Icon id='file-text' /> <Icon id='file-text' />
</div> </div>
); );
} }
return ( return (
<a href={card.get('url')} className='status-card' 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>

76
app/javascript/styles/mastodon/components.scss
View file

@ -3510,13 +3510,16 @@ button.icon-button.active i.fa-retweet {
} }
.status-card { .status-card {
display: block; display: flex;
align-items: center;
position: relative; position: relative;
font-size: 14px; font-size: 14px;
color: $darker-text-color; color: $darker-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;
@ -3527,11 +3530,13 @@ button.icon-button.active i.fa-retweet {
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;
@ -3572,7 +3577,8 @@ a.status-card {
&:active { &:active {
.status-card__title, .status-card__title,
.status-card__host, .status-card__host,
.status-card__author { .status-card__author,
.status-card__description {
color: $highlight-text-color; color: $highlight-text-color;
} }
} }
@ -3587,7 +3593,8 @@ a.status-card {
&:active { &:active {
.status-card__title, .status-card__title,
.status-card__host, .status-card__host,
.status-card__author { .status-card__author,
.status-card__description {
color: $highlight-text-color; color: $highlight-text-color;
} }
} }
@ -3620,19 +3627,30 @@ a.status-card {
line-height: 24px; line-height: 24px;
color: $primary-text-color; color: $primary-text-color;
overflow: hidden; overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.status-card.expanded .status-card__title {
white-space: normal;
-webkit-line-clamp: 2;
} }
.status-card__content { .status-card__content {
flex: 1 1 auto; flex: 1 1 auto;
overflow: hidden; overflow: hidden;
padding: 15px 0; padding: 15px;
padding-bottom: 0; box-sizing: border-box;
max-width: 100%;
} }
.status-card__host { .status-card__host {
display: block; display: block;
font-size: 14px; font-size: 14px;
margin-bottom: 8px; margin-bottom: 8px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
.status-card__author { .status-card__author {
@ -3640,17 +3658,33 @@ a.status-card {
margin-top: 8px; margin-top: 8px;
font-size: 14px; font-size: 14px;
color: $primary-text-color; color: $primary-text-color;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
strong { strong {
font-weight: 500; 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 {
width: 100%; flex: 0 0 auto;
width: 120px;
aspect-ratio: 1;
background: lighten($ui-base-color, 8%); background: lighten($ui-base-color, 8%);
position: relative; position: relative;
border-radius: 8px; border-radius: 8px;
border-start-end-radius: 0;
border-end-end-radius: 0;
& > .fa { & > .fa {
font-size: 21px; font-size: 21px;
@ -3664,6 +3698,8 @@ a.status-card {
.status-card__image-image { .status-card__image-image {
border-radius: 8px; border-radius: 8px;
border-start-end-radius: 0;
border-end-end-radius: 0;
display: block; display: block;
margin: 0; margin: 0;
width: 100%; width: 100%;
@ -3675,6 +3711,8 @@ a.status-card {
.status-card__image-preview { .status-card__image-preview {
border-radius: 8px; border-radius: 8px;
border-start-end-radius: 0;
border-end-end-radius: 0;
display: block; display: block;
margin: 0; margin: 0;
width: 100%; width: 100%;
@ -3691,6 +3729,28 @@ a.status-card {
} }
} }
.status-card.expanded {
flex-direction: column;
align-items: flex-start;
}
.status-card.expanded .status-card__image {
width: 100%;
aspect-ratio: auto;
}
.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%;
}
.load-more { .load-more {
display: block; display: block;
color: $dark-text-color; color: $dark-text-color;
@ -4902,7 +4962,7 @@ a.status-card {
width: 100%; width: 100%;
background: $ui-base-color; background: $ui-base-color;
border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px;
box-shadow: 4px 4px 6px rgba($base-shadow-color, 0.4); box-shadow: var(--dropdown-shadow);
z-index: 99; z-index: 99;
font-size: 13px; font-size: 13px;
padding: 15px 5px; padding: 15px 5px;
@ -8218,7 +8278,7 @@ noscript {
flex: 0 0 auto; flex: 0 0 auto;
position: relative; position: relative;
width: 120px; width: 120px;
height: 120px; aspect-ratio: 1;
.skeleton { .skeleton {
width: 100%; width: 100%;