Improve timeline scroll, media layout, avatars, and emoji coverage.
Remember room scroll position across switches, reserve image/video heights from Matrix dimensions, cache authenticated media blobs for avatars, restore jumbo emoji-only messages, and extend emoji font unicode-range for Unicode 15 glyphs.
This commit is contained in:
@@ -2,7 +2,7 @@ import React, { ReactNode, useCallback, useEffect, useState } from 'react';
|
||||
import { Badge, Box, Button, Chip, Modal, Overlay, OverlayBackdrop, OverlayCenter, Spinner, Text, Tooltip, TooltipProvider, as } from 'folds';
|
||||
import { Icon, Icons } from '../../icons';
|
||||
import classNames from 'classnames';
|
||||
import { BlurhashCanvas } from 'react-blurhash';
|
||||
import { Blurhash } from 'react-blurhash';
|
||||
import FocusTrap from 'focus-trap-react';
|
||||
import { EncryptedAttachmentInfo } from 'browser-encrypt-attachment';
|
||||
import { IImageInfo, MATRIX_BLUR_HASH_PROPERTY_NAME } from '../../../../types/matrix/common';
|
||||
@@ -17,6 +17,7 @@ import { useMediaAuthentication } from '../../../hooks/useMediaAuthentication';
|
||||
import { ModalWide } from '../../../styles/Modal.css';
|
||||
import { validBlurHash } from '../../../utils/blurHash';
|
||||
import { getCurrentAccessToken } from '../../../utils/auth';
|
||||
import { setMediaDimensions, getMediaBlurHash, getMediaDimensions, rememberMediaBlurHash } from '../../../state/mediaDimensionCache';
|
||||
|
||||
/**
|
||||
* Fetches media with authentication headers and returns a blob URL.
|
||||
@@ -68,7 +69,7 @@ type RenderImageProps = {
|
||||
alt: string;
|
||||
title: string;
|
||||
src: string;
|
||||
onLoad: () => void;
|
||||
onLoad: (event?: React.SyntheticEvent<HTMLImageElement>) => void;
|
||||
onError: () => void;
|
||||
onClick: () => void;
|
||||
tabIndex: number;
|
||||
@@ -105,12 +106,23 @@ export const ImageContent = as<'div', ImageContentProps>(
|
||||
) => {
|
||||
const mx = useMatrixClient();
|
||||
const useAuthentication = useMediaAuthentication();
|
||||
const blurHash = validBlurHash(info?.[MATRIX_BLUR_HASH_PROPERTY_NAME]);
|
||||
const eventBlurHash = validBlurHash(info?.[MATRIX_BLUR_HASH_PROPERTY_NAME]);
|
||||
const cachedBlurHash = getMediaBlurHash(url);
|
||||
const blurHash = eventBlurHash ?? cachedBlurHash;
|
||||
const cachedDims = getMediaDimensions(url);
|
||||
const blurResolutionX = 32;
|
||||
const ratioW = info?.w || cachedDims?.w;
|
||||
const ratioH = info?.h || cachedDims?.h;
|
||||
const blurResolutionY =
|
||||
ratioW && ratioH && ratioW > 0
|
||||
? Math.max(1, Math.round(blurResolutionX * (ratioH / ratioW)))
|
||||
: 32;
|
||||
|
||||
const [load, setLoad] = useState(false);
|
||||
const [error, setError] = useState(false);
|
||||
const [viewer, setViewer] = useState(false);
|
||||
const [blurred, setBlurred] = useState(markedAsSpoiler ?? false);
|
||||
const [showPlaceholder, setShowPlaceholder] = useState(true);
|
||||
|
||||
const [srcState, loadSrc] = useAsyncCallback(
|
||||
useCallback(async () => {
|
||||
@@ -139,6 +151,7 @@ export const ImageContent = as<'div', ImageContentProps>(
|
||||
const handleError = () => {
|
||||
setLoad(false);
|
||||
setError(true);
|
||||
setShowPlaceholder(true);
|
||||
};
|
||||
|
||||
const handleRetry = () => {
|
||||
@@ -150,8 +163,34 @@ export const ImageContent = as<'div', ImageContentProps>(
|
||||
if (autoPlay) loadSrc();
|
||||
}, [autoPlay, loadSrc]);
|
||||
|
||||
// Keep blurhash under the fade, then remove it once the image is fully opaque.
|
||||
useEffect(() => {
|
||||
if (!load) {
|
||||
setShowPlaceholder(true);
|
||||
return undefined;
|
||||
}
|
||||
const timer = window.setTimeout(() => setShowPlaceholder(false), 540);
|
||||
return () => window.clearTimeout(timer);
|
||||
}, [load]);
|
||||
|
||||
return (
|
||||
<Box className={classNames(css.RelativeBase, className)} {...props} ref={ref}>
|
||||
{showPlaceholder &&
|
||||
(typeof blurHash === 'string' ? (
|
||||
<div className={css.BlurhashPlaceholder}>
|
||||
<Blurhash
|
||||
hash={blurHash}
|
||||
width="100%"
|
||||
height="100%"
|
||||
resolutionX={blurResolutionX}
|
||||
resolutionY={blurResolutionY}
|
||||
punch={1.2}
|
||||
style={{ display: 'block' }}
|
||||
/>
|
||||
</div>
|
||||
) : (
|
||||
<div className={css.MediaSkeleton} />
|
||||
))}
|
||||
{srcState.status === AsyncStatus.Success && (
|
||||
<Overlay open={viewer} backdrop={<OverlayBackdrop />}>
|
||||
<OverlayCenter>
|
||||
@@ -177,15 +216,6 @@ export const ImageContent = as<'div', ImageContentProps>(
|
||||
</OverlayCenter>
|
||||
</Overlay>
|
||||
)}
|
||||
{typeof blurHash === 'string' && !load && (
|
||||
<BlurhashCanvas
|
||||
style={{ width: '100%', height: '100%' }}
|
||||
width={32}
|
||||
height={32}
|
||||
hash={blurHash}
|
||||
punch={1}
|
||||
/>
|
||||
)}
|
||||
{!autoPlay && !markedAsSpoiler && srcState.status === AsyncStatus.Idle && (
|
||||
<Box className={css.AbsoluteContainer} alignItems="Center" justifyContent="Center">
|
||||
<Button
|
||||
@@ -201,12 +231,26 @@ export const ImageContent = as<'div', ImageContentProps>(
|
||||
</Box>
|
||||
)}
|
||||
{srcState.status === AsyncStatus.Success && (
|
||||
<Box className={classNames(css.AbsoluteContainer, blurred && css.Blur)}>
|
||||
<Box
|
||||
className={classNames(
|
||||
css.AbsoluteContainer,
|
||||
css.MediaFadeIn,
|
||||
load && css.MediaFadeInLoaded,
|
||||
blurred && css.Blur
|
||||
)}
|
||||
>
|
||||
{renderImage({
|
||||
alt: body,
|
||||
title: body,
|
||||
src: srcState.data,
|
||||
onLoad: handleLoad,
|
||||
onLoad: (e?: React.SyntheticEvent<HTMLImageElement>) => {
|
||||
const img = e?.currentTarget;
|
||||
if (img?.naturalWidth && img?.naturalHeight) {
|
||||
setMediaDimensions(url, img.naturalWidth, img.naturalHeight);
|
||||
}
|
||||
if (img) rememberMediaBlurHash(url, img);
|
||||
handleLoad();
|
||||
},
|
||||
onError: handleError,
|
||||
onClick: () => setViewer(true),
|
||||
tabIndex: 0,
|
||||
@@ -248,7 +292,8 @@ export const ImageContent = as<'div', ImageContentProps>(
|
||||
)}
|
||||
{(srcState.status === AsyncStatus.Loading || srcState.status === AsyncStatus.Success) &&
|
||||
!load &&
|
||||
!blurred && (
|
||||
!blurred &&
|
||||
typeof blurHash !== 'string' && (
|
||||
<Box className={css.AbsoluteContainer} alignItems="Center" justifyContent="Center">
|
||||
<Spinner variant="Secondary" />
|
||||
</Box>
|
||||
|
||||
@@ -2,7 +2,7 @@ import React, { ReactNode, useCallback, useEffect, useState } from 'react';
|
||||
import { Badge, Box, Button, Chip, Modal, Overlay, OverlayBackdrop, OverlayCenter, Spinner, Text, Tooltip, TooltipProvider, as } from 'folds';
|
||||
import { Icon, Icons } from '../../icons';
|
||||
import classNames from 'classnames';
|
||||
import { BlurhashCanvas } from 'react-blurhash';
|
||||
import { Blurhash } from 'react-blurhash';
|
||||
import FocusTrap from 'focus-trap-react';
|
||||
import { EncryptedAttachmentInfo } from 'browser-encrypt-attachment';
|
||||
import {
|
||||
@@ -25,6 +25,7 @@ import { useMediaAuthentication } from '../../../hooks/useMediaAuthentication';
|
||||
import { validBlurHash } from '../../../utils/blurHash';
|
||||
import { ModalWide } from '../../../styles/Modal.css';
|
||||
import { stopPropagation } from '../../../utils/keyboard';
|
||||
import { setMediaDimensions, getMediaBlurHash, getMediaDimensions, rememberMediaBlurHash } from '../../../state/mediaDimensionCache';
|
||||
|
||||
type RenderViewerProps = {
|
||||
src: string;
|
||||
@@ -34,7 +35,7 @@ type RenderViewerProps = {
|
||||
type RenderVideoProps = {
|
||||
title: string;
|
||||
src: string;
|
||||
onLoadedMetadata: () => void;
|
||||
onLoadedMetadata: (event?: React.SyntheticEvent<HTMLVideoElement>) => void;
|
||||
onError: () => void;
|
||||
autoPlay: boolean;
|
||||
controls: boolean;
|
||||
@@ -74,12 +75,23 @@ export const VideoContent = as<'div', VideoContentProps>(
|
||||
) => {
|
||||
const mx = useMatrixClient();
|
||||
const useAuthentication = useMediaAuthentication();
|
||||
const blurHash = validBlurHash(info.thumbnail_info?.[MATRIX_BLUR_HASH_PROPERTY_NAME]);
|
||||
const eventBlurHash = validBlurHash(info.thumbnail_info?.[MATRIX_BLUR_HASH_PROPERTY_NAME]);
|
||||
const cachedBlurHash = getMediaBlurHash(url);
|
||||
const blurHash = eventBlurHash ?? cachedBlurHash;
|
||||
const cachedDims = getMediaDimensions(url);
|
||||
const blurResolutionX = 32;
|
||||
const blurW = info.w ?? info.thumbnail_info?.w ?? cachedDims?.w;
|
||||
const blurH = info.h ?? info.thumbnail_info?.h ?? cachedDims?.h;
|
||||
const blurResolutionY =
|
||||
blurW && blurH && blurW > 0
|
||||
? Math.max(1, Math.round(blurResolutionX * (blurH / blurW)))
|
||||
: 32;
|
||||
|
||||
const [load, setLoad] = useState(false);
|
||||
const [error, setError] = useState(false);
|
||||
const [viewer, setViewer] = useState(false);
|
||||
const [blurred, setBlurred] = useState(markedAsSpoiler ?? false);
|
||||
const [showPlaceholder, setShowPlaceholder] = useState(true);
|
||||
|
||||
const [srcState, loadSrc] = useAsyncCallback(
|
||||
useCallback(async () => {
|
||||
@@ -95,12 +107,17 @@ export const VideoContent = as<'div', VideoContentProps>(
|
||||
}, [mx, url, useAuthentication, mimeType, encInfo])
|
||||
);
|
||||
|
||||
const handleLoad = () => {
|
||||
const handleLoad = (video?: HTMLVideoElement) => {
|
||||
if (video?.videoWidth && video?.videoHeight) {
|
||||
setMediaDimensions(url, video.videoWidth, video.videoHeight);
|
||||
}
|
||||
if (video) rememberMediaBlurHash(url, video);
|
||||
setLoad(true);
|
||||
};
|
||||
const handleError = () => {
|
||||
setLoad(false);
|
||||
setError(true);
|
||||
setShowPlaceholder(true);
|
||||
};
|
||||
|
||||
const handleRetry = () => {
|
||||
@@ -112,8 +129,33 @@ export const VideoContent = as<'div', VideoContentProps>(
|
||||
if (autoPlay) loadSrc();
|
||||
}, [autoPlay, loadSrc]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!load) {
|
||||
setShowPlaceholder(true);
|
||||
return undefined;
|
||||
}
|
||||
const timer = window.setTimeout(() => setShowPlaceholder(false), 540);
|
||||
return () => window.clearTimeout(timer);
|
||||
}, [load]);
|
||||
|
||||
return (
|
||||
<Box className={classNames(css.RelativeBase, className)} {...props} ref={ref}>
|
||||
{showPlaceholder &&
|
||||
(typeof blurHash === 'string' ? (
|
||||
<div className={css.BlurhashPlaceholder}>
|
||||
<Blurhash
|
||||
hash={blurHash}
|
||||
width="100%"
|
||||
height="100%"
|
||||
resolutionX={blurResolutionX}
|
||||
resolutionY={blurResolutionY}
|
||||
punch={1.2}
|
||||
style={{ display: 'block' }}
|
||||
/>
|
||||
</div>
|
||||
) : (
|
||||
<div className={css.MediaSkeleton} />
|
||||
))}
|
||||
{renderViewer && srcState.status === AsyncStatus.Success && (
|
||||
<Overlay open={viewer} backdrop={<OverlayBackdrop />}>
|
||||
<OverlayCenter>
|
||||
@@ -136,15 +178,6 @@ export const VideoContent = as<'div', VideoContentProps>(
|
||||
</OverlayCenter>
|
||||
</Overlay>
|
||||
)}
|
||||
{typeof blurHash === 'string' && !load && (
|
||||
<BlurhashCanvas
|
||||
style={{ width: '100%', height: '100%' }}
|
||||
width={32}
|
||||
height={32}
|
||||
hash={blurHash}
|
||||
punch={1}
|
||||
/>
|
||||
)}
|
||||
{renderThumbnail && !load && (
|
||||
<Box
|
||||
className={classNames(css.AbsoluteContainer, blurred && css.Blur)}
|
||||
@@ -169,11 +202,20 @@ export const VideoContent = as<'div', VideoContentProps>(
|
||||
</Box>
|
||||
)}
|
||||
{srcState.status === AsyncStatus.Success && (
|
||||
<Box className={classNames(css.AbsoluteContainer, blurred && css.Blur)}>
|
||||
<Box
|
||||
className={classNames(
|
||||
css.AbsoluteContainer,
|
||||
css.MediaFadeIn,
|
||||
load && css.MediaFadeInLoaded,
|
||||
blurred && css.Blur
|
||||
)}
|
||||
>
|
||||
{renderVideo({
|
||||
title: body,
|
||||
src: srcState.data,
|
||||
onLoadedMetadata: handleLoad,
|
||||
onLoadedMetadata: (e?: React.SyntheticEvent<HTMLVideoElement>) => {
|
||||
handleLoad(e?.currentTarget);
|
||||
},
|
||||
onError: handleError,
|
||||
autoPlay: true,
|
||||
controls: true,
|
||||
@@ -213,7 +255,8 @@ export const VideoContent = as<'div', VideoContentProps>(
|
||||
)}
|
||||
{(srcState.status === AsyncStatus.Loading || srcState.status === AsyncStatus.Success) &&
|
||||
!load &&
|
||||
!blurred && (
|
||||
!blurred &&
|
||||
typeof blurHash !== 'string' && (
|
||||
<Box className={css.AbsoluteContainer} alignItems="Center" justifyContent="Center">
|
||||
<Spinner variant="Secondary" />
|
||||
</Box>
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
import { style } from '@vanilla-extract/css';
|
||||
import { DefaultReset, config } from 'folds';
|
||||
import { keyframes, style } from '@vanilla-extract/css';
|
||||
import { DefaultReset, color, config } from 'folds';
|
||||
|
||||
export const RelativeBase = style([
|
||||
DefaultReset,
|
||||
{
|
||||
position: 'relative',
|
||||
display: 'flex',
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
maxWidth: '100%',
|
||||
maxHeight: '100%',
|
||||
borderRadius: '7px',
|
||||
@@ -16,9 +18,13 @@ export const RelativeBase = style([
|
||||
export const AbsoluteContainer = style([
|
||||
DefaultReset,
|
||||
{
|
||||
position: 'absolute',
|
||||
inset: 0,
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
maxWidth: '100%',
|
||||
maxHeight: '100%',
|
||||
borderRadius: 'inherit',
|
||||
@@ -34,6 +40,7 @@ export const AbsoluteFooter = style([
|
||||
bottom: config.space.S100,
|
||||
left: config.space.S100,
|
||||
right: config.space.S100,
|
||||
zIndex: 1,
|
||||
},
|
||||
]);
|
||||
|
||||
@@ -43,3 +50,67 @@ export const Blur = style([
|
||||
filter: 'blur(44px)',
|
||||
},
|
||||
]);
|
||||
|
||||
const shimmer = keyframes({
|
||||
'0%': {
|
||||
backgroundPosition: '200% 0',
|
||||
},
|
||||
'100%': {
|
||||
backgroundPosition: '-200% 0',
|
||||
},
|
||||
});
|
||||
|
||||
/** Soft fallback when no blurhash is available. */
|
||||
export const MediaSkeleton = style([
|
||||
DefaultReset,
|
||||
{
|
||||
position: 'absolute',
|
||||
inset: 0,
|
||||
borderRadius: 'inherit',
|
||||
backgroundImage: `linear-gradient(
|
||||
90deg,
|
||||
${color.SurfaceVariant.Container} 0%,
|
||||
${color.SurfaceVariant.ContainerHover} 40%,
|
||||
${color.SurfaceVariant.Container} 80%
|
||||
)`,
|
||||
backgroundSize: '200% 100%',
|
||||
animation: `${shimmer} 1.4s ease-in-out infinite`,
|
||||
},
|
||||
]);
|
||||
|
||||
const blurhashFadeIn = keyframes({
|
||||
from: {
|
||||
opacity: 0,
|
||||
},
|
||||
to: {
|
||||
opacity: 1,
|
||||
},
|
||||
});
|
||||
|
||||
/** Soft blurhash layer that fills the reserved media box. */
|
||||
export const BlurhashPlaceholder = style([
|
||||
DefaultReset,
|
||||
{
|
||||
position: 'absolute',
|
||||
inset: 0,
|
||||
overflow: 'hidden',
|
||||
borderRadius: 'inherit',
|
||||
zIndex: 0,
|
||||
// Soften the decode so it reads as color blobs; slight scale hides blur edges.
|
||||
filter: 'blur(14px)',
|
||||
transform: 'scale(1.06)',
|
||||
opacity: 0,
|
||||
animation: `${blurhashFadeIn} 560ms cubic-bezier(0.22, 1, 0.36, 1) forwards`,
|
||||
},
|
||||
]);
|
||||
|
||||
/** Media starts invisible and fades in once loaded over the placeholder. */
|
||||
export const MediaFadeIn = style({
|
||||
zIndex: 1,
|
||||
opacity: 0,
|
||||
transition: 'opacity 520ms cubic-bezier(0.22, 1, 0.36, 1)',
|
||||
});
|
||||
|
||||
export const MediaFadeInLoaded = style({
|
||||
opacity: 1,
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user