Show cached spaces on the loading splash until the chats are ready
Trigger cinny-mobile / dispatch (push) Successful in 1s
Trigger cinny-mobile / dispatch (push) Successful in 1s
The splash hid as soon as sync reported Prepared, so the first paint after it disappeared showed the empty state. Hide only once the room-list atoms actually contain chats, and bind those atoms while the splash is still up so the first paint is already populated. Also fixes the ClientEvent.Sync handler signature: data is the third argument, so reading it as the second made fromCache always undefined.
This commit is contained in:
@@ -0,0 +1,128 @@
|
||||
import { Avatar, AvatarFallback, AvatarImage, Box, Spinner, Text, color } from 'folds';
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import { ClientEvent, MatrixClient, Room } from 'matrix-js-sdk';
|
||||
import { SplashScreen } from '../../components/splash-screen';
|
||||
import { getAccountData, getMDirects, getRoomAvatarUrl, isSpace } from '../../utils/room';
|
||||
import { AccountDataEvent } from '../../../types/matrix/accountData';
|
||||
import { nameInitials } from '../../utils/common';
|
||||
import colorMXID from '../../../util/colorMXID';
|
||||
import * as css from './ClientLoading.css';
|
||||
|
||||
type CachedChats = {
|
||||
spaces: Room[];
|
||||
directs: number;
|
||||
};
|
||||
|
||||
const getSnapshot = (mx: MatrixClient): CachedChats => {
|
||||
const rooms = mx.getRooms();
|
||||
const mDirectEvent = getAccountData(mx, AccountDataEvent.Direct);
|
||||
const directs = mDirectEvent ? getMDirects(mDirectEvent) : new Set<string>();
|
||||
|
||||
return {
|
||||
spaces: rooms
|
||||
.filter((room) => isSpace(room) && room.getMyMembership() === 'join')
|
||||
.sort((a, b) => (a.name ?? '').localeCompare(b.name ?? '')),
|
||||
directs: rooms.filter((room) => directs.has(room.roomId)).length,
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
* Cached rooms are restored asynchronously from the IndexedDB store, so poll
|
||||
* while connecting to show the user's spaces as soon as they become available.
|
||||
*/
|
||||
function useCachedChats(mx?: MatrixClient): CachedChats {
|
||||
const [snapshot, setSnapshot] = useState<CachedChats>(() =>
|
||||
mx ? getSnapshot(mx) : { spaces: [], directs: 0 },
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
if (!mx) return undefined;
|
||||
|
||||
const update = () => setSnapshot(getSnapshot(mx));
|
||||
update();
|
||||
|
||||
const timer = setInterval(update, 400);
|
||||
mx.on(ClientEvent.Room, update);
|
||||
mx.on(ClientEvent.AccountData, update);
|
||||
|
||||
return () => {
|
||||
clearInterval(timer);
|
||||
mx.removeListener(ClientEvent.Room, update);
|
||||
mx.removeListener(ClientEvent.AccountData, update);
|
||||
};
|
||||
}, [mx]);
|
||||
|
||||
return snapshot;
|
||||
}
|
||||
|
||||
function SplashSpaceAvatar({ mx, room, index }: { mx: MatrixClient; room: Room; index: number }) {
|
||||
// Authenticated media needs the full client context, which is not available
|
||||
// while loading; fall back to initials when the plain URL fails.
|
||||
const src = getRoomAvatarUrl(mx, room, 96);
|
||||
const [error, setError] = useState(false);
|
||||
|
||||
return (
|
||||
<Avatar
|
||||
size="300"
|
||||
radii="400"
|
||||
className={css.SplashSpace}
|
||||
style={{ animationDelay: `${Math.min(index * 80, 640)}ms` }}
|
||||
>
|
||||
{src && !error ? (
|
||||
<AvatarImage
|
||||
className={css.SplashSpaceImage}
|
||||
src={src}
|
||||
alt={room.name}
|
||||
onError={() => setError(true)}
|
||||
draggable={false}
|
||||
/>
|
||||
) : (
|
||||
<AvatarFallback
|
||||
className={css.SplashSpaceFallback}
|
||||
style={{ backgroundColor: colorMXID(room.roomId), color: color.Surface.Container }}
|
||||
>
|
||||
<Text size="H6">{nameInitials(room.name, 2)}</Text>
|
||||
</AvatarFallback>
|
||||
)}
|
||||
</Avatar>
|
||||
);
|
||||
}
|
||||
|
||||
const foundLine = (spaces: number, directs: number): string => {
|
||||
const parts = [];
|
||||
if (spaces > 0) parts.push(`Found ${spaces} ${spaces === 1 ? 'space' : 'spaces'}`);
|
||||
if (directs > 0) parts.push(`${directs} ${directs === 1 ? 'chat' : 'chats'}`);
|
||||
return parts.join(' · ');
|
||||
};
|
||||
|
||||
export function ClientLoading({ mx }: { mx?: MatrixClient }) {
|
||||
const { spaces, directs } = useCachedChats(mx);
|
||||
|
||||
return (
|
||||
<SplashScreen>
|
||||
<Box direction="Column" grow="Yes" alignItems="Center" justifyContent="Center" gap="400">
|
||||
<Spinner variant="Secondary" size="600" />
|
||||
<Text>Heating up</Text>
|
||||
{mx && (spaces.length > 0 || directs > 0) && (
|
||||
<>
|
||||
{spaces.length > 0 && (
|
||||
<Box className={css.SplashSpaces}>
|
||||
{spaces.map((space, index) => (
|
||||
<SplashSpaceAvatar key={space.roomId} mx={mx} room={space} index={index} />
|
||||
))}
|
||||
</Box>
|
||||
)}
|
||||
<Text
|
||||
size="T300"
|
||||
align="Center"
|
||||
className={css.SplashStatus}
|
||||
style={{ animationDelay: `${Math.min(spaces.length * 80, 640) + 120}ms` }}
|
||||
>
|
||||
{foundLine(spaces.length, directs)}
|
||||
</Text>
|
||||
</>
|
||||
)}
|
||||
</Box>
|
||||
</SplashScreen>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user