Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

feat(sharing): attach images to share messages (#9064)

gbirman644c91c6376c
diff --git a/apps/web/AGENTS.md b/apps/web/AGENTS.md
index 52a4cfeee3..bed55537e0 100644
--- a/apps/web/AGENTS.md
+++ b/apps/web/AGENTS.md
@@ -87,6 +87,12 @@ Gate event notes and document Share meeting-link controls with
on in dev and uses PostHog in production.
See `docs/agent-guide/calendar.md` at the repo root.
+Share message image paste, file selection, drop, removal during upload, and
+upload failure have desktop, phone, and tablet browser coverage:
+`bunx playwright test --config src/lib/core/component/ForwardMessageComposer/browser-test/playwright.config.ts`.
+Keep the shared uploader from restoring removed attachments or publishing after
+the composer is disposed. The Share button and shortcut use the same upload guard.
+
Mention menus rank loaded entity sources together with `MENTION_RANKING_CONFIG`
in `MentionsMenu/utils/mention-ranking.ts`: name relevance, viewed recency,
brevity, and explicit type/name boosts. Task projects use the `initiative`
diff --git a/apps/web/src/features/channel/Input/tests/upload-attachments.test.ts b/apps/web/src/features/channel/Input/tests/upload-attachments.test.ts
index c8340ab100..42c03b83b0 100644
--- a/apps/web/src/features/channel/Input/tests/upload-attachments.test.ts
+++ b/apps/web/src/features/channel/Input/tests/upload-attachments.test.ts
@@ -220,3 +220,53 @@ describe('uploadInputAttachments', () => {
]);
});
});
+
+describe('attachment upload cancellation', () => {
+ beforeEach(() => toastFailureMock.mockReset());
+ afterEach(() => vi.restoreAllMocks());
+ it.each(['removed', 'closed'] as const)(
+ 'does not restore an image when the draft is %s during upload',
+ async (reason) => {
+ vi.spyOn(URL, 'createObjectURL').mockReturnValue('blob:cancelled-image');
+ const revoke = vi.spyOn(URL, 'revokeObjectURL');
+ const tracker = createInputAttachmentTracker();
+ let active = true;
+ let finish!: (result: {
+ failed: false;
+ destination: 'static';
+ id: string;
+ }) => void;
+ const upload = uploadInputAttachments({
+ files: [new File(['image'], 'image.png', { type: 'image/png' })],
+ tracker,
+ isActive: () => active,
+ uploadFile: () =>
+ new Promise((resolve) => {
+ finish = resolve;
+ }),
+ });
+ if (reason === 'removed')
+ tracker.removeAttachment(tracker.attachments()[0].id);
+ else active = false;
+ finish({ failed: false, destination: 'static', id: 'uploaded-image' });
+ await upload;
+ expect(tracker.attachments()).toEqual([]);
+ expect(revoke).toHaveBeenCalledWith('blob:cancelled-image');
+ }
+ );
+
+ it('does not upload files that cannot fit in the attachment tracker', async () => {
+ vi.spyOn(URL, 'createObjectURL').mockReturnValue('blob:rejected-image');
+ const revoke = vi.spyOn(URL, 'revokeObjectURL');
+ const uploadFile = vi.fn();
+ const tracker = createInputAttachmentTracker({ maxAttachments: 0 });
+ await uploadInputAttachments({
+ files: [new File(['image'], 'image.png', { type: 'image/png' })],
+ tracker,
+ uploadFile,
+ });
+ expect(uploadFile).not.toHaveBeenCalled();
+ expect(toastFailureMock).toHaveBeenCalledOnce();
+ expect(revoke).toHaveBeenCalledWith('blob:rejected-image');
+ });
+});
diff --git a/apps/web/src/features/channel/Input/upload-attachments.ts b/apps/web/src/features/channel/Input/upload-attachments.ts
index 74d17f104f..01fddc913f 100644
--- a/apps/web/src/features/channel/Input/upload-attachments.ts
+++ b/apps/web/src/features/channel/Input/upload-attachments.ts
@@ -40,13 +40,13 @@ function replacePendingAttachment(
);
if (pendingIndex === -1) {
- tracker.addAttachment(uploaded);
- return;
+ return false;
}
const next = [...current];
next[pendingIndex] = uploaded;
tracker.setAttachments(next);
+ return true;
}
/**
@@ -75,8 +75,12 @@ export async function uploadInputAttachments(options: {
files: File[];
tracker: InputAttachmentTracker;
uploadFile: (file: File) => Promise<UploadResult>;
+ /** Stop publishing uploads after the owning draft is disposed. */
+ isActive?: () => boolean;
}): Promise<void> {
+ const isActive = options.isActive ?? (() => true);
for (const file of options.files) {
+ if (!isActive()) break;
const uploadSource = createUploadFile(file);
const pendingId = crypto.randomUUID();
const pendingKind = getAttachmentKindFromFile(uploadSource);
@@ -94,6 +98,14 @@ export async function uploadInputAttachments(options: {
previewSrc,
});
+ // A full tracker rejected this file; do not upload an invisible attachment.
+ if (!options.tracker.attachments().some((item) => item.id === pendingId)) {
+ if (previewSrc) URL.revokeObjectURL(previewSrc);
+ toast.failure(`Could not attach ${file.name}: attachment limit reached`);
+ continue;
+ }
+
+ let retainedPreview = false;
try {
const dimensionsPromise = resolveMediaDimensions(
uploadSource,
@@ -101,16 +113,17 @@ export async function uploadInputAttachments(options: {
);
const result = await options.uploadFile(file);
+ if (!isActive()) continue;
+
if (result.failed) {
- options.tracker.removeAttachment(pendingId);
toast.failure(result.reason ?? `Failed to upload ${file.name}`);
continue;
}
const dimensions = await dimensionsPromise;
+ if (!isActive()) continue;
const uploaded = buildUploadedAttachment(file, pendingKind, result);
if (!uploaded) {
- options.tracker.removeAttachment(pendingId);
toast.failure(`Failed to upload ${file.name}`);
continue;
}
@@ -125,11 +138,19 @@ export async function uploadInputAttachments(options: {
uploaded.height = dimensions.height;
}
- replacePendingAttachment(options.tracker, pendingId, uploaded);
+ retainedPreview = replacePendingAttachment(
+ options.tracker,
+ pendingId,
+ uploaded
+ );
} catch (error) {
console.error('failed to upload attachment', error);
- options.tracker.removeAttachment(pendingId);
- toast.failure(`Failed to upload ${file.name}`);
+ if (isActive()) toast.failure(`Failed to upload ${file.name}`);
+ } finally {
+ if (!retainedPreview) {
+ options.tracker.removeAttachment(pendingId);
+ if (previewSrc) URL.revokeObjectURL(previewSrc);
+ }
}
}
}
diff --git a/apps/web/src/lib/core/component/ForwardMessageComposer.tsx b/apps/web/src/lib/core/component/ForwardMessageComposer.tsx
new file mode 100644
index 0000000000..ac2f9d95f0
--- /dev/null
+++ b/apps/web/src/lib/core/component/ForwardMessageComposer.tsx
@@ -0,0 +1,191 @@
+import { createInputAttachmentTracker } from '@channel/Input/attachment-tracker';
+import { createConfiguredChannelMarkdownEditor } from '@channel/Input/configured-markdown-editor';
+import { Input } from '@channel/Input/Input';
+import { createMentionsTracker } from '@channel/Input/mentions-tracker';
+import { buildPostMessageRequest } from '@channel/Input/message-payload';
+import { uploadInputAttachments } from '@channel/Input/upload-attachments';
+import type { UploadResult } from '@channel/Input/utils/file-helpers';
+import { fileFolderDrop } from '@core/directive/fileFolderDrop';
+import type { MessageEditorOptions } from '@core/messages/configured-message-editor';
+import { fireAndForget } from '@core/util/fireAndForget';
+import { handleFileFolderDrop } from '@core/util/upload';
+import { Telemetry } from '@macro-inc/observability';
+import { type Accessor, createSignal, onCleanup } from 'solid-js';
+import { CustomScrollbar } from './CustomScrollbar';
+import { MarkdownShell } from './LexicalMarkdown/builder/MarkdownShell';
+import { ScrollIndicators } from './VerticalScrollIndicators';
+
+false && fileFolderDrop;
+
+export function createForwardMessageComposer(options: {
+ resolveAppLink?: MessageEditorOptions['resolveAppLink'];
+ uploadFile: (file: File) => Promise<UploadResult>;
+ isSending: Accessor<boolean>;
+}) {
+ const tracker = createInputAttachmentTracker();
+ const mentions = createMentionsTracker();
+ const [markdown, setMarkdown] = createSignal('');
+ const [uploads, setUploads] = createSignal(0);
+ const [scrollRef, setScrollRef] = createSignal<HTMLElement>();
+ const [isDraggedOver, setIsDraggedOver] = createSignal(false);
+ let active = true;
+
+ const clear = () => {
+ for (const attachment of tracker.attachments()) {
+ if (attachment.previewSrc?.startsWith('blob:')) {
+ URL.revokeObjectURL(attachment.previewSrc);
+ }
+ }
+ tracker.clearAttachments();
+ };
+ onCleanup(() => {
+ active = false;
+ clear();
+ });
+
+ const attachFiles = async (files: File[]) => {
+ if (!active || options.isSending()) return;
+ setUploads((count) => count + 1);
+ try {
+ await Telemetry.span('share.attach_files', async (span) => {
+ span.setAttr('attachment.count', files.length);
+ await uploadInputAttachments({
+ files,
+ tracker,
+ uploadFile: (file) =>
+ span.span('share.upload_attachment', async (uploadSpan) => {
+ uploadSpan.setAttr('file.size', file.size);
+ const result = await options.uploadFile(file);
+ if (result.failed) uploadSpan.error('Attachment upload failed');
+ else if ('id' in result)
+ uploadSpan.setAttr('attachment.id', result.id);
+ return result;
+ }),
+ isActive: () => active,
+ });
+ });
+ } finally {
+ setUploads((count) => count - 1);
+ }
+ };
+
+ const attachEntries = async (
+ files: FileSystemFileEntry[],
+ directories: FileSystemDirectoryEntry[]
+ ) => {
+ if (!active || options.isSending()) return;
+ setUploads((count) => count + 1);
+ try {
+ await handleFileFolderDrop(files, directories, (entries) =>
+ attachFiles(entries.map((entry) => entry.file))
+ );
+ } finally {
+ setUploads((count) => count - 1);
+ }
+ };
+
+ // Bare Enter keeps the optional message multiline; the Share surface owns
+ // Cmd/Ctrl+Enter and guards it while attachments are uploading.
+ const editor = createConfiguredChannelMarkdownEditor({
+ namespace: 'forward-to-channel-markdown',
+ resolveAppLink: options.resolveAppLink,
+ enableMentions: true,
+ scrollContainer: scrollRef,
+ onChange: setMarkdown,
+ onMentionCreate: mentions.onMentionCreate,
+ onMentionRemove: mentions.onMentionRemove,
+ onPasteFilesAndDirs: (files, directories) => {
+ fireAndForget(attachEntries(files, directories), 'share-attachments');
+ },
+ onAttachFromDisk: (files) =>
+ fireAndForget(attachFiles(files), 'share-attachments'),
+ });
+
+ return {
+ editor,
+ tracker,
+ scrollRef,
+ setScrollRef,
+ isDraggedOver,
+ setIsDraggedOver,
+ attachFiles,
+ attachEntries,
+ clear,
+ isSending: options.isSending,
+ isUploading: () => uploads() > 0 || tracker.hasPending(),
+ message: () =>
+ buildPostMessageRequest({
+ snapshot: {
+ value: markdown(),
+ attachments: tracker.attachments(),
+ mentions: mentions.mentions(),
+ },
+ }),
+ };
+}
+
+export function ForwardMessageComposer(props: {
+ composer: ReturnType<typeof createForwardMessageComposer>;
+}) {
+ return (
+ <Input.Root
+ class="w-full max-w-none min-h-0 items-stretch"
+ input={{
+ mode: 'channel',
+ attachments: props.composer.tracker.attachments(),
+ hasPendingAttachments: props.composer.isUploading(),
+ isDraggedOver: props.composer.isDraggedOver(),
+ }}
+ commands={{
+ attachFiles: props.composer.attachFiles,
+ removeAttachment: (attachment) => {
+ if (props.composer.isSending()) return;
+ props.composer.tracker.removeAttachment(attachment.id);
+ if (attachment.previewSrc?.startsWith('blob:')) {
+ URL.revokeObjectURL(attachment.previewSrc);
+ }
+ },
+ }}
+ >
+ <div
+ class="contents"
+ use:fileFolderDrop={{
+ onDragStart: props.composer.setIsDraggedOver,
+ onDragEnd: () => props.composer.setIsDraggedOver(false),
+ onDrop: (files, directories) =>
+ fireAndForget(
+ props.composer.attachEntries(files, directories),
+ 'share-attachments'
+ ),
+ }}
+ >
+ <Input.DropOverlay />
+ <div class="relative grow shrink min-h-0 flex flex-col">
+ <ScrollIndicators
+ scrollRef={props.composer.scrollRef}
+ noBorderStart
+ />
+ <CustomScrollbar scrollContainer={props.composer.scrollRef} />
+ <div
+ class="grow shrink min-h-20 max-h-56 overflow-y-auto scrollbar-hidden px-4 mobile:px-3 py-1.5 w-full text-sm"
+ ref={props.composer.setScrollRef}
+ >
+ <div onClick={() => props.composer.editor.controls.focus()}>
+ <MarkdownShell
+ config={props.composer.editor}
+ placeholder="Optional message"
+ portalScope="local"
+ class="text-sm min-h-20"
+ />
+ </div>
+ <Input.Attachments kind="media" />
+ <Input.Attachments kind="document" />
+ </div>
+ </div>
+ <div class="px-3 py-1 flex items-center">
+ <Input.AttachFilesAction disabled={props.composer.isSending()} />
+ </div>
+ </div>
+ </Input.Root>
+ );
+}
diff --git a/apps/web/src/lib/core/component/ForwardMessageComposer/browser-test/README.md b/apps/web/src/lib/core/component/ForwardMessageComposer/browser-test/README.md
new file mode 100644
index 0000000000..ef880b120b
--- /dev/null
+++ b/apps/web/src/lib/core/component/ForwardMessageComposer/browser-test/README.md
@@ -0,0 +1,17 @@
+# Share message attachments
+
+Run from `apps/web`:
+
+```sh
+bunx playwright test --config src/lib/core/component/ForwardMessageComposer/browser-test/playwright.config.ts
+```
+
+Set `PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH` when using an existing Chromium binary,
+and `SHARE_BROWSER_PORT` if port 3097 is occupied.
+
+The fixture mounts the production Share message composer and editor over a
+controlled uploader. It exercises real clipboard paste, file input, drop events,
+removal, failure recovery, and serialized inline-image payloads on desktop,
+phone, and tablet. Requests to hosted services are blocked. It does not test a
+live backend upload or delivery; `ForwardToChannel.test.tsx` checks the share
+send boundary and its upload guard. Screenshots are saved with test results.
diff --git a/apps/web/src/lib/core/component/ForwardMessageComposer/browser-test/fixture.tsx b/apps/web/src/lib/core/component/ForwardMessageComposer/browser-test/fixture.tsx
new file mode 100644
index 0000000000..f9cd2e766c
--- /dev/null
+++ b/apps/web/src/lib/core/component/ForwardMessageComposer/browser-test/fixture.tsx
@@ -0,0 +1,107 @@
+import '@app/index.css';
+import { AnalyticsContextProvider } from '@app/lib/analytics/analytics-context';
+import { PosthogProvider } from '@app/lib/analytics/posthog';
+import type { UploadResult } from '@channel/Input/utils/file-helpers';
+import { ChannelsContextProvider } from '@core/context/channels';
+import { QuickAccessProvider } from '@core/context/quickAccess/QuickAccessProvider';
+import { UserContextProvider } from '@core/context/user';
+import { useHotKeyRoot } from '@core/hotkey/hotkeys';
+import { EntityProvider } from '@entity';
+import { QueryClient, QueryClientProvider } from '@tanstack/solid-query';
+import { Button } from '@ui';
+import { createSignal, onCleanup, Show } from 'solid-js';
+import { render } from 'solid-js/web';
+import {
+ createForwardMessageComposer,
+ ForwardMessageComposer,
+} from '../../ForwardMessageComposer';
+
+function Draft() {
+ const [pending, setPending] = createSignal<
+ ((result: UploadResult) => void)[]
+ >([]);
+ const [sent, setSent] = createSignal('');
+ const composer = createForwardMessageComposer({
+ isSending: () => false,
+ uploadFile: () =>
+ new Promise((resolve) => setPending((current) => [...current, resolve])),
+ });
+ const finish = (failed: boolean) => {
+ const uploads = pending();
+ setPending([]);
+ for (const resolve of uploads)
+ resolve(
+ failed
+ ? { failed: true }
+ : { failed: false, destination: 'static', id: crypto.randomUUID() }
+ );
+ };
+ return (
+ <>
+ <section class="w-full max-w-xl border border-edge rounded-lg bg-surface overflow-hidden">
+ <h1 class="text-base font-medium p-4 border-b border-edge-muted">
+ Share document
+ </h1>
+ <ForwardMessageComposer composer={composer} />
+ <div class="p-4 flex justify-end">
+ <Button
+ variant="primary"
+ disabled={composer.isUploading()}
+ onClick={() => {
+ if (!composer.isUploading())
+ setSent(JSON.stringify(composer.message()));
+ }}
+ >
+ Share
+ </Button>
+ </div>
+ </section>
+ <div class="flex gap-2 my-4">
+ <Button data-release-file>Read dropped file</Button>
+ <Button disabled={!pending().length} onClick={() => finish(false)}>
+ Finish uploads
+ </Button>
+ <Button disabled={!pending().length} onClick={() => finish(true)}>
+ Fail uploads
+ </Button>
+ </div>
+ <output aria-label="Sent message">{sent()}</output>
+ </>
+ );
+}
+
+function Fixture() {
+ useHotKeyRoot();
+ const client = new QueryClient({
+ defaultOptions: { queries: { retry: false } },
+ });
+ onCleanup(() => client.clear());
+ const [open, setOpen] = createSignal(true);
+ return (
+ <QueryClientProvider client={client}>
+ <AnalyticsContextProvider>
+ <PosthogProvider>
+ <EntityProvider>
+ <UserContextProvider>
+ <ChannelsContextProvider>
+ <QuickAccessProvider>
+ <main class="min-h-screen bg-page p-4 text-ink">
+ <Button onClick={() => setOpen(!open())}>
+ {open() ? 'Close share' : 'Open share'}
+ </Button>
+ <Show when={open()}>
+ <Draft />
+ </Show>
+ </main>
+ </QuickAccessProvider>
+ </ChannelsContextProvider>
+ </UserContextProvider>
+ </EntityProvider>
+ </PosthogProvider>
+ </AnalyticsContextProvider>
+ </QueryClientProvider>
+ );
+}
+const root = document.getElementById('root');
+if (!root) throw new Error('Missing fixture root');
+render(() => <Fixture />, root);
diff --git a/apps/web/src/lib/core/component/ForwardMessageComposer/browser-test/images.browser.e2e.ts b/apps/web/src/lib/core/component/ForwardMessageComposer/browser-test/images.browser.e2e.ts
new file mode 100644
index 0000000000..a3cc7994f4
--- /dev/null
+++ b/apps/web/src/lib/core/component/ForwardMessageComposer/browser-test/images.browser.e2e.ts
@@ -0,0 +1,146 @@
+import { expect, test } from '@playwright/test';
+
+const IMAGE =
+ 'iVBORw0KGgoAAAANSUhEUgAAAKAAAABkCAIAAACO1KzYAAABVUlEQVR4nO3aQQ2AMBQFwTrCFGeEoQQl6MAC6YGE7ST/Pm32+sZ+3tO3Hdf0cb9xx2ofXs0VOO4KHHcFjrsCx12B467AcVfguCtw3BU47gocdwWOuwLHXYHjrsBxV+C4K3DcFTjuChx3xx8fzX1/AsddgeOuwHFX4LgrcNwVOO4KHHcFjrsCx12B467AcVfguCtw3BU47gocdwWOuwLHXYHjrsBx1+gu7gocdwWOuwLHXYHjrsBxV+C4K3DcFTjuChx3BY67AsddgeOuwHFX4LgrcNwVOO4KHHcFjrsCx12ju7grcNwVOO4KHHcFjrsCx12B467AcVfguCtw3BU47gocdwWOuwLHXYHjrsBxV+C4K3DcFTjuChx3je7irsBxV+C4K3DcFTjuChx3BY67AsddgeOuwHFX4LgrcNwVOO4KHHcFjrsCx12B467AcVfguCtw3H0A1UmjWQj5J0YAAAAASUVORK5CYII=';
+
+test.beforeEach(async ({ page, context }) => {
+ await context.grantPermissions(['clipboard-read', 'clipboard-write']);
+ await page.route('**/*', async (route) => {
+ const url = new URL(route.request().url());
+ if (url.hostname === '127.0.0.1' || url.hostname === 'localhost')
+ await route.continue();
+ else
+ await route.fulfill({
+ status: 401,
+ contentType: 'application/json',
+ body: '{}',
+ });
+ });
+ await page.routeWebSocket('**/*', (socket) => socket.close());
+ await page.goto('/');
+ await expect(page.locator('[data-markdown-editable]')).toBeVisible({
+ timeout: 60_000,
+ });
+});
+
+test('pastes an image, waits for its upload and sends an inline image with multiline text', async ({
+ page,
+}, testInfo) => {
+ const editor = page.locator('[data-markdown-editable]');
+ await editor.click();
+ await page.keyboard.type('First line');
+ await page.keyboard.press('Enter');
+ await page.keyboard.type('Second line');
+ await page.evaluate(async (encoded) => {
+ const bytes = Uint8Array.from(atob(encoded), (char) => char.charCodeAt(0));
+ await navigator.clipboard.write([
+ new ClipboardItem({
+ 'image/png': new Blob([bytes], { type: 'image/png' }),
+ }),
+ ]);
+ }, IMAGE);
+ await page.keyboard.press('ControlOrMeta+v');
+ await expect(
+ page.locator('[data-input-attachments="media"] img[src^="blob:"]')
+ ).toBeVisible();
+ await expect(
+ page.getByRole('button', { name: 'Share', exact: true })
+ ).toBeDisabled();
+ await page.getByRole('button', { name: 'Finish uploads' }).click();
+ await expect(
+ page.getByRole('button', { name: 'Share', exact: true })
+ ).toBeEnabled();
+ await page
+ .locator('section')
+ .screenshot({ path: testInfo.outputPath('share-image.png') });
+ await page.getByRole('button', { name: 'Share', exact: true }).click();
+ const sent = JSON.parse(await page.getByLabel('Sent message').innerText());
+ expect(sent.content).toContain('First line');
+ expect(sent.content).toContain('Second line');
+ expect(sent.content).toContain('\n');
+ expect(sent.attachments).toEqual([
+ {
+ entity_type: 'static/image',
+ entity_id: expect.any(String),
+ width: 160,
+ height: 100,
+ },
+ ]);
+});
+
+test('removing an uploading image keeps it out of the message', async ({
+ page,
+}) => {
+ await page.locator('[data-input-attach-file-picker]').setInputFiles({
+ name: 'removed.png',
+ mimeType: 'image/png',
+ buffer: Buffer.from(IMAGE, 'base64'),
+ });
+ await page
+ .getByRole('button', { name: 'Remove removed.png', exact: true })
+ .click();
+ await page.getByRole('button', { name: 'Finish uploads' }).click();
+ await expect(
+ page.getByRole('button', { name: 'Share', exact: true })
+ ).toBeEnabled();
+ await expect(page.locator('[data-input-attachments="media"]')).toHaveCount(0);
+ await page.getByRole('button', { name: 'Share', exact: true }).click();
+ expect(
+ JSON.parse(await page.getByLabel('Sent message').innerText()).attachments
+ ).toEqual([]);
+});
+
+test('accepts a dropped image and lets an upload failure recover', async ({
+ page,
+}) => {
+ const transfer = await page.evaluateHandle((encoded) => {
+ const data = new DataTransfer();
+ const file = new File(
+ [Uint8Array.from(atob(encoded), (char) => char.charCodeAt(0))],
+ 'dropped.png',
+ { type: 'image/png' }
+ );
+ const item = data.items.add(file);
+ // Hold filesystem preparation so the send guard is exercised before an
+ // attachment has reached the uploader.
+ Object.defineProperty(item, 'webkitGetAsEntry', {
+ value: () => ({
+ isFile: true,
+ isDirectory: false,
+ file: (ready: (file: File) => void) => {
+ document
+ .querySelector('[data-release-file]')
+ ?.addEventListener('click', () => ready(file), { once: true });
+ },
+ }),
+ });
+ return data;
+ }, IMAGE);
+ await page
+ .locator('[data-markdown-editable]')
+ .dispatchEvent('drop', { dataTransfer: transfer });
+ await expect(
+ page.getByRole('button', { name: 'Share', exact: true })
+ ).toBeDisabled();
+ await page.getByRole('button', { name: 'Read dropped file' }).click();
+ await page.getByRole('button', { name: 'Fail uploads' }).click();
+ await expect(page.locator('[data-input-attachments="media"]')).toHaveCount(0);
+ await expect(
+ page.getByRole('button', { name: 'Share', exact: true })
+ ).toBeEnabled();
+ await page.locator('[data-input-attach-file-picker]').setInputFiles({
+ name: 'retry.png',
+ mimeType: 'image/png',
+ buffer: Buffer.from(IMAGE, 'base64'),
+ });
+ await page.getByRole('button', { name: 'Finish uploads' }).click();
+ await expect(
+ page.getByRole('button', { name: 'Share', exact: true })
+ ).toBeEnabled();
+ await expect(
+ page.getByRole('button', { name: 'Remove retry.png' })
+ ).toBeAttached();
+ await page.getByRole('button', { name: 'Close share' }).click();
+ await page.getByRole('button', { name: 'Open share' }).click();
+ await expect(page.locator('[data-input-attachments="media"]')).toHaveCount(0);
+});
diff --git a/apps/web/src/lib/core/component/ForwardMessageComposer/browser-test/index.html b/apps/web/src/lib/core/component/ForwardMessageComposer/browser-test/index.html
new file mode 100644
index 0000000000..53539b4a3a
--- /dev/null
+++ b/apps/web/src/lib/core/component/ForwardMessageComposer/browser-test/index.html
@@ -0,0 +1 @@
+<!doctype html><html lang="en"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>Share message</title></head><body><div id="root"></div><script type="module" src="./fixture.tsx"></script></body></html>
\ No newline at end of file
diff --git a/apps/web/src/lib/core/component/ForwardMessageComposer/browser-test/playwright.config.ts b/apps/web/src/lib/core/component/ForwardMessageComposer/browser-test/playwright.config.ts
new file mode 100644
index 0000000000..0b23501aae
--- /dev/null
+++ b/apps/web/src/lib/core/component/ForwardMessageComposer/browser-test/playwright.config.ts
@@ -0,0 +1,41 @@
+import { fileURLToPath } from 'node:url';
+import { defineConfig, devices } from '@playwright/test';
+
+const directory = fileURLToPath(new URL('.', import.meta.url));
+const webDirectory = fileURLToPath(
+ new URL('../../../../../../', import.meta.url)
+);
+const port = Number(process.env.SHARE_BROWSER_PORT ?? 3097);
+export default defineConfig({
+ testDir: directory,
+ testMatch: '*.browser.e2e.ts',
+ outputDir: `${directory}/test-results`,
+ timeout: 90_000,
+ workers: 1,
+ reporter: 'line',
+ use: {
+ launchOptions: {
+ executablePath: process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH,
+ },
+ baseURL: `http://127.0.0.1:${port}`,
+ trace: 'retain-on-failure',
+ screenshot: 'only-on-failure',
+ },
+ webServer: {
+ command: `bunx vite --config src/lib/core/component/ForwardMessageComposer/browser-test/vite.config.ts --port ${port}`,
+ cwd: webDirectory,
+ url: `http://127.0.0.1:${port}`,
+ reuseExistingServer: false,
+ },
+ projects: [
+ { name: 'desktop', use: { ...devices['Desktop Chrome'] } },
+ {
+ name: 'tablet',
+ use: { ...devices['iPad Mini'], browserName: 'chromium' },
+ },
+ {
+ name: 'mobile',
+ use: { ...devices['iPhone 13'], browserName: 'chromium' },
+ },
+ ],
+});
diff --git a/apps/web/src/lib/core/component/ForwardMessageComposer/browser-test/vite.config.ts b/apps/web/src/lib/core/component/ForwardMessageComposer/browser-test/vite.config.ts
new file mode 100644
index 0000000000..f8ef8672cf
--- /dev/null
+++ b/apps/web/src/lib/core/component/ForwardMessageComposer/browser-test/vite.config.ts
@@ -0,0 +1,27 @@
+import { fileURLToPath } from 'node:url';
+import tailwindcss from '@tailwindcss/vite';
+import { defineConfig } from 'vite';
+import solid from 'vite-plugin-solid';
+import solidSvg from 'vite-plugin-solid-svg';
+import tsconfigPaths from 'vite-tsconfig-paths';
+
+const directory = fileURLToPath(new URL('.', import.meta.url));
+const webDirectory = fileURLToPath(
+ new URL('../../../../../../', import.meta.url)
+);
+export default defineConfig({
+ root: directory,
+ cacheDir: `${directory}/.vite`,
+ plugins: [
+ tailwindcss(),
+ solid(),
+ solidSvg({ defaultAsComponent: true }),
+ tsconfigPaths({ projects: [`${webDirectory}/tsconfig.json`] }),
+ ],
+ resolve: {
+ dedupe: ['solid-js'],
+ alias: { 'loro-crdt': 'loro-crdt/base64' },
+ },
+ optimizeDeps: { esbuildOptions: { target: 'esnext' } },
+ server: { host: '127.0.0.1', strictPort: true },
+});
diff --git a/apps/web/src/lib/core/component/ForwardToChannel.test.tsx b/apps/web/src/lib/core/component/ForwardToChannel.test.tsx
index 32a9750878..9012e8c82d 100644
--- a/apps/web/src/lib/core/component/ForwardToChannel.test.tsx
+++ b/apps/web/src/lib/core/component/ForwardToChannel.test.tsx
@@ -1,3 +1,5 @@
+import { registerHotkey } from '@core/hotkey/hotkeys';
+import { type Span, Telemetry } from '@macro-inc/observability';
import {
cleanup,
fireEvent,
@@ -5,7 +7,7 @@ import {
screen,
waitFor,
} from '@solidjs/testing-library';
-import type { ComponentProps, JSX } from 'solid-js';
+import { type ComponentProps, createSignal, type JSX } from 'solid-js';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { ForwardToChannel } from './ForwardToChannel';
import { Permissions } from './SharePermissions';
@@ -16,16 +18,30 @@ const mocks = vi.hoisted(() => ({
success: vi.fn(),
failure: vi.fn(),
shareOptions: vi.fn(),
+ uploading: (): boolean => false,
+ attachments: [] as {
+ entity_type: string;
+ entity_id: string;
+ width: number;
+ height: number;
+ }[],
recipients: [] as { kind: 'channel' | 'user'; id: string }[],
}));
vi.mock('@app/lib/analytics/analytics-context', () => ({
useAnalytics: () => ({ track: vi.fn() }),
}));
-vi.mock('@channel/Input', () => ({
- createConfiguredChannelMarkdownEditor: () => ({
- controls: { focus: vi.fn() },
+vi.mock('@core/component/ForwardMessageComposer', () => ({
+ createForwardMessageComposer: () => ({
+ message: () => ({
+ content: '',
+ mentions: [],
+ attachments: mocks.attachments,
+ }),
+ isUploading: () => mocks.uploading(),
+ clear: vi.fn(),
}),
+ ForwardMessageComposer: () => <textarea aria-label="Optional message" />,
}));
vi.mock('@core/auth', () => ({ useIsAuthenticated: () => () => true }));
vi.mock('@core/block', () => ({
@@ -97,9 +113,55 @@ function deferred<T>() {
return { promise, resolve };
}
+class RecordedSpan implements Span {
+ readonly children: RecordedSpan[] = [];
+ readonly attributes: Record<string, unknown> = {};
+ readonly errors: unknown[] = [];
+ ends = 0;
+
+ constructor(readonly name: string) {}
+ span<T>(name: string, operation: (span: Span) => Promise<T>): Promise<T>;
+ span(name: string): Span;
+ span<T>(
+ name: string,
+ operation?: (span: Span) => Promise<T>
+ ): Span | Promise<T> {
+ const child = new RecordedSpan(name);
+ this.children.push(child);
+ if (!operation) return child;
+ return child.run(async () => {
+ try {
+ return await operation(child);
+ } finally {
+ child.end();
+ }
+ });
+ }
+ run<T>(operation: () => T): T {
+ return operation();
+ }
+ setAttr(name: string, value: unknown) {
+ this.attributes[name] = value;
+ }
+ event() {}
+ error(error: unknown) {
+ this.errors.push(error);
+ }
+ traceparent() {
+ return undefined;
+ }
+ injectTraceHeaders() {}
+ end() {
+ this.ends += 1;
+ }
+}
+
+let trace: RecordedSpan;
+
function mountForward(
setChannelPermissions = vi.fn().mockResolvedValue(true),
- blockName: ComponentProps<typeof ForwardToChannel>['blockName'] = 'agent'
+ blockName: ComponentProps<typeof ForwardToChannel>['blockName'] = 'agent',
+ prepareChannel?: ComponentProps<typeof ForwardToChannel>['prepareChannel']
) {
const onSubmit = vi.fn();
const refetch = vi.fn();
@@ -113,6 +175,7 @@ function mountForward(
blockId="session-1"
onSubmit={onSubmit}
refetch={refetch}
+ prepareChannel={prepareChannel}
ref={(value) => {
controls = value;
}}
@@ -135,9 +198,16 @@ function mountForward(
beforeEach(() => {
vi.resetAllMocks();
+ trace = new RecordedSpan('test');
+ vi.spyOn(Telemetry, 'span').mockImplementation(trace.span.bind(trace));
+ mocks.uploading = () => false;
+ mocks.attachments = [];
mocks.recipients = [{ kind: 'channel', id: 'channel-1' }];
});
-afterEach(cleanup);
+afterEach(() => {
+ cleanup();
+ vi.restoreAllMocks();
+});
describe('forwarding with selected access', () => {
it('limits the desktop form invitation to responding or editing', () => {
@@ -276,6 +346,21 @@ describe('forwarding with selected access', () => {
await submit();
expect(onSubmit).not.toHaveBeenCalled();
+ const firstDelivery = trace.children[0].children[0];
+ expect(firstDelivery.attributes).toMatchObject({
+ 'delivery.reused': false,
+ 'channel.id': 'channel-1',
+ 'delivery.outcome': 'failure',
+ });
+ expect(firstDelivery.children.map((span) => span.name)).toEqual([
+ 'share.send_message',
+ 'share.update_permissions',
+ ]);
+ expect(firstDelivery.children[0].errors).toEqual([]);
+ expect(firstDelivery.children[1].errors).toEqual([
+ 'Share permission update failed',
+ ]);
+ expect(firstDelivery.children.map((span) => span.ends)).toEqual([1, 1]);
setAccessLevel('edit');
// Reordering a group's recipients still addresses the same group.
mocks.recipients = [...mocks.recipients].reverse();
@@ -288,6 +373,16 @@ describe('forwarding with selected access', () => {
expect(grant).toHaveBeenNthCalledWith(1, 'channel-1', 'view');
expect(grant).toHaveBeenNthCalledWith(2, 'channel-1', 'edit');
expect(onSubmit).toHaveBeenCalledOnce();
+ const retryDelivery = trace.children[1].children[0];
+ expect(retryDelivery.attributes).toMatchObject({
+ 'delivery.reused': true,
+ 'delivery.outcome': 'success',
+ });
+ expect(retryDelivery.children.map((span) => span.name)).toEqual([
+ 'share.update_permissions',
+ ]);
+ expect(retryDelivery.children[0].errors).toEqual([]);
+ expect(retryDelivery.children[0].ends).toBe(1);
}
);
@@ -349,18 +444,55 @@ describe('forwarding with selected access', () => {
'Failed to set channel permissions',
error
);
+ const permissions = trace.children[0].children[0].children[1];
+ expect(permissions.errors).toEqual(['Share permission update failed']);
+ expect(permissions.ends).toBe(1);
logError.mockRestore();
});
- it('does not grant access or close when the message fails', async () => {
- mocks.sendToChannel.mockResolvedValue(undefined);
- const { submit, onSubmit, setChannelPermissions } = mountForward();
+ it.each(['empty result', 'rejection'])(
+ 'records a failed send without granting access for an %s',
+ async (failure) => {
+ vi.spyOn(console, 'error').mockImplementation(() => {});
+ if (failure === 'empty result')
+ mocks.sendToChannel.mockResolvedValue(undefined);
+ else mocks.sendToChannel.mockRejectedValue(new Error('Send failed'));
+ const { submit, onSubmit, setChannelPermissions } = mountForward();
+
+ await submit();
+
+ expect(setChannelPermissions).not.toHaveBeenCalled();
+ expect(onSubmit).not.toHaveBeenCalled();
+ expect(mocks.failure).toHaveBeenCalledWith('Message failed to send');
+ const delivery = trace.children[0].children[0];
+ expect(delivery.children.map((span) => span.name)).toEqual([
+ 'share.send_message',
+ ]);
+ expect(delivery.children[0].errors).toEqual([
+ 'Share message send failed',
+ ]);
+ expect(delivery.children[0].ends).toBe(1);
+ }
+ );
+
+ it('records a failed permission preparation before sending', async () => {
+ vi.spyOn(console, 'error').mockImplementation(() => {});
+ const prepare = vi.fn().mockRejectedValue(new Error('Preparation failed'));
+ mocks.sendToChannel.mockImplementation(async ({ beforeSend }) => {
+ await beforeSend('channel-1');
+ return { channelId: 'channel-1', navigateToChannel: vi.fn() };
+ });
+ const { submit, onSubmit } = mountForward(undefined, 'agent', prepare);
await submit();
- expect(setChannelPermissions).not.toHaveBeenCalled();
expect(onSubmit).not.toHaveBeenCalled();
- expect(mocks.failure).toHaveBeenCalledWith('Message failed to send');
+ const permissions = trace.children[0].children[0].children.find(
+ (span) => span.name === 'share.update_permissions'
+ );
+ expect(permissions?.attributes['channel.id']).toBe('channel-1');
+ expect(permissions?.errors).toEqual(['Share permission update failed']);
+ expect(permissions?.ends).toBe(1);
});
it('waits for every recipient and reports partial failures', async () => {
@@ -406,3 +538,90 @@ describe('forwarding with selected access', () => {
expect(onSubmit).toHaveBeenCalledOnce();
});
});
+
+describe('forwarding image attachments', () => {
+ it.each(['channel', 'user'] as const)(
+ 'includes inline images with the shared entity for a %s',
+ async (target) => {
+ mocks.recipients = [{ kind: target, id: 'recipient-1' }];
+ mocks.attachments = [
+ {
+ entity_type: 'static/image',
+ entity_id: 'image-1',
+ width: 20,
+ height: 10,
+ },
+ ];
+ const send =
+ target === 'channel' ? mocks.sendToChannel : mocks.sendToUsers;
+ send.mockResolvedValue({
+ channelId: 'channel-1',
+ navigateToChannel: vi.fn(),
+ });
+ const { submit } = mountForward();
+ await submit();
+ expect(send).toHaveBeenCalledWith(
+ expect.objectContaining({
+ attachments: [
+ { entity_type: 'agent_session', entity_id: 'session-1' },
+ {
+ entity_type: 'static/image',
+ entity_id: 'image-1',
+ width: 20,
+ height: 10,
+ },
+ ],
+ })
+ );
+ }
+ );
+
+ it.each(['button', 'shortcut'] as const)(
+ 'blocks sharing from the %s until an image upload completes',
+ async (path) => {
+ const [uploading, setUploading] = createSignal(true);
+ mocks.uploading = uploading;
+ mocks.sendToChannel.mockResolvedValue({
+ channelId: 'channel-1',
+ navigateToChannel: vi.fn(),
+ });
+ const { onSubmit } = mountForward();
+ const button = screen.getByRole('button', { name: 'Share' });
+ const shortcut = vi
+ .mocked(registerHotkey)
+ .mock.calls.find(
+ ([options]) => options.hotkey === 'cmd+enter'
+ )?.[0].keyDownHandler;
+ if (!shortcut) throw new Error('Share shortcut was not registered');
+
+ expect(button.hasAttribute('disabled')).toBe(true);
+ fireEvent.click(button);
+ shortcut(new KeyboardEvent('keydown', { key: 'Enter', metaKey: true }));
+ expect(mocks.sendToChannel).not.toHaveBeenCalled();
+
+ mocks.attachments = [
+ {
+ entity_type: 'static/image',
+ entity_id: 'image-1',
+ width: 20,
+ height: 10,
+ },
+ ];
+ setUploading(false);
+ await waitFor(() => expect(button.hasAttribute('disabled')).toBe(false));
+ if (path === 'button') fireEvent.click(button);
+ else
+ shortcut(new KeyboardEvent('keydown', { key: 'Enter', metaKey: true }));
+ await waitFor(() => expect(onSubmit).toHaveBeenCalledOnce());
+ expect(mocks.sendToChannel).toHaveBeenCalledOnce();
+ expect(mocks.sendToChannel).toHaveBeenCalledWith(
+ expect.objectContaining({
+ attachments: [
+ { entity_type: 'agent_session', entity_id: 'session-1' },
+ ...mocks.attachments,
+ ],
+ })
+ );
+ }
+ );
+});
diff --git a/apps/web/src/lib/core/component/ForwardToChannel.tsx b/apps/web/src/lib/core/component/ForwardToChannel.tsx
index 728c85c848..f4b402181f 100644
--- a/apps/web/src/lib/core/component/ForwardToChannel.tsx
+++ b/apps/web/src/lib/core/component/ForwardToChannel.tsx
@@ -1,5 +1,4 @@
import { useAnalytics } from '@app/lib/analytics/analytics-context';
-import { createConfiguredChannelMarkdownEditor } from '@channel/Input';
import { useMacroMentionLinkResolver } from '@components/app/split-layout/split-router/mention-links';
import { useIsAuthenticated } from '@core/auth';
import {
@@ -9,8 +8,6 @@ import {
useMaybeBlockId,
useMaybeBlockName,
} from '@core/block';
-import { CustomScrollbar } from '@core/component/CustomScrollbar';
-import { MarkdownShell } from '@core/component/LexicalMarkdown/builder/MarkdownShell';
import { RecipientSelector } from '@core/component/RecipientSelector';
import { ShareOptions } from '@core/component/TopBar/ShareButton';
import { resolveBlockAlias } from '@core/constant/allBlocks';
@@ -21,8 +18,10 @@ import type { WithCustomUserInput } from '@core/user';
import { useSendMessageToPeople } from '@core/util/channels';
import { getDestinationFromOptions } from '@core/util/destination';
import { fireAndForget } from '@core/util/fireAndForget';
+import { chatRuleset, uploadFile } from '@core/util/upload';
import CheckIcon from '@icon/system/regular/check.svg?component-solid';
import PaperPlaneTilt from '@icon/system/regular/paper-plane-tilt.svg';
+import { type Span, Telemetry } from '@macro-inc/observability';
import {
blockNameToItemType,
itemTypeToReferenceEntityType,
@@ -40,9 +39,12 @@ import {
Show,
} from 'solid-js';
import { match } from 'ts-pattern';
+import {
+ createForwardMessageComposer,
+ ForwardMessageComposer,
+} from './ForwardMessageComposer';
import { Permissions } from './SharePermissions';
import { toast } from './Toast/Toast';
-import { ScrollIndicators } from './VerticalScrollIndicators';
type Recipient = WithCustomUserInput<'user' | 'contact' | 'channel'>;
@@ -61,9 +63,7 @@ interface MobileForwardToChannelLayoutProps
destinationOptions: ReturnType<typeof useCombinedRecipients>['all'];
submitAccessLevel: Accessor<AccessLevel | null>;
setSubmitAccessLevel: (level: AccessLevel | null) => void;
- mdScrollRef: Accessor<HTMLElement | undefined>;
- setMdScrollRef: (el: HTMLElement) => void;
- markdownEditor: ReturnType<typeof createConfiguredChannelMarkdownEditor>;
+ composer: ReturnType<typeof createForwardMessageComposer>;
handleSubmit: () => void;
canSendAsGroup: Accessor<boolean>;
sendAsGroupMessage: Accessor<boolean>;
@@ -154,20 +154,7 @@ function MobileForwardToChannelLayout(
</Show>
<div class="flex-1 min-h-20 flex flex-col w-full mt-3 border-t border-edge-muted relative">
- <ScrollIndicators scrollRef={props.mdScrollRef} noBorderStart />
- <CustomScrollbar scrollContainer={props.mdScrollRef} />
- <div
- class="grow shrink min-h-20 overflow-y-auto scrollbar-hidden px-3 py-1.5 w-full text-sm"
- onClick={() => props.markdownEditor.controls.focus()}
- ref={props.setMdScrollRef}
- >
- <MarkdownShell
- config={props.markdownEditor}
- placeholder="Optional message"
- portalScope="local"
- class="text-sm"
- />
- </div>
+ <ForwardMessageComposer composer={props.composer} />
</div>
</Show>
);
@@ -195,6 +182,7 @@ interface ForwardToChannelProps {
setSubmitAccessLevel: (level: AccessLevel | null) => void;
getSubmitAccessLevel: () => AccessLevel | null;
handleSubmit: () => void;
+ canSubmit: () => boolean;
}) => void;
hideAccessLevelSelector?: boolean;
initialAccessLevel?: AccessLevel | null;
@@ -222,21 +210,18 @@ export function ForwardToChannel(props: ForwardToChannelProps) {
WithCustomUserInput<'user' | 'contact' | 'channel'>[]
>([]);
- const [mdScrollRef, setMdScrollRef] = createSignal<HTMLElement>();
const [containerRef, setContainerRef] = createSignal<HTMLDivElement>();
- const [markdown, setMarkdown] = createSignal('');
- // No onEnter: the optional message is a multi-line composer, so a bare Enter
- // falls through to Lexical and inserts a newline. Sharing is bound to
- // cmd+enter through the hotkey system below.
- const markdownEditor = createConfiguredChannelMarkdownEditor({
- namespace: 'forward-to-channel-markdown',
- resolveAppLink: useMacroMentionLinkResolver(),
- enableMentions: true,
- onChange: setMarkdown,
- });
const [triedToSubmit, setTriedToSubmit] = createSignal(false);
const [isSubmitting, setIsSubmitting] = createSignal(false);
+ const composer = createForwardMessageComposer({
+ resolveAppLink: useMacroMentionLinkResolver(),
+ isSending: isSubmitting,
+ uploadFile: (file) =>
+ uploadFile(file, chatRuleset, { hideProgressIndicator: true }),
+ });
+ const canSubmit = () =>
+ selectedOptions().length > 0 && !isSubmitting() && !composer.isUploading();
const { all: destinationOptions } = useCombinedRecipients();
const destination = createMemo(() => {
@@ -374,14 +359,26 @@ export function ForwardToChannel(props: ForwardToChannelProps) {
async function sendForward(
target: NonNullable<ReturnType<typeof destination>>,
- accessLevel: AccessLevel | null
+ accessLevel: AccessLevel | null,
+ deliverySpan: Span
) {
const prepare = props.prepareChannel;
+ const composed = composer.message();
const message = {
- attachments: [asAttachment()],
- content: markdown(),
- mentions: [],
- beforeSend: prepare && ((id: string) => prepare(id, accessLevel)),
+ ...composed,
+ attachments: [asAttachment(), ...(composed.attachments ?? [])],
+ beforeSend:
+ prepare &&
+ ((id: string) =>
+ deliverySpan.span('share.update_permissions', async (span) => {
+ span.setAttr('channel.id', id);
+ try {
+ await prepare(id, accessLevel);
+ } catch (error) {
+ span.error('Share permission update failed');
+ throw error;
+ }
+ })),
};
const deliveryKey = JSON.stringify([
message,
@@ -390,15 +387,23 @@ export function ForwardToChannel(props: ForwardToChannelProps) {
: { type: target.type, users: [...target.users].sort() },
]);
let delivery = deliveries.get(deliveryKey);
+ deliverySpan.setAttr('delivery.reused', delivery !== undefined);
if (!delivery) {
+ const sendSpan = deliverySpan.span('share.send_message');
let result;
try {
- result =
+ result = await sendSpan.run(() =>
target.type === 'channel'
- ? await sendToChannel({ ...message, channelId: target.id })
- : await sendToUsers({ ...message, users: target.users });
+ ? sendToChannel({ ...message, channelId: target.id })
+ : sendToUsers({ ...message, users: target.users })
+ );
+ if (result) sendSpan.setAttr('channel.id', result.channelId);
+ else sendSpan.error('Share message send failed');
} catch (error) {
+ sendSpan.error('Share message send failed');
console.error('Failed to forward message', error);
+ } finally {
+ sendSpan.end();
}
if (!result) {
toast.failure('Message failed to send');
@@ -411,18 +416,22 @@ export function ForwardToChannel(props: ForwardToChannelProps) {
trackForwardShare(target.type === 'channel' ? 'channel' : 'user');
}
}
+ deliverySpan.setAttr('channel.id', delivery.result.channelId);
// Sending an attachment can automatically grant access. Apply the selected
// level afterward so that auto-grant cannot overwrite the user's choice.
if (delivery.accessLevel !== accessLevel) {
- if (
- !(await submitChannelPermissions(
- delivery.result.channelId,
- accessLevel
- ))
- ) {
- return;
- }
+ const channelId = delivery.result.channelId;
+ const granted = await deliverySpan.span(
+ 'share.update_permissions',
+ async (span) => {
+ span.setAttr('channel.id', channelId);
+ const result = await submitChannelPermissions(channelId, accessLevel);
+ if (!result) span.error('Share permission update failed');
+ return result;
+ }
+ );
+ if (!granted) return;
if (delivery.accessLevel === undefined) {
trackForwardShare(target.type === 'channel' ? 'channel' : 'user');
}
@@ -432,7 +441,7 @@ export function ForwardToChannel(props: ForwardToChannelProps) {
}
async function handleSubmit() {
- if (isSubmitting()) return;
+ if (isSubmitting() || composer.isUploading()) return;
const options = selectedOptions();
const destination_ = destination();
if (options.length === 0 || !destination_) {
@@ -450,9 +459,44 @@ export function ForwardToChannel(props: ForwardToChannelProps) {
const accessLevel = submitAccessLevel();
setIsSubmitting(true);
try {
- const results = await Promise.all(
- targets.map((target) => sendForward(target, accessLevel))
- );
+ const results = await Telemetry.span('share.forward', async (span) => {
+ span.setAttr('entity.id', asAttachment().entity_id);
+ span.setAttr('recipient.count', targets.length);
+ span.setAttr(
+ 'attachment.count',
+ (composer.message().attachments?.length ?? 0) + 1
+ );
+ const deliveries = await Promise.all(
+ targets.map((target, index) =>
+ span.span('share.deliver', async (deliverySpan) => {
+ deliverySpan.setAttr('target.index', index);
+ deliverySpan.setAttr('target.type', target.type);
+ if (target.type === 'channel') {
+ deliverySpan.setAttr('channel.id', target.id);
+ } else {
+ // User IDs can contain email addresses; only record the count.
+ deliverySpan.setAttr('recipient.count', target.users.length);
+ }
+ const delivery = await sendForward(
+ target,
+ accessLevel,
+ deliverySpan
+ );
+ deliverySpan.setAttr(
+ 'delivery.outcome',
+ delivery ? 'success' : 'failure'
+ );
+ if (!delivery) {
+ deliverySpan.error('Share delivery failed');
+ }
+ return delivery;
+ })
+ )
+ );
+ if (deliveries.some((delivery) => !delivery))
+ span.error('Share failed');
+ return deliveries;
+ });
props.refetch?.();
if (results.some((result) => !result)) {
if (targets.length > 1) {
@@ -477,6 +521,7 @@ export function ForwardToChannel(props: ForwardToChannelProps) {
}
}
deliveries.clear();
+ composer.clear();
props.onSubmit?.();
} finally {
setIsSubmitting(false);
@@ -514,6 +559,7 @@ export function ForwardToChannel(props: ForwardToChannelProps) {
getSelectedOptions: selectedOptions,
setSubmitAccessLevel,
handleSubmit,
+ canSubmit,
});
}
});
@@ -537,9 +583,7 @@ export function ForwardToChannel(props: ForwardToChannelProps) {
allowedAccessLevels={props.allowedAccessLevels}
submitAccessLevel={submitAccessLevel}
setSubmitAccessLevel={setSubmitAccessLevel}
- mdScrollRef={mdScrollRef}
- setMdScrollRef={setMdScrollRef}
- markdownEditor={markdownEditor}
+ composer={composer}
handleSubmit={handleSubmit}
canSendAsGroup={canSendAsGroup}
sendAsGroupMessage={sendAsGroupMessage}
@@ -587,22 +631,7 @@ export function ForwardToChannel(props: ForwardToChannelProps) {
{/* Row 2: Optional message */}
<div class="grow shrink min-h-0 flex flex-col w-full border-t border-edge-muted">
- <div class="relative grow shrink min-h-0 flex flex-col">
- <ScrollIndicators scrollRef={mdScrollRef} noBorderStart />
- <CustomScrollbar scrollContainer={mdScrollRef} />
- <div
- class="grow shrink min-h-20 max-h-40 overflow-y-auto scrollbar-hidden px-4 py-1.5 w-full text-sm"
- onClick={() => markdownEditor.controls.focus()}
- ref={setMdScrollRef}
- >
- <MarkdownShell
- config={markdownEditor}
- placeholder="Optional message"
- portalScope="local"
- class="text-sm"
- />
- </div>
- </div>
+ <ForwardMessageComposer composer={composer} />
{/* Row 3: Send As Group (optional) + Cancel + Send */}
<div class="shrink-0 flex w-full items-center px-4 py-4 gap-3 flex-wrap">
@@ -670,7 +699,7 @@ export function ForwardToChannel(props: ForwardToChannelProps) {
</Button>
<Button
variant="primary"
- disabled={selectedOptions().length === 0 || isSubmitting()}
+ disabled={!canSubmit()}
onClick={() => {
const options = selectedOptions();
if (options && options.length > 0) {
diff --git a/apps/web/src/lib/core/component/TopBar/ShareButton.test.tsx b/apps/web/src/lib/core/component/TopBar/ShareButton.test.tsx
index 31e9acd249..ebfbda13a8 100644
--- a/apps/web/src/lib/core/component/TopBar/ShareButton.test.tsx
+++ b/apps/web/src/lib/core/component/TopBar/ShareButton.test.tsx
@@ -143,10 +143,13 @@ vi.mock('@queries/storage/databases', () => ({
vi.mock('@app/lib/analytics/analytics-context', () => ({
useAnalytics: () => ({ track: vi.fn() }),
}));
-vi.mock('@channel/Input', () => ({
- createConfiguredChannelMarkdownEditor: () => ({
- controls: { focus: vi.fn() },
+vi.mock('@core/component/ForwardMessageComposer', () => ({
+ createForwardMessageComposer: () => ({
+ message: () => ({ content: '', mentions: [], attachments: [] }),
+ isUploading: () => false,
+ clear: vi.fn(),
}),
+ ForwardMessageComposer: () => <textarea aria-label="Optional message" />,
}));
vi.mock('@core/auth', () => ({ useIsAuthenticated: () => () => true }));
vi.mock('@core/constant/allBlocks', () => ({
diff --git a/apps/web/src/lib/core/component/TopBar/ShareButton.tsx b/apps/web/src/lib/core/component/TopBar/ShareButton.tsx
index 41a1083d92..03c097b859 100644
--- a/apps/web/src/lib/core/component/TopBar/ShareButton.tsx
+++ b/apps/web/src/lib/core/component/TopBar/ShareButton.tsx
@@ -782,7 +782,7 @@ function MobileShareDrawer(props: MobileShareDrawerProps) {
const [forwardRef, setForwardRef] = createSignal<{
handleSubmit: () => void;
- getSelectedOptions: () => unknown[];
+ canSubmit: () => boolean;
}>();
return (
@@ -815,9 +815,7 @@ function MobileShareDrawer(props: MobileShareDrawerProps) {
variant="primary"
size="sm"
class="shrink-0 ml-2"
- disabled={
- (forwardRef()?.getSelectedOptions().length ?? 0) === 0
- }
+ disabled={!forwardRef()?.canSubmit()}
onClick={() => forwardRef()?.handleSubmit()}
>
Share
diff --git a/docs/agent-guide/documents.md b/docs/agent-guide/documents.md
index 94903c7dff..208f0f37f2 100644
--- a/docs/agent-guide/documents.md
+++ b/docs/agent-guide/documents.md
@@ -14,6 +14,16 @@ The document header has separate Share, Copy Share Link, and Side Panel buttons.
They are borderless with a soft rounded background on hover. Share opens the
sharing dialog; copying a link is a separate action.
+In the Share dialog's **Optional message**, paste an image with Cmd/Ctrl+V,
+use **Attach files**, or drop a file into the composer. Images show a removable
+preview and are sent inline beside the shared item to each selected person or
+channel. Share (including Cmd/Ctrl+Enter and the phone drawer's Share button)
+waits for uploads; Enter still inserts a newline. Removing an uploading image
+keeps it removed, and closing the dialog discards its attachment draft.
+Verify paste, file selection, drop, removal during upload, upload failure, and
+sending to both a person and a channel. On touch, attachment previews scroll
+horizontally and removal remains available without hover.
+
With `enable-calendar-meeting-notes` enabled, owned markdown documents' Share
panel also lists **Meeting links** (under the **Link** tab on mobile).
Each shows its occurrence and optional team view grant. Toggle **Also share with
diff --git a/docs/agent-guide/media/share-images/desktop.png b/docs/agent-guide/media/share-images/desktop.png
new file mode 100644
index 0000000000..6131a03186
Binary files /dev/null and b/docs/agent-guide/media/share-images/desktop.png differ
diff --git a/docs/agent-guide/media/share-images/mobile.png b/docs/agent-guide/media/share-images/mobile.png
new file mode 100644
index 0000000000..5533af0ad4
Binary files /dev/null and b/docs/agent-guide/media/share-images/mobile.png differ