π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[space][web] Revert viewer playback changes
Anand Baburajanea498d621397
diff --git a/web/apps/space/src/components/FileViewer.tsx b/web/apps/space/src/components/FileViewer.tsxindex 30c51c4547..3619b862e7 100644--- a/web/apps/space/src/components/FileViewer.tsx+++ b/web/apps/space/src/components/FileViewer.tsx@@ -605,10 +605,6 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({closing: false,landed: false,});- const initialVideoRef = React.useRef<{- initialTime: number;- initialFrame?: HTMLCanvasElement;- }>(undefined);const isSyncingPhotosRef = React.useRef(false);const videoContentsRef = React.useRef(new Map<object, ReturnType<typeof createSpaceVideoContent>>(),@@ -1460,13 +1456,6 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({);if (!origin) return stopMotion;- const video = origin.querySelector("video");- if (item.video && video && !video.paused && !video.ended)- initialVideoRef.current = {- initialTime: video.currentTime,- initialFrame: viewerVideoFrame(video),- };-const width = item.width ?? defaultPhotoWidth;const height = item.height ?? defaultPhotoHeight;const flight = playViewerOpen(@@ -1552,19 +1541,10 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({event.preventDefault();videos.get(event.content)?.destroy();const item = viewerPhotosRef.current[event.content.index]!;- const initialVideo =- event.content.index == initialPhotoIndexRef.current- ? initialVideoRef.current- : undefined;- if (initialVideo) initialVideoRef.current = undefined;const video = createSpaceVideoContent(item,(asset) => videoLoaderRef.current!(asset),- {- ...initialVideo,- showDuration: isDraftPost,- onPlay: () => motionRef.current.flight?.landed,- },+ { showDuration: isDraftPost },);event.content.element = video.element;event.content.onLoaded();diff --git a/web/apps/space/src/components/PostVideoContent.ts b/web/apps/space/src/components/PostVideoContent.tsindex 33045d5ad2..ab0d297125 100644--- a/web/apps/space/src/components/PostVideoContent.ts+++ b/web/apps/space/src/components/PostVideoContent.ts@@ -13,16 +13,12 @@ export const createSpaceVideoContent = ({inline = false,showDuration = false,- initialTime,- initialFrame,onPlay,onPause,onTogglePlayback,}: {inline?: boolean;showDuration?: boolean;- initialTime?: number;- initialFrame?: HTMLCanvasElement;onPlay?: () => Promise<void> | void;onPause?: () => void;onTogglePlayback?: (play: boolean) => void;@@ -118,30 +114,19 @@ export const createSpaceVideoContent = (supportMessage.style.marginTop = "2px";errorMessage.append(errorTitle, supportMessage);element.append(video);- let cover: HTMLDivElement | undefined;- if (!inline && (item.imageUrl || initialFrame)) {- cover = document.createElement("div");+ let cover: HTMLImageElement | undefined;+ if (!inline && item.imageUrl) {+ cover = document.createElement("img");+ cover.src = item.imageUrl;+ cover.alt = "";Object.assign(cover.style, {position: "absolute",inset: "0",- opacity: "1",+ width: "100%",+ height: "100%",+ objectFit: "contain",pointerEvents: "none",});- if (item.imageUrl) {- const image = document.createElement("img");- image.src = item.imageUrl;- image.alt = "";- cover.append(image);- }- if (initialFrame) cover.append(initialFrame);- for (const layer of cover.children)- Object.assign((layer as HTMLElement).style, {- position: "absolute",- inset: "0",- width: "100%",- height: "100%",- objectFit: "contain",- });element.append(cover);}element.append(button, loading, errorMessage);@@ -167,7 +152,6 @@ export const createSpaceVideoContent = (let retryTimer: ReturnType<typeof setTimeout> | undefined;let loadingTimer: ReturnType<typeof setTimeout> | undefined;let playbackTimeout: ReturnType<typeof setTimeout> | undefined;- let coverFrame: number | undefined;const hideLoading = () => {clearTimeout(loadingTimer);loadingTimer = undefined;@@ -198,8 +182,6 @@ export const createSpaceVideoContent = (};const showPlayButton = () => {hideLoading();- if (coverFrame != undefined) video.cancelVideoFrameCallback(coverFrame);- coverFrame = undefined;const blocked = Boolean(failure);const label = blocked ? "Video unavailable" : "Play video";button.setAttribute("aria-hidden", String(!active || blocked));@@ -217,20 +199,6 @@ export const createSpaceVideoContent = (button.disabled = false;button.setAttribute("aria-hidden", "true");video.setAttribute("aria-label", "Pause video");- if (cover && cover.style.opacity != "0" && coverFrame == undefined) {- const reveal = () => {- coverFrame = undefined;- cover.style.transition = window.matchMedia(- "(prefers-reduced-motion: reduce)",- ).matches- ? "none"- : "opacity 150ms ease-out";- cover.style.opacity = "0";- };- if (typeof video.requestVideoFrameCallback == "function")- coverFrame = video.requestVideoFrameCallback(reveal);- else reveal();- }};const pause = () => {generation++;@@ -242,12 +210,7 @@ export const createSpaceVideoContent = (sourceGeneration++;pendingLoad = undefined;pause();- initialTime = undefined;- initialFrame?.remove();- if (cover) {- cover.style.transition = "none";- cover.style.opacity = "1";- }+ if (cover) cover.hidden = false;if (item.imageUrl) video.poster = item.imageUrl;video.removeAttribute("src");video.load();@@ -403,11 +366,10 @@ export const createSpaceVideoContent = (else reset();};video.onloadedmetadata = () => {- const time = initialTime ?? media.start;- if (time) video.currentTime = time;- initialTime = undefined;+ if (media.start) video.currentTime = media.start;};video.onloadeddata = () => {+ if (cover) cover.hidden = true;video.removeAttribute("poster");};video.ontimeupdate = () => {diff --git a/web/apps/space/src/components/viewer-transition.ts b/web/apps/space/src/components/viewer-transition.tsindex 65b4989952..a04fa44a80 100644--- a/web/apps/space/src/components/viewer-transition.ts+++ b/web/apps/space/src/components/viewer-transition.ts@@ -316,14 +316,6 @@ export const playViewerOpen = (let rider: ReturnType<typeof createRider>;let started = false;let disposed = false;- let resolveLanded!: () => void;- const landed = new Promise<void>((resolve) => {- resolveLanded = resolve;- });- const land = () => {- resolveLanded();- onLanded();- };let stopSpring: () => void = () => undefined;const drawAt = (value: number) => {const state = mixPhotoState(from, end, value);@@ -337,7 +329,6 @@ export const playViewerOpen = (const release = () => {disposed = true;- resolveLanded();flyer.remove();rider?.remove();};@@ -366,16 +357,15 @@ export const playViewerOpen = (drawAt(t);setProgress(t);},- onDone: land,+ onDone: onLanded,});},() => {- if (!disposed) land();+ if (!disposed) onLanded();},);return {src: flightSrc,- landed,current: () => (started ? mixPhotoState(from, end, t) : undefined),release,reveal,diff --git a/web/apps/space/tests/post-video-content.test.ts b/web/apps/space/tests/post-video-content.test.tsindex b852c0892e..511be25a17 100644--- a/web/apps/space/tests/post-video-content.test.ts+++ b/web/apps/space/tests/post-video-content.test.ts@@ -17,7 +17,7 @@ vi.mock("../src/services/media-cache", () => ({const loadCached = vi.mocked(cachedSpaceMediaBlobURLIfPresent);class Element extends EventTarget {- style: Record<string, string> = {};+ style = {};attributes = new Map<string, string>();children: Element[] = [];disabled = false;@@ -38,7 +38,6 @@ class Element extends EventTarget {append(...children: Element[]) {this.children.push(...children);}- remove = vi.fn();}class Video extends Element {@@ -49,24 +48,8 @@ class Video extends Element {onpause?: () => void;onplaying?: () => void;onloadeddata?: () => void;- onloadedmetadata?: () => void;onended?: () => void;ontimeupdate?: () => void;- frameCallbacks = new Map<number, () => void>();- nextFrame = 0;- requestVideoFrameCallback = vi.fn((callback: () => void) => {- const id = ++this.nextFrame;- this.frameCallbacks.set(id, callback);- return id;- });- cancelVideoFrameCallback = vi.fn((id: number) => {- this.frameCallbacks.delete(id);- });- presentFrame() {- const callbacks = [...this.frameCallbacks.values()];- this.frameCallbacks.clear();- callbacks.forEach((callback) => callback());- }get poster() {return this.getAttribute("poster") ?? "";}@@ -86,9 +69,7 @@ class Video extends Element {this.paused = true;this.onpause?.();}- load = vi.fn(() => {- this.currentTime = 0;- });+ load = vi.fn();}let contents: ReturnType<typeof createSpaceVideoContent>[];@@ -111,7 +92,6 @@ beforeEach(() => {tag == "video" ? new Video() : new Element(tag),}),);- vi.stubGlobal("window", { matchMedia: vi.fn(() => ({ matches: false })) });});afterEach(() => {@@ -147,7 +127,7 @@ const create = (const children = (content.element as unknown as Element).children;const [video] = children;const [button, loading, error] = children.slice(-3);- const cover = children.length == 5 ? children[1] : undefined;+ const cover = children.find((child) => child.tagName == "img");return {...content,video: video as Video,@@ -181,7 +161,7 @@ test("a video can download and play before its cover image is available", asyncexpect(content.video.getAttribute("poster")).toBeNull();});-test("a preloaded viewer video dissolves its cover only after playback presents a frame", async () => {+test("a preloaded viewer video shows its decoded frame before activation", async () => {loadCached.mockResolvedValue("blob:cached-video");const content = create(false);await content.preload({ cachedOnly: true });@@ -192,134 +172,22 @@ test("a preloaded viewer video dissolves its cover only after playback presents);expect(content.video.getAttribute("src")).toBe("blob:cached-video");expect(content.video.poster).toBe("blob:poster");- expect(content.cover?.style.opacity).toBe("1");+ expect(content.cover?.hidden).toBe(false);content.video.onloadeddata?.();expect(content.video.getAttribute("poster")).toBeNull();- expect(content.cover?.style.opacity).toBe("1");+ expect(content.cover?.hidden).toBe(true);expect(content.video.play).not.toHaveBeenCalled();content.play();await vi.advanceTimersByTimeAsync(0);- expect(content.cover?.style.opacity).toBe("1");- content.video.presentFrame();- expect(content.cover?.style.opacity).toBe("0");- expect(content.cover?.style.transition).toBe("opacity 150ms ease-out");content.deactivate();expect(content.video.getAttribute("poster")).toBeNull();- expect(content.cover?.style.opacity).toBe("0");+ expect(content.cover?.hidden).toBe(true);content.play();await vi.advanceTimersByTimeAsync(0);expect(content.video.getAttribute("poster")).toBeNull();expect(load).not.toHaveBeenCalled();});-test("viewer playback dissolves its cover without video-frame callback APIs", async () => {- const content = create(false);- Reflect.deleteProperty(content.video, "requestVideoFrameCallback");- Reflect.deleteProperty(content.video, "cancelVideoFrameCallback");- await content.preload();- content.video.onloadeddata?.();- expect(content.cover?.style.opacity).toBe("1");- content.play();- await vi.advanceTimersByTimeAsync(0);- expect(content.video.paused).toBe(false);- expect(content.video.getAttribute("src")).toBe("blob:video");- expect(content.error.hidden).toBe(true);- expect(content.cover?.style.opacity).toBe("0");- expect(content.cover?.style.transition).toBe("opacity 150ms ease-out");- content.pause();- expect(content.video.paused).toBe(true);- content.play(true);- await vi.advanceTimersByTimeAsync(0);- expect(content.video.paused).toBe(false);- expect(content.error.hidden).toBe(true);- expect(load).toHaveBeenCalledOnce();-});--test("viewer playback loads during the opening animation and waits for it to land", async () => {- const opening = Promise.withResolvers<undefined>();- const content = create(false, "blob:poster", {- onPlay: () => opening.promise,- });- content.play();- await vi.advanceTimersByTimeAsync(0);- expect(load).toHaveBeenCalledOnce();- content.video.onloadeddata?.();- content.video.presentFrame();- expect(content.cover?.style.opacity).toBe("1");- expect(content.video.play).not.toHaveBeenCalled();- opening.resolve(undefined);- await vi.advanceTimersByTimeAsync(0);- expect(content.video.play).toHaveBeenCalledOnce();- expect(content.cover?.style.opacity).toBe("1");- content.video.presentFrame();- expect(content.cover?.style.opacity).toBe("0");-});--test("a viewer opened from the feed resumes at the captured time and replays from the start", async () => {- const frame = new Element("canvas");- const content = create(false, "blob:poster", {- initialTime: 0.4,- initialFrame: frame as unknown as HTMLCanvasElement,- });- expect(content.cover?.children).toContain(frame);- await content.preload();- content.video.onloadedmetadata?.();- expect(content.video.currentTime).toBe(0.4);- content.play();- await vi.advanceTimersByTimeAsync(0);- expect(content.video.currentTime).toBe(0.4);- content.video.presentFrame();- content.video.onended?.();- expect(frame.remove).toHaveBeenCalledOnce();- expect(content.cover?.style.opacity).toBe("1");- content.play(true);- await vi.advanceTimersByTimeAsync(0);- content.video.onloadedmetadata?.();- expect(content.video.currentTime).toBe(0);-});--test("blocked viewer autoplay keeps the cover until manual playback presents a frame", async () => {- const content = create(false);- content.video.play.mockRejectedValueOnce(- new DOMException("Blocked", "NotAllowedError"),- );- content.play();- await vi.advanceTimersByTimeAsync(0);- content.video.onloadeddata?.();- content.video.presentFrame();- expect(content.cover?.style.opacity).toBe("1");- expect(content.button.getAttribute("aria-hidden")).toBe("false");- content.play(true);- await vi.advanceTimersByTimeAsync(0);- content.video.presentFrame();- expect(content.cover?.style.opacity).toBe("0");-});--test.each(["deactivate", "destroy"] as const)(- "%s cancels a pending cover reveal",- async (action) => {- const content = create(false);- content.play();- await vi.advanceTimersByTimeAsync(0);- content[action]();- expect(content.video.cancelVideoFrameCallback).toHaveBeenCalledOnce();- content.video.presentFrame();- expect(content.cover?.style.opacity).toBe("1");- },-);--test("reduced motion reveals the playing video without a dissolve", async () => {- vi.mocked(window.matchMedia).mockReturnValue({- matches: true,- } as MediaQueryList);- const content = create(false);- content.play();- await vi.advanceTimersByTimeAsync(0);- content.video.presentFrame();- expect(content.cover?.style.opacity).toBe("0");- expect(content.cover?.style.transition).toBe("none");-});-test("preparing an uncached viewer slide does not start a download", async () => {const content = create(false);await content.preload({ cachedOnly: true });@@ -391,23 +259,21 @@ test.each([undefined, 0.5])(content.play();await vi.advanceTimersByTimeAsync(0);content.video.onloadeddata?.();- content.video.presentFrame();- expect(content.cover?.style.opacity).toBe("0");+ expect(content.cover?.hidden).toBe(true);if (end == undefined) content.video.onended?.();else {content.video.currentTime = end;content.video.ontimeupdate?.();}- expect(content.cover?.style.opacity).toBe("1");+ expect(content.cover?.hidden).toBe(false);expect(content.video.poster).toBe("blob:poster");expect(content.video.getAttribute("src")).toBeNull();expect(content.button.getAttribute("aria-hidden")).toBe("false");content.play(true);- expect(content.cover?.style.opacity).toBe("1");+ expect(content.cover?.hidden).toBe(false);await vi.advanceTimersByTimeAsync(0);content.video.onloadeddata?.();- content.video.presentFrame();- expect(content.cover?.style.opacity).toBe("0");+ expect(content.cover?.hidden).toBe(true);expect(content.video.getAttribute("poster")).toBeNull();expect(content.video.paused).toBe(false);expect(load).toHaveBeenCalledTimes(1);diff --git a/web/apps/space/tests/viewer-transition.test.ts b/web/apps/space/tests/viewer-transition.test.tsindex 8c831a5cbe..61e20df8cf 100644--- a/web/apps/space/tests/viewer-transition.test.ts+++ b/web/apps/space/tests/viewer-transition.test.ts@@ -128,7 +128,6 @@ test("closing before decoding cannot hide the tile afterward", async () => {expect(origin.style.opacity).toBe("");expect(flyer.remove).toHaveBeenCalledOnce();expect(requestFrame).not.toHaveBeenCalled();- await expect(flight.landed).resolves.toBeUndefined();});test("a failed flyer leaves the tile visible and allows viewer handover", async () => {@@ -138,25 +137,6 @@ test("a failed flyer leaves the tile visible and allows viewer handover", asyncexpect(origin.style.opacity).toBe("");expect(onLanded).toHaveBeenCalledOnce();- await expect(flight.landed).resolves.toBeUndefined();- flight.stop();-});--test("video playback can wait until the opening spring lands", async () => {- const { flight, requestFrame, resolveDecode, onLanded } = pendingFlight();- const play = vi.fn();- void flight.landed.then(play);- resolveDecode();- await Promise.resolve();- expect(play).not.toHaveBeenCalled();- let now = performance.now();- for (let i = 0; i < 200 && !onLanded.mock.calls.length; i++) {- now += 16;- requestFrame.mock.lastCall;- }- expect(onLanded).toHaveBeenCalledOnce();- await flight.landed;- expect(play).toHaveBeenCalledOnce();flight.stop();});