Merge pull request #307 from SableClient/fix/animated-avatars

Make animated svgs loop
This commit is contained in:
7w1 authored and GitHub committed 2026-03-16 20:01:42 +00:00
commit 4badb3785e
2 files changed
+56 -4

No files matched your search

+5
View File
@@ -0,0 +1,5 @@
---
default: patch
---
Fix animated avatars not looping.
+51 -4
View File
@@ -1,5 +1,5 @@
import { AvatarImage as FoldsAvatarImage } from 'folds';
import { ReactEventHandler, useState } from 'react';
import { ReactEventHandler, useState, useEffect } from 'react';
import bgColorImg from '$utils/bgColorImg';
import { settingsAtom } from '$state/settings';
import { useSetting } from '$state/hooks/settings';
@@ -15,20 +15,67 @@ type AvatarImageProps = {
export function AvatarImage({ src, alt, uniformIcons, onError }: AvatarImageProps) {
const [uniformIconsSetting] = useSetting(settingsAtom, 'uniformIcons');
const [image, setImage] = useState<HTMLImageElement | undefined>(undefined);
const normalizedBg = image ? bgColorImg(image) : undefined;
const [processedSrc, setProcessedSrc] = useState<string>(src);
const useUniformIcons = uniformIconsSetting && uniformIcons === true;
const normalizedBg = useUniformIcons && image ? bgColorImg(image) : undefined;
useEffect(() => {
let isMounted = true;
let objectUrl: string | null = null;
const processImage = async () => {
try {
const res = await fetch(src, { mode: 'cors' });
const contentType = res.headers.get('content-type');
if (contentType && contentType.includes('image/svg+xml')) {
const text = await res.text();
const parser = new DOMParser();
const doc = parser.parseFromString(text, 'image/svg+xml');
const animations = doc.querySelectorAll('animate, animateTransform, animateMotion');
animations.forEach((anim) => anim.setAttribute('repeatCount', 'indefinite'));
const style = doc.createElementNS('http://www.w3.org/2000/svg', 'style');
style.textContent = '* { animation-iteration-count: infinite !important; }';
doc.documentElement.appendChild(style);
const serializer = new XMLSerializer();
const newSvgString = serializer.serializeToString(doc);
const blob = new Blob([newSvgString], { type: 'image/svg+xml' });
objectUrl = URL.createObjectURL(blob);
if (isMounted) setProcessedSrc(objectUrl);
} else if (isMounted) setProcessedSrc(src);
} catch {
if (isMounted) setProcessedSrc(src);
}
};
processImage();
return () => {
isMounted = false;
if (objectUrl) {
URL.revokeObjectURL(objectUrl);
}
};
}, [src]);
const handleLoad: ReactEventHandler<HTMLImageElement> = (evt) => {
evt.currentTarget.setAttribute('data-image-loaded', 'true');
setImage(evt.currentTarget);
};
const isBlobUrl = processedSrc.startsWith('blob:');
return (
<FoldsAvatarImage
className={css.RoomAvatar}
style={{ backgroundColor: useUniformIcons ? normalizedBg : undefined }}
src={src}
crossOrigin="anonymous"
src={processedSrc}
crossOrigin={isBlobUrl ? undefined : 'anonymous'}
alt={alt}
onError={() => {
setImage(undefined);