Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Improve feed card loading transitions

Anand Baburajan77adcc7c2428
diff --git a/web/apps/space/src/screens/HomeScreen.tsx b/web/apps/space/src/screens/HomeScreen.tsx
index 923019c8e7..b0d8d13dde 100644
--- a/web/apps/space/src/screens/HomeScreen.tsx
+++ b/web/apps/space/src/screens/HomeScreen.tsx
@@ -198,15 +198,6 @@ interface FeedItemProps {
viewerLiked: boolean;
}
-interface FeedSkeletonItemProps {
- aspectRatio: string;
- isOwnPost?: boolean;
- pb?: string;
- rootRef?: React.Ref<HTMLElement>;
- showFooter?: boolean;
- thumbHashDataURL?: string;
-}
-
interface AddedFriendToastProps {
message: string;
onClose?: () => void;
@@ -368,182 +359,6 @@ const useHideHeaderOnScrollDirection = () => {
return isHidden;
};
-const FeedSkeletonItem: React.FC<FeedSkeletonItemProps> = ({
- aspectRatio,
- isOwnPost = false,
- pb = "8px",
- rootRef,
- showFooter = true,
- thumbHashDataURL,
-}) => (
- <Box
- ref={rootRef}
- component="article"
- aria-hidden
- sx={{
- bgcolor: feedCardBackground,
- borderRadius: "17px",
- boxSizing: "border-box",
- display: "flex",
- flexDirection: "column",
- maxWidth: "100%",
- minWidth: 0,
- overflow: "hidden",
- pb,
- pl: "5px",
- pr: "5px",
- pt: "5px",
- width: "100%",
- }}
- >
- <Box
- sx={{
- aspectRatio,
- borderRadius: "13px",
- maxWidth: "100%",
- minWidth: 0,
- overflow: "hidden",
- position: "relative",
- width: "100%",
- }}
- >
- {thumbHashDataURL ? (
- <Box
- component="img"
- alt=""
- aria-hidden
- src={thumbHashDataURL}
- sx={{
- display: "block",
- filter: "blur(14px)",
- height: "100%",
- objectFit: "cover",
- objectPosition: "center",
- transform: "scale(1.08)",
- width: "100%",
- }}
- />
- ) : (
- <Skeleton
- variant="rectangular"
- sx={{
- aspectRatio,
- bgcolor: feedSkeletonElementBackground,
- display: "block",
- height: "100%",
- transform: "none",
- width: "100%",
- }}
- />
- )}
- <Box
- sx={{
- alignItems: "center",
- display: "grid",
- gap: "8px",
- gridTemplateColumns: `${feedAvatarSize}px minmax(0, 1fr)`,
- left: 12,
- position: "absolute",
- right: 12,
- top: 12,
- }}
- >
- <Skeleton
- variant="circular"
- sx={{
- bgcolor: "rgba(255, 255, 255, 0.72)",
- height: feedAvatarSize,
- transform: "none",
- width: feedAvatarSize,
- }}
- />
- <Box sx={{ minWidth: 0 }}>
- <Skeleton
- variant="rectangular"
- sx={{
- bgcolor: "rgba(255, 255, 255, 0.72)",
- borderRadius: "999px",
- height: 10,
- mb: "5px",
- transform: "none",
- width: 72,
- }}
- />
- <Skeleton
- variant="rectangular"
- sx={{
- bgcolor: "rgba(255, 255, 255, 0.56)",
- borderRadius: "999px",
- height: 8,
- transform: "none",
- width: 42,
- }}
- />
- </Box>
- </Box>
- </Box>
- {showFooter && (
- <Box
- sx={{
- alignItems: "center",
- boxSizing: "border-box",
- display: "grid",
- gap: "8px",
- gridTemplateColumns: isOwnPost
- ? "minmax(0, 1fr)"
- : "minmax(0, 1fr) auto",
- minHeight: feedLikeActionSize,
- mt: "8px",
- pl: "9px",
- width: "100%",
- }}
- >
- <Skeleton
- variant="rectangular"
- sx={{
- bgcolor: feedActionBackground,
- borderRadius: "999px",
- height: 12,
- maxWidth: 176,
- transform: "none",
- width: "60%",
- }}
- />
- {!isOwnPost && (
- <Box
- sx={{
- alignItems: "center",
- display: "flex",
- gap: "6px",
- justifyContent: "flex-end",
- }}
- >
- <Skeleton
- variant="circular"
- sx={{
- bgcolor: feedActionBackground,
- height: feedLikeActionSize,
- transform: "none",
- width: feedLikeActionSize,
- }}
- />
- <Skeleton
- variant="circular"
- sx={{
- bgcolor: feedActionBackground,
- height: feedLikeActionSize,
- mr: "9px",
- transform: "none",
- width: feedLikeActionSize,
- }}
- />
- </Box>
- )}
- </Box>
- )}
- </Box>
-);
-
const usePostingDotCount = (isPosting: boolean) => {
const [dotCount, setDotCount] = useState(1);
@@ -712,8 +527,8 @@ const FeedItem: React.FC<FeedItemProps> = ({
: dimensionsFromAspectRatio(aspectRatio);
const feedPhotoFrameDimensions =
feedPhotoFrameDimensionsFor(photoDimensions);
- const isFeedItemReady =
- Boolean(displayImageUrl) && decodedPhoto.ready && isAvatarReady;
+ const isPhotoReady = Boolean(displayImageUrl) && decodedPhoto.ready;
+ const canOpenPhoto = isPhotoReady && Boolean(onOpenPhoto);
const [showResolvedPhoto, setShowResolvedPhoto] = useState(false);
const decodedPhotoHeight = decodedPhoto.height;
const decodedPhotoSrc = decodedPhoto.src;
@@ -742,7 +557,7 @@ const FeedItem: React.FC<FeedItemProps> = ({
});
};
const openPhoto = (focusReplyOnOpen = false) => {
- if (!displayImageUrl) return;
+ if (!canOpenPhoto || !displayImageUrl) return;
onOpenPhoto?.(
{
@@ -847,7 +662,7 @@ const FeedItem: React.FC<FeedItemProps> = ({
React.useEffect(() => {
setShowResolvedPhoto(false);
- if (!isFeedItemReady) return;
+ if (!isPhotoReady) return;
if (!thumbHashDataURL) {
setShowResolvedPhoto(true);
return;
@@ -857,20 +672,7 @@ const FeedItem: React.FC<FeedItemProps> = ({
setShowResolvedPhoto(true),
);
return () => window.cancelAnimationFrame(frameID);
- }, [displayImageUrl, isFeedItemReady, thumbHashDataURL]);
-
- if (!isFeedItemReady) {
- return (
- <FeedSkeletonItem
- aspectRatio={`${feedPhotoFrameDimensions.width} / ${feedPhotoFrameDimensions.height}`}
- isOwnPost={isOwnPost}
- pb={isOwnPost ? "5px" : "8px"}
- rootRef={rootRef}
- showFooter={showFooter}
- thumbHashDataURL={thumbHashDataURL}
- />
- );
- }
+ }, [displayImageUrl, isPhotoReady, thumbHashDataURL]);
return (
<Box
@@ -908,12 +710,13 @@ const FeedItem: React.FC<FeedItemProps> = ({
component="button"
type="button"
aria-label={`Open ${name} photo`}
+ disabled={!canOpenPhoto}
onClick={() => openPhoto()}
sx={{
appearance: "none",
bgcolor: "transparent",
border: 0,
- cursor: onOpenPhoto ? "pointer" : "default",
+ cursor: canOpenPhoto ? "pointer" : "default",
display: "block",
height: "100%",
maxWidth: "100%",
@@ -928,6 +731,18 @@ const FeedItem: React.FC<FeedItemProps> = ({
},
}}
>
+ {!thumbHashDataURL && !isPhotoReady && (
+ <Skeleton
+ variant="rectangular"
+ sx={{
+ bgcolor: feedSkeletonElementBackground,
+ display: "block",
+ height: "100%",
+ transform: "none",
+ width: "100%",
+ }}
+ />
+ )}
{thumbHashDataURL ? (
<Box
component="img"
@@ -947,31 +762,34 @@ const FeedItem: React.FC<FeedItemProps> = ({
}}
/>
) : null}
- <Box
- component="img"
- alt={`${name} post`}
- src={displayImageUrl}
- onLoad={rememberLoadedPhotoDimensions}
- sx={{
- display: "block",
- height: "100%",
- maxWidth: "100%",
- minWidth: 0,
- objectFit: "cover",
- objectPosition: "center",
- opacity: showResolvedPhoto ? 1 : 0,
- position: "relative",
- transition: thumbHashDataURL
- ? "opacity 220ms ease"
- : "none",
- width: "100%",
- zIndex: 1,
- "@media (prefers-reduced-motion: reduce)": {
- opacity: 1,
- transition: "none",
- },
- }}
- />
+ {isPhotoReady && (
+ <Box
+ component="img"
+ alt={`${name} post`}
+ src={displayImageUrl}
+ onLoad={rememberLoadedPhotoDimensions}
+ sx={{
+ display: "block",
+ height: "100%",
+ inset: 0,
+ maxWidth: "100%",
+ minWidth: 0,
+ objectFit: "cover",
+ objectPosition: "center",
+ opacity: showResolvedPhoto ? 1 : 0,
+ position: "absolute",
+ transition: thumbHashDataURL
+ ? "opacity 220ms ease"
+ : "none",
+ width: "100%",
+ zIndex: 1,
+ "@media (prefers-reduced-motion: reduce)": {
+ opacity: 1,
+ transition: "none",
+ },
+ }}
+ />
+ )}
</Box>
<Box
aria-hidden
@@ -1014,7 +832,7 @@ const FeedItem: React.FC<FeedItemProps> = ({
sx={{
alignItems: "center",
appearance: "none",
- bgcolor: feedSkeletonElementBackground,
+ bgcolor: "transparent",
border: 0,
borderRadius: "50%",
cursor: canOpenAuthor ? "pointer" : "default",
@@ -1033,10 +851,43 @@ const FeedItem: React.FC<FeedItemProps> = ({
},
}}
>
- <SpaceAvatarImage
- src={displayAvatarUrl}
- borderRadius="50%"
+ <Box
+ aria-hidden
+ sx={{
+ bgcolor: "rgba(255, 255, 255, 0.35)",
+ borderRadius: "50%",
+ inset: 0,
+ position: "absolute",
+ zIndex: 0,
+ }}
/>
+ {isAvatarReady ? (
+ <Box
+ key={displayAvatarUrl ?? "default-avatar"}
+ sx={{
+ "@keyframes spaceFeedAvatarFade": {
+ from: { opacity: 0 },
+ to: { opacity: 1 },
+ },
+ animation:
+ "spaceFeedAvatarFade 180ms ease-out both",
+ borderRadius: "50%",
+ height: feedAvatarSize,
+ overflow: "hidden",
+ position: "relative",
+ width: feedAvatarSize,
+ zIndex: 1,
+ "@media (prefers-reduced-motion: reduce)": {
+ animation: "none",
+ },
+ }}
+ >
+ <SpaceAvatarImage
+ src={displayAvatarUrl}
+ borderRadius="50%"
+ />
+ </Box>
+ ) : null}
<Box
aria-hidden
sx={{
@@ -1045,6 +896,7 @@ const FeedItem: React.FC<FeedItemProps> = ({
inset: -2,
pointerEvents: "none",
position: "absolute",
+ zIndex: 2,
}}
/>
</Box>
@@ -1178,7 +1030,7 @@ const FeedItem: React.FC<FeedItemProps> = ({
component="button"
type="button"
aria-label={`Open ${name} post`}
- disabled={!onOpenPhoto}
+ disabled={!canOpenPhoto}
onClick={() => openPhoto()}
title={displayCaption}
sx={{
@@ -1186,7 +1038,7 @@ const FeedItem: React.FC<FeedItemProps> = ({
appearance: "none",
bgcolor: "transparent",
border: 0,
- cursor: onOpenPhoto ? "pointer" : "default",
+ cursor: canOpenPhoto ? "pointer" : "default",
display: "block",
p: 0,
textAlign: "left",
@@ -1217,6 +1069,7 @@ const FeedItem: React.FC<FeedItemProps> = ({
component="button"
type="button"
aria-label={`Reply to ${firstName}'s post`}
+ disabled={!canOpenPhoto}
onClick={() => openPhoto(true)}
sx={{
alignItems: "center",
@@ -1225,7 +1078,9 @@ const FeedItem: React.FC<FeedItemProps> = ({
border: 0,
borderRadius: "50%",
color: textBase,
- cursor: "pointer",
+ cursor: canOpenPhoto
+ ? "pointer"
+ : "default",
display: "inline-flex",
height: feedLikeActionSize,
justifyContent: "center",
@@ -1238,7 +1093,7 @@ const FeedItem: React.FC<FeedItemProps> = ({
outline: `2px solid ${green}`,
outlineOffset: 2,
},
- "&:hover": {
+ "&:not(:disabled):hover": {
bgcolor: feedActionBackgroundHover,
},
}}