mirror of
https://github.com/SableClient/Sable.git
synced 2026-11-20 09:01:17 -08:00
fix: tauri media loading, sent-message drafts and composer buttons
This commit is contained in:
26 files changed
+397
-71
No files matched your search
@@ -0,0 +1,5 @@
|
||||
---
|
||||
default: minor
|
||||
---
|
||||
|
||||
Show the gif and sticker composer buttons by default, keeping only emoji while typing on mobile.
|
||||
@@ -0,0 +1,5 @@
|
||||
---
|
||||
default: patch
|
||||
---
|
||||
|
||||
Fix the mobile keyboard staying open over the room list after swiping out of a room.
|
||||
@@ -0,0 +1,5 @@
|
||||
---
|
||||
default: patch
|
||||
---
|
||||
|
||||
Fix a sent message coming back in the composer, and stop undo restoring cleared content.
|
||||
@@ -0,0 +1,5 @@
|
||||
---
|
||||
default: patch
|
||||
---
|
||||
|
||||
Fix avatars, images and videos disappearing or reloading on desktop and mobile.
|
||||
@@ -110,9 +110,12 @@ impl MediaSessionState {
|
||||
}
|
||||
|
||||
fn set_session(&self, session: MediaSession) -> Result<(), String> {
|
||||
self.session_store.set(session, || {
|
||||
self.session_store.set(session, |changed| {
|
||||
self.forget_client_errors();
|
||||
self.clear_loopback_media();
|
||||
// Capabilities embed the access token, so only a real session change orphans them.
|
||||
if changed {
|
||||
self.clear_loopback_media();
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -100,16 +100,21 @@ impl SessionStore {
|
||||
pub(super) fn set(
|
||||
&self,
|
||||
mut session: MediaSession,
|
||||
before_notify: impl FnOnce(),
|
||||
before_notify: impl FnOnce(bool),
|
||||
) -> Result<(), String> {
|
||||
let mut current = self
|
||||
.current
|
||||
.write()
|
||||
.map_err(|_| "media session lock poisoned".to_owned())?;
|
||||
let changed = current.as_ref().is_none_or(|existing| {
|
||||
existing.origin != session.origin
|
||||
|| existing.token != session.token
|
||||
|| existing.scope != session.scope
|
||||
});
|
||||
session.generation = self.generation.fetch_add(1, Ordering::AcqRel) + 1;
|
||||
*current = Some(session);
|
||||
drop(current);
|
||||
before_notify();
|
||||
before_notify(changed);
|
||||
self.ever_set.store(true, Ordering::Release);
|
||||
self.ready.notify_waiters();
|
||||
Ok(())
|
||||
|
||||
@@ -235,8 +235,8 @@ describe('clipboard', () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe('ProseMirrorEditorController clearHistory', () => {
|
||||
it('keeps undo working while composing, then wipes it after the send', () => {
|
||||
describe('ProseMirrorEditorController clear', () => {
|
||||
it('keeps undo working while composing, then wipes it once cleared', () => {
|
||||
const { controller } = mount();
|
||||
|
||||
controller.insertText('hello');
|
||||
@@ -245,7 +245,6 @@ describe('ProseMirrorEditorController clearHistory', () => {
|
||||
|
||||
controller.insertText('draft');
|
||||
controller.clear();
|
||||
controller.clearHistory();
|
||||
controller.undo();
|
||||
expect(controller.getDocument()).toEqual(doc(''));
|
||||
});
|
||||
@@ -255,7 +254,6 @@ describe('ProseMirrorEditorController clearHistory', () => {
|
||||
editable.focus();
|
||||
|
||||
act(() => controller.clear());
|
||||
act(() => controller.clearHistory());
|
||||
|
||||
expect(editable).toBe(document.activeElement);
|
||||
expect(editable).toHaveAttribute('data-placeholder-visible', 'true');
|
||||
|
||||
@@ -186,11 +186,9 @@ export class ProseMirrorEditorController {
|
||||
this.view?.focus();
|
||||
}
|
||||
|
||||
/** Drops the undo stack too: cleared content was sent, consumed, or abandoned. */
|
||||
clear(): void {
|
||||
this.setDocument(emptyEditorDocument());
|
||||
}
|
||||
|
||||
clearHistory(): void {
|
||||
if (this.view) this.view.updateState(this.createState());
|
||||
}
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ import {
|
||||
mxcUrlToHttp,
|
||||
rewriteAuthenticatedMediaUrl,
|
||||
} from '$utils/matrix';
|
||||
import { getTauriMediaSourceUrl } from '$utils/mediaUrl';
|
||||
import { getTauriMediaSourceUrl, prepareLoopbackImageSource } from '$utils/mediaUrl';
|
||||
import { FALLBACK_MIMETYPE } from '$utils/mimeTypes';
|
||||
import { setMediaEncryption } from '$utils/tauriMediaEncryption';
|
||||
import { isTauri } from '@tauri-apps/api/core';
|
||||
@@ -70,8 +70,10 @@ function ResolvedRoomMedia({
|
||||
() => (item.url.startsWith('http') ? item.url : mxcUrlToHttp(mx, item.url, useAuthentication)),
|
||||
[item.url, mx, useAuthentication]
|
||||
);
|
||||
const tauri = isTauri();
|
||||
// Tauri resolves the source inside the effect instead.
|
||||
const resolvedMediaUrl = useRenderableMediaUrl(
|
||||
item.encInfo ? undefined : (rawMediaUrl ?? undefined)
|
||||
item.encInfo || tauri ? undefined : (rawMediaUrl ?? undefined)
|
||||
);
|
||||
|
||||
const [resolved, setResolved] = useState<ResolvedMedia>();
|
||||
@@ -87,7 +89,7 @@ function ResolvedRoomMedia({
|
||||
const { encInfo, mimeType } = item;
|
||||
if (encInfo) {
|
||||
if (!rawMediaUrl) throw new Error('Invalid media URL');
|
||||
if (isTauri()) {
|
||||
if (tauri) {
|
||||
await setMediaEncryption(rawMediaUrl, encInfo, mimeType ?? FALLBACK_MIMETYPE);
|
||||
return rewriteAuthenticatedMediaUrl(rawMediaUrl)!;
|
||||
}
|
||||
@@ -97,6 +99,7 @@ function ResolvedRoomMedia({
|
||||
)
|
||||
);
|
||||
}
|
||||
if (tauri && rawMediaUrl) return prepareLoopbackImageSource(rawMediaUrl);
|
||||
return resolvedMediaUrl ?? rawMediaUrl ?? item.url;
|
||||
};
|
||||
|
||||
@@ -109,7 +112,7 @@ function ResolvedRoomMedia({
|
||||
if (requestRef.current !== request) return;
|
||||
setError(err instanceof Error ? err : new Error('Failed to load media'));
|
||||
});
|
||||
}, [item, rawMediaUrl, resolvedMediaUrl, createObjectURL, retryToken]);
|
||||
}, [item, rawMediaUrl, resolvedMediaUrl, tauri, createObjectURL, retryToken]);
|
||||
|
||||
const loading = !error && resolved?.item.eventId !== item.eventId;
|
||||
const showingResolved = resolved?.item.eventId === item.eventId;
|
||||
|
||||
@@ -4,7 +4,11 @@ import { describe, expect, it, vi } from 'vitest';
|
||||
import { ImageContent } from './ImageContent';
|
||||
import { downloadEncryptedMedia, mxcUrlToHttp } from '$utils/matrix';
|
||||
|
||||
const screenMocks = vi.hoisted(() => ({ isMobile: true, tauri: false }));
|
||||
const screenMocks = vi.hoisted(() => ({
|
||||
isMobile: true,
|
||||
tauri: false,
|
||||
loopbackUrl: undefined as string | undefined,
|
||||
}));
|
||||
vi.mock('$hooks/useScreenSize', () => ({
|
||||
ScreenSize: { Desktop: 'Desktop', Tablet: 'Tablet', Mobile: 'Mobile' },
|
||||
useScreenSizeOptionally: () => (screenMocks.isMobile ? 'Mobile' : 'Desktop'),
|
||||
@@ -13,6 +17,10 @@ vi.mock('$hooks/useScreenSize', () => ({
|
||||
|
||||
vi.mock('@tauri-apps/api/core', () => ({
|
||||
isTauri: () => screenMocks.tauri,
|
||||
invoke: async () => {
|
||||
if (!screenMocks.loopbackUrl) throw new Error('loopback media server unavailable');
|
||||
return screenMocks.loopbackUrl;
|
||||
},
|
||||
// Real convertFileSrc percent-encodes the target into the URI path.
|
||||
convertFileSrc: (url: string, protocol: string) =>
|
||||
`${protocol}://localhost/${encodeURIComponent(url)}`,
|
||||
@@ -201,6 +209,33 @@ describe('ImageContent', () => {
|
||||
}
|
||||
});
|
||||
|
||||
it('loads a Tauri image once, from the loopback origin', async () => {
|
||||
screenMocks.tauri = true;
|
||||
screenMocks.loopbackUrl = 'http://127.0.0.1:45678/capability';
|
||||
try {
|
||||
const srcs: string[] = [];
|
||||
render(
|
||||
<ImageContent
|
||||
url="mxc://example.org/abc123"
|
||||
renderImage={(props) => {
|
||||
srcs.push(props.src);
|
||||
return <img alt="preview" src={props.src} onError={props.onError} />;
|
||||
}}
|
||||
renderViewer={() => <div>viewer</div>}
|
||||
/>
|
||||
);
|
||||
|
||||
touchTap(screen.getByRole('button', { name: 'View' }));
|
||||
await screen.findByAltText('preview');
|
||||
|
||||
await waitFor(() => expect(srcs.length).toBeGreaterThan(0));
|
||||
expect(Array.from(new Set(srcs))).toEqual(['http://127.0.0.1:45678/capability']);
|
||||
} finally {
|
||||
screenMocks.tauri = false;
|
||||
screenMocks.loopbackUrl = undefined;
|
||||
}
|
||||
});
|
||||
|
||||
it('unwraps the Tauri media URL before downloading an encrypted image', async () => {
|
||||
screenMocks.tauri = true;
|
||||
const renderViewer = vi.fn<(props: { getDownloadBlob?: () => Promise<Blob> }) => ReactNode>(
|
||||
|
||||
@@ -44,6 +44,7 @@ import {
|
||||
addTauriMediaRetryRevision,
|
||||
getTauriMediaRetryTarget,
|
||||
getTauriMediaSourceUrl,
|
||||
prepareLoopbackImageSource,
|
||||
} from '$utils/mediaUrl';
|
||||
import { setMediaEncryption } from '$utils/tauriMediaEncryption';
|
||||
import { isTauri } from '@tauri-apps/api/core';
|
||||
@@ -225,8 +226,10 @@ export const ImageContent = as<'div', ImageContentProps>(
|
||||
}, [mx, url, useAuthentication, usesThumbnail, thumbWidth, thumbHeight]);
|
||||
|
||||
const shouldResolveMedia = !deferMediaLoad || autoPlay || loadRequested;
|
||||
const tauri = isTauri();
|
||||
// Tauri resolves the source inside `loadSrc` instead.
|
||||
const resolvedMediaUrl = useRenderableMediaUrl(
|
||||
encInfo || !shouldResolveMedia ? undefined : rawMediaUrl
|
||||
encInfo || tauri || !shouldResolveMedia ? undefined : rawMediaUrl
|
||||
);
|
||||
|
||||
const createObjectURL = useCreateObjectURL();
|
||||
@@ -235,7 +238,7 @@ export const ImageContent = as<'div', ImageContentProps>(
|
||||
useCallback(async () => {
|
||||
if (encInfo) {
|
||||
if (!rawMediaUrl) throw new Error('Invalid media URL');
|
||||
if (isTauri()) {
|
||||
if (tauri) {
|
||||
// The registration key is the revised target; Rust strips the fragment.
|
||||
const attemptedTarget =
|
||||
getTauriMediaRetryTarget(rawMediaUrl, retryRevisionRef.current) ?? rawMediaUrl;
|
||||
@@ -248,11 +251,12 @@ export const ImageContent = as<'div', ImageContentProps>(
|
||||
)
|
||||
);
|
||||
}
|
||||
return addTauriMediaRetryRevision(
|
||||
const source = addTauriMediaRetryRevision(
|
||||
resolvedMediaUrl ?? rawMediaUrl ?? url,
|
||||
retryRevisionRef.current
|
||||
);
|
||||
}, [rawMediaUrl, resolvedMediaUrl, url, mimeType, encInfo, createObjectURL])
|
||||
return tauri && rawMediaUrl ? prepareLoopbackImageSource(source) : source;
|
||||
}, [rawMediaUrl, resolvedMediaUrl, tauri, url, mimeType, encInfo, createObjectURL])
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
|
||||
@@ -10,6 +10,7 @@ import {
|
||||
mxcUrlToHttp,
|
||||
rewriteAuthenticatedMediaUrl,
|
||||
} from '$utils/matrix';
|
||||
import { prepareLoopbackImageSource } from '$utils/mediaUrl';
|
||||
import { setMediaEncryption } from '$utils/tauriMediaEncryption';
|
||||
import { isTauri } from '@tauri-apps/api/core';
|
||||
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
|
||||
@@ -33,7 +34,9 @@ export function ThumbnailContent({ info, renderImage }: ThumbnailContentProps) {
|
||||
return mxcUrlToHttp(mx, thumbMxcUrl, useAuthentication) ?? undefined;
|
||||
}, [mx, thumbMxcUrl, useAuthentication]);
|
||||
|
||||
const resolvedMediaUrl = useRenderableMediaUrl(encInfo ? undefined : rawMediaUrl);
|
||||
const tauri = isTauri();
|
||||
// Tauri resolves the source inside `loadThumbSrc` instead.
|
||||
const resolvedMediaUrl = useRenderableMediaUrl(encInfo || tauri ? undefined : rawMediaUrl);
|
||||
|
||||
const createObjectURL = useCreateObjectURL();
|
||||
|
||||
@@ -47,7 +50,7 @@ export function ThumbnailContent({ info, renderImage }: ThumbnailContentProps) {
|
||||
}
|
||||
if (encInfo) {
|
||||
if (!rawMediaUrl) throw new Error('Invalid media URL');
|
||||
if (isTauri()) {
|
||||
if (tauri) {
|
||||
await setMediaEncryption(rawMediaUrl, encInfo, thumbInfo?.mimetype ?? FALLBACK_MIMETYPE);
|
||||
return rewriteAuthenticatedMediaUrl(rawMediaUrl)!;
|
||||
}
|
||||
@@ -57,8 +60,9 @@ export function ThumbnailContent({ info, renderImage }: ThumbnailContentProps) {
|
||||
)
|
||||
);
|
||||
}
|
||||
if (tauri && rawMediaUrl) return prepareLoopbackImageSource(rawMediaUrl);
|
||||
return resolvedMediaUrl ?? rawMediaUrl ?? thumbMxcUrl;
|
||||
}, [info, thumbMxcUrl, rawMediaUrl, resolvedMediaUrl, encInfo, createObjectURL])
|
||||
}, [info, thumbMxcUrl, rawMediaUrl, resolvedMediaUrl, tauri, encInfo, createObjectURL])
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { useLayoutEffect, useRef } from 'react';
|
||||
import { fireEvent, render, screen } from '@testing-library/react';
|
||||
import { beforeAll, describe, expect, it, vi } from 'vitest';
|
||||
import { MemoryRouter } from 'react-router-dom';
|
||||
import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
|
||||
import { MemoryRouter, useNavigate } from 'react-router-dom';
|
||||
import { MobileNavDrawer } from './MobileNavDrawer';
|
||||
import { useMobileNavDrawer } from './MobileNavDrawerContext';
|
||||
|
||||
@@ -10,23 +10,32 @@ vi.mock('$state/hooks/settings', () => ({
|
||||
}));
|
||||
|
||||
vi.mock('./PersistentRoomHost', () => ({
|
||||
PersistentRoomHost: () => <div data-testid="persistent-room-host" />,
|
||||
PersistentRoomHost: () => (
|
||||
<div data-testid="persistent-room-host">
|
||||
<input aria-label="composer" />
|
||||
</div>
|
||||
),
|
||||
}));
|
||||
|
||||
let reduceMotion = false;
|
||||
|
||||
afterEach(() => {
|
||||
reduceMotion = false;
|
||||
vi.restoreAllMocks();
|
||||
});
|
||||
|
||||
beforeAll(() => {
|
||||
window.matchMedia =
|
||||
window.matchMedia ??
|
||||
((query: string) =>
|
||||
({
|
||||
matches: false,
|
||||
media: query,
|
||||
addEventListener: () => {},
|
||||
removeEventListener: () => {},
|
||||
addListener: () => {},
|
||||
removeListener: () => {},
|
||||
onchange: null,
|
||||
dispatchEvent: () => false,
|
||||
}) as unknown as MediaQueryList);
|
||||
window.matchMedia = (query: string) =>
|
||||
({
|
||||
matches: query.includes('prefers-reduced-motion') ? reduceMotion : false,
|
||||
media: query,
|
||||
addEventListener: () => {},
|
||||
removeEventListener: () => {},
|
||||
addListener: () => {},
|
||||
removeListener: () => {},
|
||||
onchange: null,
|
||||
dispatchEvent: () => false,
|
||||
}) as unknown as MediaQueryList;
|
||||
});
|
||||
|
||||
const renderDrawer = () =>
|
||||
@@ -79,6 +88,21 @@ function ChatSwipeProbe({
|
||||
);
|
||||
}
|
||||
|
||||
function BackToListHarness() {
|
||||
const navigate = useNavigate();
|
||||
return (
|
||||
<MobileNavDrawer
|
||||
nav={
|
||||
<button type="button" onClick={() => navigate('/home')}>
|
||||
back to list
|
||||
</button>
|
||||
}
|
||||
>
|
||||
<div>content</div>
|
||||
</MobileNavDrawer>
|
||||
);
|
||||
}
|
||||
|
||||
describe('MobileNavDrawer', () => {
|
||||
// The panels sit side by side in a track twice the viewport wide, moved by transform.
|
||||
// `hidden` leaves a scrollport that focus or scrollIntoView scrolls a full panel width,
|
||||
@@ -92,6 +116,25 @@ describe('MobileNavDrawer', () => {
|
||||
expect(viewport.style.overflow).not.toBe('hidden');
|
||||
});
|
||||
|
||||
it('drops focus from the panel that slides out of view', () => {
|
||||
reduceMotion = true;
|
||||
vi.spyOn(HTMLElement.prototype, 'clientWidth', 'get').mockReturnValue(400);
|
||||
|
||||
render(
|
||||
<MemoryRouter initialEntries={['/home/!room:example.org']}>
|
||||
<BackToListHarness />
|
||||
</MemoryRouter>
|
||||
);
|
||||
|
||||
const composer = screen.getByLabelText('composer');
|
||||
composer.focus();
|
||||
expect(document.activeElement).toBe(composer);
|
||||
|
||||
fireEvent.click(screen.getByRole('button', { name: 'back to list' }));
|
||||
|
||||
expect(document.activeElement).not.toBe(composer);
|
||||
});
|
||||
|
||||
it('still drives message swipe when the gesture starts on a nested ignored element (e.g. an image)', () => {
|
||||
const move = vi.fn<(distanceX: number) => void>();
|
||||
|
||||
|
||||
@@ -214,6 +214,12 @@ export function MobileNavDrawer({ nav, rail, bottomNav, children }: MobileNavDra
|
||||
useLayoutEffect(() => {
|
||||
navPanelRef.current?.toggleAttribute('inert', panelIntent === 1);
|
||||
contentPanelRef.current?.toggleAttribute('inert', panelIntent === 0);
|
||||
// `inert` alone does not drop a mobile keyboard.
|
||||
const hiddenPanel = panelIntent === 0 ? contentPanelRef.current : navPanelRef.current;
|
||||
const focused = document.activeElement;
|
||||
if (hiddenPanel && focused instanceof HTMLElement && hiddenPanel.contains(focused)) {
|
||||
focused.blur();
|
||||
}
|
||||
}, [panelIntent]);
|
||||
|
||||
useLayoutEffect(() => {
|
||||
|
||||
@@ -2,7 +2,7 @@ import { fireEvent, render, screen } from '@testing-library/react';
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
|
||||
const media = vi.hoisted(() => ({
|
||||
useRenderableMediaUrl: vi.fn<(url: string | undefined) => string | undefined>(),
|
||||
useRenderableMediaSource: vi.fn<(url: string | undefined) => string | undefined>(),
|
||||
}));
|
||||
|
||||
vi.mock('$hooks/useRenderableMediaUrl', () => media);
|
||||
@@ -12,11 +12,27 @@ const RAW_SRC = 'https://example.org/_matrix/client/v1/media/thumbnail/example.o
|
||||
describe('RoomAvatar', () => {
|
||||
beforeEach(() => {
|
||||
vi.resetModules();
|
||||
media.useRenderableMediaUrl.mockReset();
|
||||
media.useRenderableMediaSource.mockReset();
|
||||
});
|
||||
|
||||
it('shows the image once the resolved url arrives after a failed raw request', async () => {
|
||||
media.useRenderableMediaUrl.mockReturnValue(undefined);
|
||||
it('waits for a renderable url instead of requesting the raw one', async () => {
|
||||
media.useRenderableMediaSource.mockReturnValue(undefined);
|
||||
const { RoomAvatar } = await import('./RoomAvatar');
|
||||
|
||||
const { rerender } = render(
|
||||
<RoomAvatar roomId="!room:example.org" src={RAW_SRC} renderFallback={() => 'RM'} />
|
||||
);
|
||||
|
||||
expect(screen.queryByRole('img')).not.toBeInTheDocument();
|
||||
|
||||
media.useRenderableMediaSource.mockReturnValue('blob:resolved-avatar');
|
||||
rerender(<RoomAvatar roomId="!room:example.org" src={RAW_SRC} renderFallback={() => 'RM'} />);
|
||||
|
||||
expect(screen.getByRole('img')).toHaveAttribute('src', 'blob:resolved-avatar');
|
||||
});
|
||||
|
||||
it('falls back until a new url arrives when the image fails to load', async () => {
|
||||
media.useRenderableMediaSource.mockReturnValue('blob:resolved-avatar');
|
||||
const { RoomAvatar } = await import('./RoomAvatar');
|
||||
|
||||
const { rerender } = render(
|
||||
@@ -26,9 +42,9 @@ describe('RoomAvatar', () => {
|
||||
fireEvent.error(screen.getByRole('img'));
|
||||
expect(screen.queryByRole('img')).not.toBeInTheDocument();
|
||||
|
||||
media.useRenderableMediaUrl.mockReturnValue('blob:resolved-avatar');
|
||||
media.useRenderableMediaSource.mockReturnValue('blob:next-avatar');
|
||||
rerender(<RoomAvatar roomId="!room:example.org" src={RAW_SRC} renderFallback={() => 'RM'} />);
|
||||
|
||||
expect(screen.getByRole('img')).toHaveAttribute('src', 'blob:resolved-avatar');
|
||||
expect(screen.getByRole('img')).toHaveAttribute('src', 'blob:next-avatar');
|
||||
});
|
||||
});
|
||||
@@ -12,7 +12,7 @@ import {
|
||||
getRoomStandaloneIconComponent,
|
||||
} from '$components/icons/roomIcons';
|
||||
import colorMXID from '$utils/colorMXID';
|
||||
import { useRenderableMediaUrl } from '$hooks/useRenderableMediaUrl';
|
||||
import { useRenderableMediaSource } from '$hooks/useRenderableMediaUrl';
|
||||
import * as css from './RoomAvatar.css';
|
||||
import { AvatarImage } from './AvatarImage';
|
||||
|
||||
@@ -26,8 +26,7 @@ type RoomAvatarProps = {
|
||||
|
||||
export function RoomAvatar({ roomId, src, alt, renderFallback, uniformIcons }: RoomAvatarProps) {
|
||||
const [error, setError] = useState(false);
|
||||
const resolvedSrc = useRenderableMediaUrl(src);
|
||||
const mediaSrc = resolvedSrc ?? src;
|
||||
const mediaSrc = useRenderableMediaSource(src);
|
||||
|
||||
useEffect(() => {
|
||||
setError(false);
|
||||
|
||||
@@ -2,7 +2,7 @@ import { fireEvent, render, screen } from '@testing-library/react';
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
|
||||
const media = vi.hoisted(() => ({
|
||||
useRenderableMediaUrl: vi.fn<(url: string | undefined) => string | undefined>(),
|
||||
useRenderableMediaSource: vi.fn<(url: string | undefined) => string | undefined>(),
|
||||
}));
|
||||
|
||||
vi.mock('$hooks/useRenderableMediaUrl', () => media);
|
||||
@@ -12,11 +12,27 @@ const RAW_SRC = 'https://example.org/_matrix/client/v1/media/thumbnail/example.o
|
||||
describe('UserAvatar', () => {
|
||||
beforeEach(() => {
|
||||
vi.resetModules();
|
||||
media.useRenderableMediaUrl.mockReset();
|
||||
media.useRenderableMediaSource.mockReset();
|
||||
});
|
||||
|
||||
it('shows the image once the resolved url arrives after a failed raw request', async () => {
|
||||
media.useRenderableMediaUrl.mockReturnValue(undefined);
|
||||
it('waits for a renderable url instead of requesting the raw one', async () => {
|
||||
media.useRenderableMediaSource.mockReturnValue(undefined);
|
||||
const { UserAvatar } = await import('./UserAvatar');
|
||||
|
||||
const { rerender } = render(
|
||||
<UserAvatar userId="@user:example.org" src={RAW_SRC} renderFallback={() => 'US'} />
|
||||
);
|
||||
|
||||
expect(screen.queryByRole('img')).not.toBeInTheDocument();
|
||||
|
||||
media.useRenderableMediaSource.mockReturnValue('blob:resolved-avatar');
|
||||
rerender(<UserAvatar userId="@user:example.org" src={RAW_SRC} renderFallback={() => 'US'} />);
|
||||
|
||||
expect(screen.getByRole('img')).toHaveAttribute('src', 'blob:resolved-avatar');
|
||||
});
|
||||
|
||||
it('falls back until a new url arrives when the image fails to load', async () => {
|
||||
media.useRenderableMediaSource.mockReturnValue('blob:resolved-avatar');
|
||||
const { UserAvatar } = await import('./UserAvatar');
|
||||
|
||||
const { rerender } = render(
|
||||
@@ -26,9 +42,9 @@ describe('UserAvatar', () => {
|
||||
fireEvent.error(screen.getByRole('img'));
|
||||
expect(screen.queryByRole('img')).not.toBeInTheDocument();
|
||||
|
||||
media.useRenderableMediaUrl.mockReturnValue('blob:resolved-avatar');
|
||||
media.useRenderableMediaSource.mockReturnValue('blob:next-avatar');
|
||||
rerender(<UserAvatar userId="@user:example.org" src={RAW_SRC} renderFallback={() => 'US'} />);
|
||||
|
||||
expect(screen.getByRole('img')).toHaveAttribute('src', 'blob:resolved-avatar');
|
||||
expect(screen.getByRole('img')).toHaveAttribute('src', 'blob:next-avatar');
|
||||
});
|
||||
});
|
||||
@@ -3,7 +3,7 @@ import type { ReactEventHandler, ReactNode } from 'react';
|
||||
import { useEffect, useState } from 'react';
|
||||
import classNames from 'classnames';
|
||||
import colorMXID from '$utils/colorMXID';
|
||||
import { useRenderableMediaUrl } from '$hooks/useRenderableMediaUrl';
|
||||
import { useRenderableMediaSource } from '$hooks/useRenderableMediaUrl';
|
||||
import * as css from './UserAvatar.css';
|
||||
|
||||
type UserAvatarProps = {
|
||||
@@ -28,8 +28,7 @@ export function UserAvatar({
|
||||
renderFallback,
|
||||
}: UserAvatarProps) {
|
||||
const [error, setError] = useState(false);
|
||||
const resolvedSrc = useRenderableMediaUrl(src);
|
||||
const mediaSrc = resolvedSrc ?? src;
|
||||
const mediaSrc = useRenderableMediaSource(src);
|
||||
|
||||
useEffect(() => {
|
||||
setError(false);
|
||||
|
||||
@@ -28,6 +28,7 @@ import { roomScheduleCoordinator } from '$state/room/roomScheduleCoordinator';
|
||||
|
||||
const testState = vi.hoisted(() => ({
|
||||
isMobile: false,
|
||||
editorTriggerButtons: false,
|
||||
matrix: {
|
||||
sendMessage: vi.fn(),
|
||||
sendEvent: vi.fn(),
|
||||
@@ -63,11 +64,11 @@ vi.mock('$state/hooks/settings', () => ({
|
||||
useSetting: (_atom: unknown, key: string) => {
|
||||
const values: Record<string, unknown> = {
|
||||
enterForNewline: false,
|
||||
editorGifButton: false,
|
||||
editorEmojiButton: false,
|
||||
editorStickerButton: false,
|
||||
editorGifButton: testState.editorTriggerButtons,
|
||||
editorEmojiButton: testState.editorTriggerButtons,
|
||||
editorStickerButton: testState.editorTriggerButtons,
|
||||
editorMicButton: false,
|
||||
editorButtonOrder: [],
|
||||
editorButtonOrder: testState.editorTriggerButtons ? ['gif', 'sticker', 'emoji'] : [],
|
||||
shortcutOverrides: {},
|
||||
hideActivity: true,
|
||||
mentionInReplies: true,
|
||||
@@ -761,6 +762,7 @@ function deferred<T>() {
|
||||
|
||||
beforeEach(() => {
|
||||
testState.isMobile = false;
|
||||
testState.editorTriggerButtons = false;
|
||||
testState.pendingUploads = [];
|
||||
testState.sendIndividualAttachmentAsCaption = false;
|
||||
testState.encrypted = false;
|
||||
@@ -1109,8 +1111,8 @@ describe('RoomInput submit regressions', () => {
|
||||
expect(document.activeElement).toBe(screen.getByTestId('room-input-editor'));
|
||||
});
|
||||
|
||||
it('wipes the composer undo history when a message is sent', async () => {
|
||||
const clearHistorySpy = vi.spyOn(ProseMirrorEditorController.prototype, 'clearHistory');
|
||||
it('clears the composer when a message is sent', async () => {
|
||||
const clearSpy = vi.spyOn(ProseMirrorEditorController.prototype, 'clear');
|
||||
try {
|
||||
render(<RoomInputHarness />);
|
||||
fireEvent.click(screen.getByRole('button', { name: 'Compose text' }));
|
||||
@@ -1118,9 +1120,9 @@ describe('RoomInput submit regressions', () => {
|
||||
fireEvent.click(sendButton());
|
||||
await waitFor(() => expect(testState.matrix.sendMessage).toHaveBeenCalledOnce());
|
||||
|
||||
expect(clearHistorySpy).toHaveBeenCalledOnce();
|
||||
expect(clearSpy).toHaveBeenCalled();
|
||||
} finally {
|
||||
clearHistorySpy.mockRestore();
|
||||
clearSpy.mockRestore();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1395,6 +1397,64 @@ describe('RoomInput submit regressions', () => {
|
||||
);
|
||||
});
|
||||
|
||||
it('leaves only the emoji trigger once text is composed on mobile', () => {
|
||||
testState.isMobile = true;
|
||||
testState.editorTriggerButtons = true;
|
||||
render(<RoomInputHarness />);
|
||||
|
||||
expect(screen.getByRole('button', { name: 'Open gif picker' })).toBeInTheDocument();
|
||||
expect(screen.getByRole('button', { name: 'Open sticker picker' })).toBeInTheDocument();
|
||||
|
||||
fireEvent.click(screen.getByRole('button', { name: 'Compose text' }));
|
||||
|
||||
expect(screen.queryByRole('button', { name: 'Open gif picker' })).not.toBeInTheDocument();
|
||||
expect(screen.queryByRole('button', { name: 'Open sticker picker' })).not.toBeInTheDocument();
|
||||
expect(screen.getByRole('button', { name: 'Open emoji board' })).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('keeps every trigger while composing on desktop', () => {
|
||||
testState.editorTriggerButtons = true;
|
||||
render(<RoomInputHarness />);
|
||||
|
||||
fireEvent.click(screen.getByRole('button', { name: 'Compose text' }));
|
||||
|
||||
expect(screen.getByRole('button', { name: 'Open gif picker' })).toBeInTheDocument();
|
||||
expect(screen.getByRole('button', { name: 'Open sticker picker' })).toBeInTheDocument();
|
||||
expect(screen.getByRole('button', { name: 'Open emoji board' })).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('keeps an unsent draft across a composer remount', async () => {
|
||||
const input = render(<RoomInputHarness />);
|
||||
render(<DraftObserver />);
|
||||
fireEvent.click(screen.getByRole('button', { name: 'Compose text' }));
|
||||
|
||||
input.unmount();
|
||||
expect(screen.getByTestId('draft-observer')).toHaveTextContent('retry me');
|
||||
|
||||
render(<RoomInputHarness />);
|
||||
|
||||
expect(screen.getByTestId('room-input-editor')).toHaveAttribute('data-editor-text', 'retry me');
|
||||
});
|
||||
|
||||
it('drops the persisted draft when its message is sent', async () => {
|
||||
const seed = render(<DraftSetter text="draft to send" />);
|
||||
seed.unmount();
|
||||
render(<RoomInputHarness initialDraft="draft to send" />);
|
||||
render(<DraftObserver />);
|
||||
|
||||
await waitFor(() =>
|
||||
expect(screen.getByTestId('room-input-editor')).toHaveAttribute(
|
||||
'data-editor-text',
|
||||
'draft to send'
|
||||
)
|
||||
);
|
||||
|
||||
fireEvent.keyDown(screen.getByTestId('room-input-editor'), { key: 'Enter', code: 'Enter' });
|
||||
|
||||
await waitFor(() => expect(testState.matrix.sendMessage).toHaveBeenCalledOnce());
|
||||
expect(screen.getByTestId('draft-observer')).toBeEmptyDOMElement();
|
||||
});
|
||||
|
||||
it('preserves the normal draft when an edited message input unmounts', async () => {
|
||||
testState.isMobile = true;
|
||||
testState.editingEvent = {
|
||||
|
||||
@@ -763,7 +763,12 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
|
||||
});
|
||||
}, [threadRootId, setReplyDraft, mx]);
|
||||
|
||||
// Rewritten with equal content on unmount, and appending it again would duplicate it.
|
||||
const appliedDraftRef = useRef<string>();
|
||||
useEffect(() => {
|
||||
const draft = JSON.stringify(msgDraft);
|
||||
if (appliedDraftRef.current === draft) return;
|
||||
appliedDraftRef.current = draft;
|
||||
editor.appendDocument(msgDraft);
|
||||
}, [editor, msgDraft]);
|
||||
|
||||
@@ -1070,13 +1075,14 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
|
||||
};
|
||||
if (clearEditor) {
|
||||
editor.clear();
|
||||
editor.clearHistory();
|
||||
// The draft outlives this component, and a remount re-applies it.
|
||||
setMsgDraft([]);
|
||||
imagePacksUsedRef.current.clear();
|
||||
sendTypingStatus(false);
|
||||
}
|
||||
return submission;
|
||||
},
|
||||
[claimReply, editor, sendTypingStatus]
|
||||
[claimReply, editor, sendTypingStatus, setMsgDraft]
|
||||
);
|
||||
const restoreSubmission = useCallback(
|
||||
(submission: Submission) => {
|
||||
@@ -2356,11 +2362,13 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
|
||||
requestClose={closeEmojiBoard}
|
||||
/>
|
||||
);
|
||||
// Mobile has no room for three triggers next to text.
|
||||
const onlyEmojiTrigger = isMobile && hasText;
|
||||
const triggers = (
|
||||
<>
|
||||
{editorButtonOrder.map((id) => {
|
||||
let button: ReactElement | null = null;
|
||||
if (id === 'gif' && editorGifButton) {
|
||||
if (id === 'gif' && editorGifButton && !onlyEmojiTrigger) {
|
||||
button = (
|
||||
<IconButton
|
||||
ref={gifBtnRef}
|
||||
@@ -2379,7 +2387,7 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
|
||||
})}
|
||||
</IconButton>
|
||||
);
|
||||
} else if (id === 'sticker' && editorStickerButton) {
|
||||
} else if (id === 'sticker' && editorStickerButton && !onlyEmojiTrigger) {
|
||||
button = (
|
||||
<IconButton
|
||||
ref={stickerBtnRef}
|
||||
|
||||
@@ -264,4 +264,36 @@ describe('useRenderableMediaUrl', () => {
|
||||
});
|
||||
expect(tauriApi.convertFileSrc).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('withholds the raw source under Tauri until the loopback url resolves', async () => {
|
||||
tauriApi.isTauri.mockReturnValue(true);
|
||||
let resolveLoopback: (url: string) => void = () => {};
|
||||
tauriApi.invoke.mockReturnValue(
|
||||
new Promise<string>((resolve) => {
|
||||
resolveLoopback = resolve;
|
||||
})
|
||||
);
|
||||
const { useRenderableMediaSource } = await import('./useRenderableMediaUrl');
|
||||
|
||||
const rawUrl =
|
||||
'sable-media://https://matrix.example.org/_matrix/client/v1/media/thumbnail/example.org/abc123';
|
||||
const { result } = renderHook(() => useRenderableMediaSource(rawUrl));
|
||||
|
||||
expect(result.current).toBeUndefined();
|
||||
|
||||
await act(async () => {
|
||||
resolveLoopback(LOOPBACK_URL);
|
||||
});
|
||||
await waitFor(() => expect(result.current).toBe(LOOPBACK_URL));
|
||||
});
|
||||
|
||||
it('falls back to the raw source outside Tauri while the blob resolves', async () => {
|
||||
tauriApi.isTauri.mockReturnValue(false);
|
||||
mediaTransport.fetchMediaBlob.mockReturnValue(new Promise<Blob>(() => {}));
|
||||
const { useRenderableMediaSource } = await import('./useRenderableMediaUrl');
|
||||
|
||||
const { result } = renderHook(() => useRenderableMediaSource('https://example.org/avatar.png'));
|
||||
|
||||
expect(result.current).toBe('https://example.org/avatar.png');
|
||||
});
|
||||
});
|
||||
@@ -286,3 +286,11 @@ export function useRenderableMediaUrl(url: string | undefined): string | undefin
|
||||
|
||||
return resolvedState.url;
|
||||
}
|
||||
|
||||
// Undefined while the url is still being prepared: on Tauri, rendering the raw source first
|
||||
// only means a second load once the loopback url lands, and an error on either latches.
|
||||
export function useRenderableMediaSource(url: string | undefined): string | undefined {
|
||||
const resolvedUrl = useRenderableMediaUrl(url);
|
||||
if (resolvedUrl) return resolvedUrl;
|
||||
return isTauri() ? undefined : url;
|
||||
}
|
||||
@@ -72,6 +72,34 @@ describe('mergePersistedSettings', () => {
|
||||
expect(merged.saturationLevel).toBe(0);
|
||||
});
|
||||
|
||||
it('turns the gif and sticker triggers on once for clients persisted before the migration', () => {
|
||||
expect(defaultSettings.editorGifButton).toBe(true);
|
||||
expect(defaultSettings.editorStickerButton).toBe(true);
|
||||
|
||||
localStorage.setItem(
|
||||
'settings',
|
||||
JSON.stringify({ editorGifButton: false, editorStickerButton: false })
|
||||
);
|
||||
const merged = mergePersistedSettings(localStorage.getItem('settings'), {});
|
||||
expect(merged.editorGifButton).toBe(true);
|
||||
expect(merged.editorStickerButton).toBe(true);
|
||||
expect(merged.editorTriggerButtonsMigrated).toBe(true);
|
||||
});
|
||||
|
||||
it('keeps the trigger buttons off once the migration has run', () => {
|
||||
localStorage.setItem(
|
||||
'settings',
|
||||
JSON.stringify({
|
||||
editorGifButton: false,
|
||||
editorStickerButton: false,
|
||||
editorTriggerButtonsMigrated: true,
|
||||
})
|
||||
);
|
||||
const merged = mergePersistedSettings(localStorage.getItem('settings'), {});
|
||||
expect(merged.editorGifButton).toBe(false);
|
||||
expect(merged.editorStickerButton).toBe(false);
|
||||
});
|
||||
|
||||
it('seeds the name color correction once for clients persisted before the migration', () => {
|
||||
localStorage.setItem('settings', JSON.stringify({ nameColorLightnessCorrection: 'off' }));
|
||||
const merged = mergePersistedSettings(localStorage.getItem('settings'), {});
|
||||
|
||||
@@ -130,6 +130,7 @@ export interface Settings {
|
||||
editorEmojiButton: boolean;
|
||||
editorGifButton: boolean;
|
||||
editorStickerButton: boolean;
|
||||
editorTriggerButtonsMigrated: boolean;
|
||||
editorButtonOrder: EditorButtonId[];
|
||||
composerToolbarOpen: boolean;
|
||||
alwaysInlineEditor: boolean;
|
||||
@@ -316,8 +317,9 @@ export const defaultSettings: Settings = {
|
||||
editorOldAddFile: false,
|
||||
editorMicButton: true,
|
||||
editorEmojiButton: true,
|
||||
editorGifButton: false,
|
||||
editorStickerButton: false,
|
||||
editorGifButton: true,
|
||||
editorStickerButton: true,
|
||||
editorTriggerButtonsMigrated: true,
|
||||
editorButtonOrder: [...EDITOR_BUTTON_ORDER_DEFAULT],
|
||||
composerToolbarOpen: false,
|
||||
alwaysInlineEditor: false,
|
||||
@@ -522,6 +524,12 @@ function migrateParsedLocalStorage(parsed: Record<string, unknown>): void {
|
||||
}
|
||||
delete parsed.monochromeMode;
|
||||
|
||||
if (parsed.editorTriggerButtonsMigrated !== true) {
|
||||
delete parsed.editorGifButton;
|
||||
delete parsed.editorStickerButton;
|
||||
parsed.editorTriggerButtonsMigrated = true;
|
||||
}
|
||||
|
||||
if (parsed.nameColorLightnessCorrectionMigrated !== true) {
|
||||
delete parsed.nameColorLightnessCorrection;
|
||||
parsed.nameColorLightnessCorrectionMigrated = true;
|
||||
|
||||
@@ -27,6 +27,7 @@ import {
|
||||
addTauriMediaRetryRevision,
|
||||
getTauriMediaSourceUrl,
|
||||
getTauriMediaRetryTarget,
|
||||
prepareLoopbackImageSource,
|
||||
prepareLoopbackMedia,
|
||||
rewriteAuthenticatedMediaUrl,
|
||||
} from './mediaUrl';
|
||||
@@ -274,3 +275,24 @@ describe('prepareLoopbackMedia', () => {
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe('prepareLoopbackImageSource', () => {
|
||||
it('resolves the loopback URL under Tauri', async () => {
|
||||
hoistedIsTauri.mockReturnValue(true);
|
||||
hoistedInvoke.mockResolvedValue('http://127.0.0.1:45678/capability');
|
||||
|
||||
await expect(prepareLoopbackImageSource('sable-media://localhost/media')).resolves.toBe(
|
||||
'http://127.0.0.1:45678/capability'
|
||||
);
|
||||
});
|
||||
|
||||
// Unlike a media element, an image renders from the custom scheme just fine.
|
||||
it('degrades to the custom-scheme URL when the loopback fails', async () => {
|
||||
hoistedIsTauri.mockReturnValue(true);
|
||||
hoistedInvoke.mockRejectedValue(new Error('loopback media server unavailable'));
|
||||
|
||||
await expect(prepareLoopbackImageSource('sable-media://localhost/media')).resolves.toBe(
|
||||
'sable-media://localhost/media'
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -115,6 +115,17 @@ export const prepareLoopbackMedia = async (source: string): Promise<string> => {
|
||||
return invoke<string>('prepare_loopback_media', { url: source });
|
||||
};
|
||||
|
||||
// Awaited by the caller's own load so an element's src never changes mid-flight. An image
|
||||
// renders from the custom protocol too, so a loopback failure costs caching, not the image.
|
||||
export const prepareLoopbackImageSource = async (source: string): Promise<string> => {
|
||||
if (!isTauri()) return source;
|
||||
try {
|
||||
return await prepareLoopbackMedia(source);
|
||||
} catch {
|
||||
return source;
|
||||
}
|
||||
};
|
||||
|
||||
export const mxcUrlToHttp = (
|
||||
mx: MatrixClient,
|
||||
mxcUrl: string,
|
||||
|
||||
Reference in new issue
Block a user