[Glitch] Fix display of failed-to-load image attachments in web UI

Port changes from 1960aac90b16fce1ec620ac990aa931efcf04700 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Eugen Rochko 2025-03-21 11:23:49 +01:00 committed by Claire
parent e63d474eb8
commit afb0294826
3 changed files with 23 additions and 2 deletions

View File

@ -39,6 +39,7 @@ class Item extends PureComponent {
state = { state = {
loaded: false, loaded: false,
error: false,
}; };
handleMouseEnter = (e) => { handleMouseEnter = (e) => {
@ -82,6 +83,10 @@ class Item extends PureComponent {
this.setState({ loaded: true }); this.setState({ loaded: true });
}; };
handleImageError = () => {
this.setState({ error: true });
};
render () { render () {
const { attachment, lang, index, size, standalone, letterbox, displayWidth, visible } = this.props; const { attachment, lang, index, size, standalone, letterbox, displayWidth, visible } = this.props;
@ -150,6 +155,7 @@ class Item extends PureComponent {
lang={lang} lang={lang}
style={{ objectPosition: letterbox ? null : `${x}% ${y}%` }} style={{ objectPosition: letterbox ? null : `${x}% ${y}%` }}
onLoad={this.handleImageLoad} onLoad={this.handleImageLoad}
onError={this.handleImageError}
/> />
</a> </a>
); );
@ -185,7 +191,7 @@ class Item extends PureComponent {
} }
return ( return (
<div className={classNames('media-gallery__item', { standalone, letterbox, 'media-gallery__item--tall': height === 100, 'media-gallery__item--wide': width === 100 })} key={attachment.get('id')}> <div className={classNames('media-gallery__item', { standalone, letterbox, 'media-gallery__item--error': this.state.error, 'media-gallery__item--tall': height === 100, 'media-gallery__item--wide': width === 100 })} key={attachment.get('id')}>
<Blurhash <Blurhash
hash={attachment.get('blurhash')} hash={attachment.get('blurhash')}
dummy={!useBlurhash} dummy={!useBlurhash}

View File

@ -30,11 +30,16 @@ export const MediaItem: React.FC<{
displayMedia === 'show_all', displayMedia === 'show_all',
); );
const [loaded, setLoaded] = useState(false); const [loaded, setLoaded] = useState(false);
const [error, setError] = useState(false);
const handleImageLoad = useCallback(() => { const handleImageLoad = useCallback(() => {
setLoaded(true); setLoaded(true);
}, [setLoaded]); }, [setLoaded]);
const handleImageError = useCallback(() => {
setError(true);
}, [setError]);
const handleMouseEnter = useCallback( const handleMouseEnter = useCallback(
(e: React.MouseEvent<HTMLVideoElement>) => { (e: React.MouseEvent<HTMLVideoElement>) => {
if (e.target instanceof HTMLVideoElement) { if (e.target instanceof HTMLVideoElement) {
@ -102,6 +107,7 @@ export const MediaItem: React.FC<{
alt={description} alt={description}
lang={lang} lang={lang}
onLoad={handleImageLoad} onLoad={handleImageLoad}
onError={handleImageError}
/> />
<div className='media-gallery__item__overlay media-gallery__item__overlay--corner'> <div className='media-gallery__item__overlay media-gallery__item__overlay--corner'>
@ -122,6 +128,7 @@ export const MediaItem: React.FC<{
lang={lang} lang={lang}
style={{ objectPosition: `${x}% ${y}%` }} style={{ objectPosition: `${x}% ${y}%` }}
onLoad={handleImageLoad} onLoad={handleImageLoad}
onError={handleImageError}
/> />
); );
} else if (['video', 'gifv'].includes(type)) { } else if (['video', 'gifv'].includes(type)) {
@ -177,7 +184,11 @@ export const MediaItem: React.FC<{
} }
return ( return (
<div className='media-gallery__item media-gallery__item--square'> <div
className={classNames('media-gallery__item media-gallery__item--square', {
'media-gallery__item--error': error,
})}
>
<Blurhash <Blurhash
hash={blurhash} hash={blurhash}
className={classNames('media-gallery__preview', { className={classNames('media-gallery__preview', {

View File

@ -7288,6 +7288,10 @@ img.modal-warning {
filter: var(--overlay-icon-shadow); filter: var(--overlay-icon-shadow);
} }
} }
&--error img {
visibility: hidden;
}
} }
.media-gallery__item-thumbnail { .media-gallery__item-thumbnail {