Skip to content

armgit / ente

Public Imported from GitHub
0

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

Polish Space feed and viewer interactions

Anand Baburajan4c746b643647
diff --git a/web/apps/space/src/components/AddFriendDialog.tsx b/web/apps/space/src/components/AddFriendDialog.tsx
index ac4f877e5c..c5cfcba7b8 100644
--- a/web/apps/space/src/components/AddFriendDialog.tsx
+++ b/web/apps/space/src/components/AddFriendDialog.tsx
@@ -1,8 +1,9 @@
-import { Box, Dialog } from "@mui/material";
+import { Box, Dialog, useMediaQuery } from "@mui/material";
import {
SpaceActionFeedbackIcon,
spaceActionDoneDurationMs,
} from "components/ActionFeedback";
+import { SpaceBottomSheetTransition } from "components/BottomSheetTransition";
import { SpaceShareInviteButton } from "components/ShareInviteButton";
import type { FriendProfile } from "data/friends";
import log from "ente-base/log";
@@ -43,6 +44,7 @@ export const SpaceAddFriendDialog: React.FC<SpaceAddFriendDialogProps> = ({
username: currentUsername,
}) => {
const titleID = React.useId();
+ const isBottomSheet = useMediaQuery("(max-width: 599px)");
const [username, setUsername] = React.useState("");
const [isSubmitting, setIsSubmitting] = React.useState(false);
const [isSent, setIsSent] = React.useState(false);
@@ -117,6 +119,11 @@ export const SpaceAddFriendDialog: React.FC<SpaceAddFriendDialogProps> = ({
onClose={isSubmitting ? undefined : onClose}
maxWidth={false}
aria-labelledby={titleID}
+ slots={
+ isBottomSheet
+ ? { transition: SpaceBottomSheetTransition }
+ : undefined
+ }
slotProps={{
paper: {
sx: {
diff --git a/web/apps/space/src/components/FileViewer.tsx b/web/apps/space/src/components/FileViewer.tsx
index a2926bbd5a..1c820a9321 100644
--- a/web/apps/space/src/components/FileViewer.tsx
+++ b/web/apps/space/src/components/FileViewer.tsx
@@ -36,6 +36,7 @@ import {
viewerOriginKey,
} from "components/viewer-transition";
import log from "ente-base/log";
+import { isSpaceIOS } from "hooks/use-pwa-install-prompt";
import type PhotoSwipe from "photoswipe";
import React from "react";
import type { SpaceInviteIntent } from "services/invite";
@@ -166,7 +167,12 @@ interface SpaceViewerDeleteSnapshot {
type DraftPostExitPhase = "idle" | "waiting-for-keyboard" | "animating";
+export interface SpaceFileViewerController {
+ close: () => void;
+}
+
interface SpaceFileViewerProps {
+ ref?: React.Ref<SpaceFileViewerController>;
closeOnSwipePastEnd?: boolean;
draftPhotoControls?: React.ReactNode;
onLoadPhoto?: SpacePostAssetURLLoader;
@@ -446,6 +452,7 @@ const SpaceViewerPhotoOverlay: React.FC<{
};
export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
+ ref,
closeOnSwipePastEnd = false,
draftPhotoControls,
onLoadPhoto,
@@ -798,6 +805,12 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
root.dataset.spaceViewerLeaving = "true";
};
+ React.useImperativeHandle(
+ ref,
+ () => ({ close: () => requestCloseRef.current() }),
+ [],
+ );
+
const requestAddFriendForPostAction = (intent: SpaceInviteIntent) => {
if (!onAddFriendForPostAction) return;
setAddFriendIntent(intent);
@@ -2655,7 +2668,9 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
data-space-viewer-bottom="true"
sx={{
alignItems: "stretch",
- bottom: "max(24px, calc(env(safe-area-inset-bottom) + 16px))",
+ bottom: isSpaceIOS()
+ ? "max(24px, calc(env(safe-area-inset-bottom) + 16px), calc(var(--space-keyboard-inset, 0px) + 16px))"
+ : "max(24px, calc(env(safe-area-inset-bottom) + 16px))",
display: "flex",
flexDirection: "column",
gap: "12px",
diff --git a/web/apps/space/src/components/viewer-transition.ts b/web/apps/space/src/components/viewer-transition.ts
index 7f8034f3c7..962c7f0b18 100644
--- a/web/apps/space/src/components/viewer-transition.ts
+++ b/web/apps/space/src/components/viewer-transition.ts
@@ -155,18 +155,17 @@ const createFlyer = (root: HTMLElement, src: string, base: ViewerRect) => {
const createRider = (flyer: HTMLElement, tile: HTMLElement) => {
const card = tile.closest("article");
- const header = card?.querySelector<HTMLElement>(
- "[data-space-viewer-header]",
+ const overlays = card?.querySelectorAll<HTMLElement>(
+ "[data-space-viewer-header-shade], [data-space-viewer-header], [data-space-viewer-overlay]",
);
- const shade = card?.querySelector<HTMLElement>(
- "[data-space-viewer-header-shade]",
- );
- if (header && shade) {
+ if (overlays?.length) {
const bounds = rectOf(tile);
const rider = document.createElement("div");
rider.setAttribute("aria-hidden", "true");
rider.inert = true;
- rider.append(shade.cloneNode(true), header.cloneNode(true));
+ rider.append(
+ ...Array.from(overlays, (overlay) => overlay.cloneNode(true)),
+ );
for (const element of rider.querySelectorAll("*"))
if (element instanceof HTMLElement)
element.style.animation = "none";
@@ -183,8 +182,7 @@ const createRider = (flyer: HTMLElement, tile: HTMLElement) => {
zIndex: "2",
});
flyer.after(rider);
- header.style.opacity = "0";
- shade.style.opacity = "0";
+ for (const overlay of overlays) overlay.style.opacity = "0";
return {
element: rider,
draw: ({ visible: v, radii }: ViewerPhotoState, t: number) => {
@@ -198,8 +196,7 @@ const createRider = (flyer: HTMLElement, tile: HTMLElement) => {
},
remove: () => rider.remove(),
reveal: () => {
- header.style.opacity = "";
- shade.style.opacity = "";
+ for (const overlay of overlays) overlay.style.opacity = "";
},
};
}
diff --git a/web/apps/space/src/screens/HomeScreen.tsx b/web/apps/space/src/screens/HomeScreen.tsx
index 45c9b09406..28f0c75390 100644
--- a/web/apps/space/src/screens/HomeScreen.tsx
+++ b/web/apps/space/src/screens/HomeScreen.tsx
@@ -16,6 +16,7 @@ import {
} from "components/feed-video-playback";
import {
SpaceFileViewer,
+ type SpaceFileViewerController,
type SpaceViewerPhoto,
type SpaceViewerPostActionMode,
} from "components/FileViewer";
@@ -64,7 +65,11 @@ import {
} from "styles/colors";
import { spaceTouchTargetSize } from "styles/touch-targets";
import { firstNameFrom, formatSpaceDate } from "utils/display";
-import { homeFeedEntries, type HomeFeedEntry } from "utils/home-feed";
+import {
+ homeFeedEntries,
+ homeFeedSeparatorBefore,
+ type HomeFeedEntry,
+} from "utils/home-feed";
import {
spacePostFrameAspectRatio,
spacePostPhotos,
@@ -158,6 +163,7 @@ interface FeedLayoutSnapshot {
interface FeedMotionListProps {
entries: HomeFeedEntry[];
presentedPostIdentities?: Set<string>;
+ separatorBefore?: string;
renderEntry: (entry: HomeFeedEntry) => React.ReactNode;
}
@@ -366,6 +372,36 @@ class FeedMotionList extends React.Component<FeedMotionListProps> {
width: "100%",
}}
>
+ {entry.identity == this.props.separatorBefore && (
+ <Box
+ role="separator"
+ aria-label="Earlier posts"
+ sx={{
+ alignItems: "center",
+ color: spaceTextMuted,
+ display: "flex",
+ height: 36,
+ justifyContent: "center",
+ mb: "12px",
+ }}
+ >
+ <svg
+ aria-hidden="true"
+ width="116"
+ height="12"
+ viewBox="0 0 116 12"
+ fill="none"
+ >
+ <path
+ d="M4 6 Q10 -2 16 6 T28 6 T40 6 T52 6 T64 6 T76 6 T88 6 T100 6 T112 6"
+ stroke="currentColor"
+ strokeOpacity="0.6"
+ strokeWidth="2.5"
+ strokeLinecap="round"
+ />
+ </svg>
+ </Box>
+ )}
{this.props.renderEntry(entry)}
</Box>
);
@@ -595,6 +631,7 @@ const FeedPhotoOverlay: React.FC<{
}> = ({ caption, photoIndex, photoCount }) => {
return (
<Box
+ data-space-viewer-overlay
sx={{
...feedPhotoCaptionTextSx,
bottom: 20,
@@ -1207,6 +1244,7 @@ const FeedItem: React.FC<FeedItemProps> = ({
>
{(photoCount > 1 || showSoundControl) && (
<Box
+ data-space-viewer-overlay
sx={{
alignItems: "center",
display: "flex",
@@ -1892,6 +1930,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
}) => {
const [selectedViewer, setSelectedViewer] =
useState<SelectedHomeViewer | null>(null);
+ const viewerRef = React.useRef<SpaceFileViewerController>(null);
const [feedPhotoIndices, setFeedPhotoIndices] = useState<
Record<number, number>
>({});
@@ -1953,9 +1992,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
const { clearBrowserBackState: clearSelectedPhotoHistory } =
useBrowserBackClose({
open: Boolean(selectedViewer),
- onClose: () => {
- closeSelectedPhoto();
- },
+ onClose: () => viewerRef.current?.close(),
stateKey: "space-feed-viewer",
});
const deleteSelectedPost = async () => {
@@ -2291,6 +2328,10 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
<>
<FeedMotionList
entries={feedEntries}
+ separatorBefore={homeFeedSeparatorBefore(
+ feedEntries,
+ feedSession?.previousNewestPost,
+ )}
presentedPostIdentities={
feedSession?.presentedPostIdentities
}
@@ -2481,6 +2522,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
</Box>
{selectedViewer && (
<SpaceFileViewer
+ ref={viewerRef}
closeOnSwipePastEnd
focusReplyOnOpen={selectedViewer.focusReplyOnOpen}
photo={selectedViewer.photo}
diff --git a/web/apps/space/src/screens/ProfileScreen.tsx b/web/apps/space/src/screens/ProfileScreen.tsx
index 9ad9427292..983d42453b 100644
--- a/web/apps/space/src/screens/ProfileScreen.tsx
+++ b/web/apps/space/src/screens/ProfileScreen.tsx
@@ -21,6 +21,7 @@ import { SpaceButtonSpinner } from "components/ButtonSpinner";
import { ConfirmationActionSheet } from "components/ConfirmationActionSheet";
import {
SpaceFileViewer,
+ type SpaceFileViewerController,
type SpaceViewerPhoto,
type SpaceViewerPostActionMode,
} from "components/FileViewer";
@@ -432,9 +433,10 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
if (!isPostPhotoOpening) postInputRef.current?.click();
};
const closeSelectedPost = () => setSelectedPost(null);
+ const viewerRef = React.useRef<SpaceFileViewerController>(null);
useBrowserBackClose({
open: Boolean(selectedPost),
- onClose: closeSelectedPost,
+ onClose: () => viewerRef.current?.close(),
stateKey: "space-profile-viewer",
});
const rememberLoadedPhotoDimensions = (
@@ -1434,6 +1436,7 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
</Box>
{selectedPost && (
<SpaceFileViewer
+ ref={viewerRef}
closeOnSwipePastEnd
photo={selectedPost.photo}
photos={profileViewerPhotos}
diff --git a/web/apps/space/src/services/feed-cache.ts b/web/apps/space/src/services/feed-cache.ts
index 61066711e6..a1f79e7dc5 100644
--- a/web/apps/space/src/services/feed-cache.ts
+++ b/web/apps/space/src/services/feed-cache.ts
@@ -29,6 +29,7 @@ export interface SpaceFeedCacheSnapshot {
export interface SpaceFeedSession {
presentedPostIdentities: Set<string>;
+ previousNewestPost?: Pick<SpacePost, "postId" | "timestampMs">;
}
const memoryCache = new Map<string, SpaceFeedCacheSnapshot | undefined>();
@@ -144,9 +145,20 @@ export const loadSpaceFeedSession = async (spaceId: string) => {
const generation = cacheGeneration;
const key = await cacheKey(spaceId);
if (!key || generation != cacheGeneration) return undefined;
+ const cached = await loadCachedSpaceFeed(spaceId);
+ if (generation != cacheGeneration) return undefined;
let session = feedSessions.get(key);
if (!session) {
- session = { presentedPostIdentities: new Set() };
+ const newestPost = cached?.items[0];
+ session = {
+ presentedPostIdentities: new Set(),
+ previousNewestPost: newestPost
+ ? {
+ postId: newestPost.postId,
+ timestampMs: newestPost.timestampMs,
+ }
+ : undefined,
+ };
feedSessions.set(key, session);
}
return session;
diff --git a/web/apps/space/src/utils/home-feed.ts b/web/apps/space/src/utils/home-feed.ts
index ef52d2a757..0f8646d54e 100644
--- a/web/apps/space/src/utils/home-feed.ts
+++ b/web/apps/space/src/utils/home-feed.ts
@@ -10,6 +10,28 @@ export type HomeFeedEntry =
}
| { identity: string; item: SpacePost; kind: "remote"; renderKey: string };
+export const homeFeedSeparatorBefore = (
+ entries: HomeFeedEntry[],
+ previousNewestPost: Pick<SpacePost, "postId" | "timestampMs"> | undefined,
+) => {
+ if (!previousNewestPost) return undefined;
+ let hasNewPosts = false;
+ for (const entry of entries) {
+ if (entry.kind != "remote") continue;
+ const post = entry.item;
+ if (
+ post.timestampMs > previousNewestPost.timestampMs ||
+ (post.timestampMs == previousNewestPost.timestampMs &&
+ post.postId > previousNewestPost.postId)
+ ) {
+ hasNewPosts = true;
+ } else {
+ return hasNewPosts ? entry.identity : undefined;
+ }
+ }
+ return undefined;
+};
+
export const homeFeedEntries = (
feedItems: SpacePost[],
localFeedPosts: LocalSpaceFeedPost[],
diff --git a/web/apps/space/tests/feed-cache.test.ts b/web/apps/space/tests/feed-cache.test.ts
index fa1a5a44d6..3386563066 100644
--- a/web/apps/space/tests/feed-cache.test.ts
+++ b/web/apps/space/tests/feed-cache.test.ts
@@ -305,6 +305,34 @@ test("feed entrance animations stay remembered across navigation and reset on re
expect(reopened.presentedPostIdentities.size).toBe(0);
});
+test("the new-post boundary survives navigation and advances on the next reload", async () => {
+ await cacheCurrentSpaceFeedPage("self", { items: [post(2), post(1)] });
+ clearSpaceFeedMemoryCache();
+ const session = (await loadSpaceFeedSession("self"))!;
+ expect(session.previousNewestPost).toEqual({ postId: 2, timestampMs: 2 });
+
+ await cacheCurrentSpaceFeedPage("self", {
+ items: [post(4), post(3), post(2), post(1)],
+ });
+ expect(await loadSpaceFeedSession("self")).toBe(session);
+ expect(session.previousNewestPost).toEqual({ postId: 2, timestampMs: 2 });
+
+ clearSpaceFeedMemoryCache();
+ expect((await loadSpaceFeedSession("self"))?.previousNewestPost).toEqual({
+ postId: 4,
+ timestampMs: 4,
+ });
+});
+
+test("a first visit has no new-post boundary", async () => {
+ const session = (await loadSpaceFeedSession("self"))!;
+ expect(session.previousNewestPost).toBeUndefined();
+ await cacheCurrentSpaceFeedPage("self", { items: [post(2), post(1)] });
+ expect(
+ (await loadSpaceFeedSession("self"))?.previousNewestPost,
+ ).toBeUndefined();
+});
+
test("feed animation sessions are isolated between accounts, spaces and servers", async () => {
const session = (await loadSpaceFeedSession("self"))!;
session.presentedPostIdentities.add("post:1");
diff --git a/web/apps/space/tests/home-feed.test.ts b/web/apps/space/tests/home-feed.test.ts
index bec18b6ca7..3e2d4967db 100644
--- a/web/apps/space/tests/home-feed.test.ts
+++ b/web/apps/space/tests/home-feed.test.ts
@@ -1,7 +1,10 @@
import { expect, test } from "vitest";
import type { SpacePost } from "../src/services/space";
import type { LocalSpaceFeedPost } from "../src/state/app-state";
-import { homeFeedEntries } from "../src/utils/home-feed";
+import {
+ homeFeedEntries,
+ homeFeedSeparatorBefore,
+} from "../src/utils/home-feed";
const post = (postId: number, timestampMs: number): SpacePost => ({
friendID: "friend",
@@ -97,3 +100,86 @@ test("own posts stay in the same feed after the local publication is removed", (
existing,
]);
});
+
+test.each([1, 3])(
+ "separates a refresh with %s new posts from the previous feed",
+ (count) => {
+ const previous = post(2, 200);
+ const newPosts = Array.from({ length: count }, (_, index) =>
+ post(count + 2 - index, 300 + count - index),
+ );
+ expect(
+ homeFeedSeparatorBefore(
+ homeFeedEntries([...newPosts, previous, post(1, 100)], []),
+ previous,
+ ),
+ ).toBe("post:2");
+ },
+);
+
+test("does not separate initial loads, unchanged refreshes, or older pages", () => {
+ const posts = [post(2, 200), post(1, 100)];
+ expect(
+ homeFeedSeparatorBefore(homeFeedEntries(posts, []), undefined),
+ ).toBeUndefined();
+ expect(
+ homeFeedSeparatorBefore(homeFeedEntries(posts, []), posts[0]),
+ ).toBeUndefined();
+ expect(
+ homeFeedSeparatorBefore(
+ homeFeedEntries([...posts, post(0, 50)], []),
+ posts[0],
+ ),
+ ).toBeUndefined();
+});
+
+test("keeps the boundary when the previously newest post has been deleted", () => {
+ expect(
+ homeFeedSeparatorBefore(
+ homeFeedEntries([post(3, 300), post(1, 100)], []),
+ post(2, 200),
+ ),
+ ).toBe("post:1");
+});
+
+test("waits for older posts when new posts fill the first page", () => {
+ const posts = [post(4, 400), post(3, 300)];
+ const previous = post(2, 200);
+ expect(
+ homeFeedSeparatorBefore(homeFeedEntries(posts, []), previous),
+ ).toBeUndefined();
+ expect(
+ homeFeedSeparatorBefore(
+ homeFeedEntries([...posts, previous, post(1, 100)], []),
+ previous,
+ ),
+ ).toBe("post:2");
+});
+
+test("uses post order to separate posts sharing a timestamp", () => {
+ const previous = post(2, 200);
+ expect(
+ homeFeedSeparatorBefore(
+ homeFeedEntries([post(3, 200), previous, post(1, 100)], []),
+ previous,
+ ),
+ ).toBe("post:2");
+});
+
+test("a local upload alone does not create a new-post boundary", () => {
+ const previous = post(2, 200);
+ const local: LocalSpaceFeedPost = {
+ id: "upload",
+ post: post(4, 400),
+ status: "ready",
+ };
+ expect(
+ homeFeedSeparatorBefore(homeFeedEntries([previous], [local]), previous),
+ ).toBeUndefined();
+ expect(
+ homeFeedSeparatorBefore(
+ homeFeedEntries([post(3, 300), previous], [local]),
+ previous,
+ ),
+ ).toBe("post:2");
+});