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.

fix(channel): persist media dimensions before send (#5007)

teob5f345b9f9ab
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 b007ea91cb..2a5bb330a5 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
@@ -4,20 +4,26 @@
import { beforeEach, describe, expect, it, vi } from 'vitest';
+const { getImageDimensionsMock, getVideoDimensionsMock, toastFailureMock } =
+ vi.hoisted(() => ({
+ getImageDimensionsMock: vi.fn(),
+ getVideoDimensionsMock: vi.fn(),
+ toastFailureMock: vi.fn(),
+ }));
+
vi.mock('@core/constant/allBlocks', () => ({
fileTypeToBlockName: (type?: string | null) => type ?? 'unknown',
}));
+vi.mock('@core/util/media', () => ({
+ getImageDimensions: getImageDimensionsMock,
+ getVideoDimensions: getVideoDimensionsMock,
+}));
+
import { createInputAttachmentTracker } from '../attachment-tracker';
import { uploadInputAttachments } from '../upload-attachments';
import { getAttachmentKindFromFile } from '../utils/file-helpers';
-const { toastFailureMock } = vi.hoisted(() => {
- return {
- toastFailureMock: vi.fn(),
- };
-});
-
vi.mock('@core/component/Toast/Toast', () => ({
toast: {
failure: toastFailureMock,
@@ -26,6 +32,10 @@ vi.mock('@core/component/Toast/Toast', () => ({
describe('uploadInputAttachments', () => {
beforeEach(() => {
+ getImageDimensionsMock.mockReset();
+ getImageDimensionsMock.mockResolvedValue({ width: 0, height: 0 });
+ getVideoDimensionsMock.mockReset();
+ getVideoDimensionsMock.mockResolvedValue({ width: 0, height: 0 });
toastFailureMock.mockReset();
});
@@ -92,6 +102,68 @@ describe('uploadInputAttachments', () => {
]);
});
+ it.each([
+ {
+ kind: 'image' as const,
+ name: 'image.png',
+ mimeType: 'image/png',
+ uploadedId: 'uploaded-image-1',
+ getDimensionsMock: getImageDimensionsMock,
+ },
+ {
+ kind: 'video' as const,
+ name: 'clip.mp4',
+ mimeType: 'video/mp4',
+ uploadedId: 'uploaded-video-1',
+ getDimensionsMock: getVideoDimensionsMock,
+ },
+ ])('keeps $kind pending until dimensions are ready', async (media) => {
+ const tracker = createInputAttachmentTracker();
+ const file = new File(['abc'], media.name, { type: media.mimeType });
+ let resolveDimensions:
+ | ((dimensions: { width: number; height: number }) => void)
+ | undefined;
+
+ media.getDimensionsMock.mockReturnValue(
+ new Promise((resolve) => {
+ resolveDimensions = resolve;
+ })
+ );
+
+ let completed = false;
+ const uploadPromise = uploadInputAttachments({
+ files: [file],
+ tracker,
+ uploadFile: async () => ({
+ failed: false,
+ destination: 'static',
+ id: media.uploadedId,
+ }),
+ }).then(() => {
+ completed = true;
+ });
+
+ await vi.waitFor(() => {
+ expect(media.getDimensionsMock).toHaveBeenCalledOnce();
+ });
+
+ expect(completed).toBe(false);
+ expect(tracker.hasPending()).toBe(true);
+
+ resolveDimensions?.({ width: 1920, height: 1080 });
+ await uploadPromise;
+
+ expect(tracker.attachments()).toEqual([
+ {
+ id: media.uploadedId,
+ name: media.name,
+ kind: media.kind,
+ width: 1920,
+ height: 1080,
+ },
+ ]);
+ });
+
it('removes pending attachment and shows toast on failed upload', async () => {
const tracker = createInputAttachmentTracker();
const file = new File(['abc'], 'spec.md', { type: 'text/markdown' });
diff --git a/apps/web/src/features/channel/Input/upload-attachments.ts b/apps/web/src/features/channel/Input/upload-attachments.ts
index 21c68a9533..bf563e12b9 100644
--- a/apps/web/src/features/channel/Input/upload-attachments.ts
+++ b/apps/web/src/features/channel/Input/upload-attachments.ts
@@ -95,6 +95,10 @@ export async function uploadInputAttachments(options: {
});
try {
+ const dimensionsPromise = resolveMediaDimensions(
+ uploadSource,
+ pendingKind
+ );
const result = await options.uploadFile(file);
if (result.failed) {
@@ -103,6 +107,7 @@ export async function uploadInputAttachments(options: {
continue;
}
+ const dimensions = await dimensionsPromise;
const uploaded = buildUploadedAttachment(file, pendingKind, result);
if (!uploaded) {
options.tracker.removeAttachment(pendingId);
@@ -113,21 +118,12 @@ export async function uploadInputAttachments(options: {
if (previewSrc && uploaded.kind !== 'document') {
uploaded.previewSrc = previewSrc;
}
+ if (dimensions) {
+ uploaded.width = dimensions.width;
+ uploaded.height = dimensions.height;
+ }
replacePendingAttachment(options.tracker, pendingId, uploaded);
-
- void resolveMediaDimensions(uploadSource, pendingKind).then((dims) => {
- if (!dims) return;
- options.tracker.setAttachments(
- options.tracker
- .attachments()
- .map((attachment) =>
- attachment.id === uploaded.id
- ? { ...attachment, width: dims.width, height: dims.height }
- : attachment
- )
- );
- });
} catch (error) {
console.error('failed to upload attachment', error);
options.tracker.removeAttachment(pendingId);