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(email): show dropped images and videos inline in compose (#6937)

gbirman08d0780c044c
diff --git a/apps/web/src/features/email-compose/components/attachment-viewer.tsx b/apps/web/src/features/email-compose/components/attachment-viewer.tsx
new file mode 100644
index 0000000000..7688df900a
--- /dev/null
+++ b/apps/web/src/features/email-compose/components/attachment-viewer.tsx
@@ -0,0 +1,56 @@
+import { MediaViewerDialog } from '@channel/Media/MediaViewerDialog';
+import type { MediaItem } from '@channel/Media/media-items';
+import { createSignal, onCleanup } from 'solid-js';
+import type { DraftFormAttachment } from '../primitives/email-form-state';
+
+function mediaKind(mimeType: string): MediaItem['kind'] | undefined {
+ if (mimeType.startsWith('image/')) return 'image';
+ if (mimeType.startsWith('video/')) return 'video';
+ return undefined;
+}
+
+/** Opens image and video attachment chips in the media viewer. */
+export function createAttachmentViewer() {
+ const [item, setItem] = createSignal<MediaItem>();
+ let objectUrl: string | undefined;
+
+ const release = () => {
+ if (objectUrl) URL.revokeObjectURL(objectUrl);
+ objectUrl = undefined;
+ };
+ onCleanup(release);
+
+ const open = (file: File, kind: MediaItem['kind']) => {
+ release();
+ objectUrl = URL.createObjectURL(file);
+ setItem({ id: objectUrl, src: objectUrl, fullSrc: objectUrl, kind });
+ };
+
+ // Only files added in this session have viewable bytes; saved draft and
+ // forwarded attachments carry an S3 key or provider id, not a URL.
+ const onClickFor = (attachment: DraftFormAttachment) => {
+ if (attachment.type !== 'local') return undefined;
+ const { file } = attachment;
+ const kind = mediaKind(file.type);
+ return kind ? () => open(file, kind) : undefined;
+ };
+
+ const Viewer = () => (
+ <MediaViewerDialog
+ items={() => {
+ const current = item();
+ return current ? [current] : [];
+ }}
+ open={item() !== undefined}
+ onOpenChange={(isOpen) => {
+ if (isOpen) return;
+ setItem(undefined);
+ release();
+ }}
+ currentIndex={() => 0}
+ onCurrentIndexChange={() => {}}
+ />
+ );
+
+ return { onClickFor, Viewer };
+}
diff --git a/apps/web/src/features/email-compose/compose-adapter.ts b/apps/web/src/features/email-compose/compose-adapter.ts
index 39bb50f7e0..93d9717db8 100644
--- a/apps/web/src/features/email-compose/compose-adapter.ts
+++ b/apps/web/src/features/email-compose/compose-adapter.ts
@@ -76,7 +76,7 @@ import {
} from './context/compose-capabilities';
import { decodeBase64Utf8 } from './core/decode-base64';
import type { EmailDraft } from './core/email-draft';
-import { readDroppedEmailFiles } from './editor-adapter';
+import { readDroppedEmailFiles, withVideoAttachments } from './editor-adapter';
import { makeAttachmentPublic } from './make-attachment-public';
import {
emailDraftLifecycleSource,
@@ -204,15 +204,19 @@ export function createEmailComposeContext(
handleFileFolderDrop(
input.files,
input.directories,
- createFilesReadyHandler(
- input.editor,
- input.sourceId,
- input.sourceId ? 'email' : undefined,
- input.dropEvent && input.editor
- ? () => getDragDropPosition(input.editor!, input.dropEvent!, true)
- : undefined,
- input.onUploaded,
- { width: 542, height: 542 }
+ withVideoAttachments(
+ createFilesReadyHandler(
+ input.editor,
+ input.sourceId,
+ input.sourceId ? 'email' : undefined,
+ input.dropEvent && input.editor
+ ? () =>
+ getDragDropPosition(input.editor!, input.dropEvent!, true)
+ : undefined,
+ input.onUploaded,
+ { width: 542, height: 542 }
+ ),
+ input.onVideos
)
);
},
diff --git a/apps/web/src/features/email-compose/context/compose-capabilities.ts b/apps/web/src/features/email-compose/context/compose-capabilities.ts
index 1cdc19deb4..1974fd5642 100644
--- a/apps/web/src/features/email-compose/context/compose-capabilities.ts
+++ b/apps/web/src/features/email-compose/context/compose-capabilities.ts
@@ -237,6 +237,8 @@ export interface EmailEditorFiles {
directories: FileSystemDirectoryEntry[];
dropEvent?: DragEvent;
onUploaded(ids: string[]): void;
+ /** Videos, which email clients drop from HTML; callers attach them instead of inlining. */
+ onVideos?(files: File[]): void;
}): void;
}
diff --git a/apps/web/src/features/email-compose/context/editor-capabilities.ts b/apps/web/src/features/email-compose/context/editor-capabilities.ts
index 92f9e98305..5153723db0 100644
--- a/apps/web/src/features/email-compose/context/editor-capabilities.ts
+++ b/apps/web/src/features/email-compose/context/editor-capabilities.ts
@@ -7,9 +7,13 @@ export interface ComposeBodyActions {
directories: FileSystemDirectoryEntry[],
onFiles: (files: File[]) => void
): void;
- pasteFiles(
+ insertFiles(
editor: LexicalEditor,
- files: FileSystemFileEntry[],
- directories: FileSystemDirectoryEntry[]
+ input: {
+ files: FileSystemFileEntry[];
+ directories: FileSystemDirectoryEntry[];
+ dropEvent?: DragEvent;
+ onVideos?: (files: File[]) => void;
+ }
): void;
}
diff --git a/apps/web/src/features/email-compose/editor-adapter.ts b/apps/web/src/features/email-compose/editor-adapter.ts
index 4d8438862e..32724dc718 100644
--- a/apps/web/src/features/email-compose/editor-adapter.ts
+++ b/apps/web/src/features/email-compose/editor-adapter.ts
@@ -1,7 +1,15 @@
import { useSplitPanel } from '@components/app/split-layout/layoutUtils';
-import { createFilesReadyHandler } from '@core/component/LexicalMarkdown/utils/fileUploadUtils';
+import {
+ createFilesReadyHandler,
+ getDragDropPosition,
+ isInlineVideoFileName,
+} from '@core/component/LexicalMarkdown/utils/fileUploadUtils';
import { toast } from '@core/component/Toast/Toast';
-import { handleFileFolderDrop } from '@core/util/upload';
+import {
+ handleFileFolderDrop,
+ isFileUploadEntry,
+ type UploadInput,
+} from '@core/util/upload';
import { type FocusableElement, tabbable } from 'tabbable';
import type { ComposeBodyActions } from './context/editor-capabilities';
import { makeAttachmentPublic } from './make-attachment-public';
@@ -32,6 +40,25 @@ export const readDroppedEmailFiles: ComposeBodyActions['readDroppedFiles'] = (
onFiles(uploaded.map((item) => item.file))
);
+export function withVideoAttachments(
+ onFilesReady: (entries: UploadInput[]) => Promise<void>,
+ onVideos: ((files: File[]) => void) | undefined
+) {
+ if (!onVideos) return onFilesReady;
+ return (entries: UploadInput[]) => {
+ const videos: File[] = [];
+ const rest = entries.filter((entry) => {
+ if (isFileUploadEntry(entry) && entry.isFolder) return true;
+ const file = isFileUploadEntry(entry) ? entry.file : entry;
+ if (!isInlineVideoFileName(file.name)) return true;
+ videos.push(file);
+ return false;
+ });
+ if (videos.length > 0) onVideos(videos);
+ return onFilesReady(rest);
+ };
+}
+
export function createComposeBodyActions(): ComposeBodyActions {
return {
focusSibling: createPanelFocusSibling(),
@@ -39,17 +66,22 @@ export function createComposeBodyActions(): ComposeBodyActions {
toast.success(`${email} added to CC`);
},
readDroppedFiles: readDroppedEmailFiles,
- pasteFiles(editor, files, directories) {
+ insertFiles(editor, { files, directories, dropEvent, onVideos }) {
handleFileFolderDrop(
files,
directories,
- createFilesReadyHandler(
- editor,
- undefined,
- undefined,
- undefined,
- (ids) => ids.forEach(makeAttachmentPublic),
- { width: 542, height: 542 }
+ withVideoAttachments(
+ createFilesReadyHandler(
+ editor,
+ undefined,
+ undefined,
+ dropEvent
+ ? () => getDragDropPosition(editor, dropEvent, true)
+ : undefined,
+ (ids) => ids.forEach(makeAttachmentPublic),
+ { width: 542, height: 542 }
+ ),
+ onVideos
)
);
},
diff --git a/apps/web/src/features/email-compose/views/compose-body.tsx b/apps/web/src/features/email-compose/views/compose-body.tsx
index 0bfa85754f..4052ebdd99 100644
--- a/apps/web/src/features/email-compose/views/compose-body.tsx
+++ b/apps/web/src/features/email-compose/views/compose-body.tsx
@@ -1,6 +1,7 @@
import { EmailAttachmentPill } from '@app/features/email-message/components/attachment-pill';
import { FileDropOverlay } from '@core/component/FileDropOverlay';
import { MarkdownTextarea } from '@core/component/LexicalMarkdown/component/core/MarkdownTextarea';
+import { isInlineMediaFileName } from '@core/component/LexicalMarkdown/utils/fileUploadUtils';
import { fileFolderDrop } from '@core/directive/fileFolderDrop';
import { Telemetry } from '@macro-inc/observability';
import { cn, Scroll } from '@ui';
@@ -16,6 +17,7 @@ import {
Show,
Switch,
} from 'solid-js';
+import { createAttachmentViewer } from '../components/attachment-viewer';
import { MacroSignatureButton } from '../components/macro-signature-button';
import { useCompose } from '../context/compose-context';
import type { DraftFormAttachment } from '../primitives/email-form-state';
@@ -30,6 +32,7 @@ export function ComposeBody(props: {
onAddFiles?: (files: File[]) => void;
}) {
const ctx = useCompose();
+ const attachmentViewer = createAttachmentViewer();
const [editor, setEditor] = createSignal<LexicalEditor>();
const [isDragging, setIsDragging] = createSignal<boolean>();
@@ -97,8 +100,23 @@ export function ComposeBody(props: {
use:fileFolderDrop={{
onDragStart: (valid) => setIsDragging(valid),
onDragEnd: () => setIsDragging(false),
- onDrop: (files, dirs) => {
- ctx.bodyActions.readDroppedFiles(files, dirs, (files) =>
+ onDrop: (files, dirs, event) => {
+ const ed = editor();
+ const media =
+ ed && event
+ ? files.filter((file) => isInlineMediaFileName(file.name))
+ : [];
+ if (ed && media.length > 0) {
+ ctx.bodyActions.insertFiles(ed, {
+ files: media,
+ directories: [],
+ dropEvent: event,
+ onVideos: props.onAddFiles,
+ });
+ }
+ const attachments = files.filter((file) => !media.includes(file));
+ if (attachments.length === 0 && dirs.length === 0) return;
+ ctx.bodyActions.readDroppedFiles(attachments, dirs, (files) =>
props.onAddFiles?.(files)
);
},
@@ -154,7 +172,12 @@ export function ComposeBody(props: {
portalScope="local"
onPasteFilesAndDirs={(files, directories) => {
const ed = editor();
- if (ed) ctx.bodyActions.pasteFiles(ed, files, directories);
+ if (!ed) return;
+ ctx.bodyActions.insertFiles(ed, {
+ files,
+ directories,
+ onVideos: props.onAddFiles,
+ });
}}
/>
</Scroll>
@@ -162,9 +185,15 @@ export function ComposeBody(props: {
{ctx.signaturePreview?.()}
<div class="flex flex-wrap items-center gap-2">
<For each={ctx.attachments()}>
- {(attachment) => <AttachmentItem attachment={attachment} />}
+ {(attachment) => (
+ <AttachmentItem
+ attachment={attachment}
+ onOpen={attachmentViewer.onClickFor(attachment)}
+ />
+ )}
</For>
</div>
+ <attachmentViewer.Viewer />
</div>
<Show when={ctx.validationError('no_message')}>
{(err) => <div class="text-failure-ink mt-1">{err().message}</div>}
@@ -173,7 +202,10 @@ export function ComposeBody(props: {
);
}
-function AttachmentItem(props: { attachment: DraftFormAttachment }) {
+function AttachmentItem(props: {
+ attachment: DraftFormAttachment;
+ onOpen?: () => void;
+}) {
const ctx = useCompose();
const handleRemove = () => {
@@ -191,6 +223,7 @@ function AttachmentItem(props: { attachment: DraftFormAttachment }) {
}}
removable
onRemove={handleRemove}
+ onClick={props.onOpen}
/>
)}
</Match>
@@ -203,6 +236,7 @@ function AttachmentItem(props: { attachment: DraftFormAttachment }) {
}}
removable
onRemove={handleRemove}
+ onClick={props.onOpen}
/>
)}
</Match>
@@ -215,6 +249,7 @@ function AttachmentItem(props: { attachment: DraftFormAttachment }) {
}}
removable
onRemove={handleRemove}
+ onClick={props.onOpen}
/>
)}
</Match>
diff --git a/apps/web/src/features/email-compose/views/email-compose.tsx b/apps/web/src/features/email-compose/views/email-compose.tsx
index 9f14232415..90eb6330d6 100644
--- a/apps/web/src/features/email-compose/views/email-compose.tsx
+++ b/apps/web/src/features/email-compose/views/email-compose.tsx
@@ -68,11 +68,10 @@ export function EmailComposeView(props: EmailComposeViewProps) {
recipientAdded: (email) =>
composeContext.notices.feedback.success(`${email} added to CC`),
readDroppedFiles: composeContext.editorFiles.readDroppedFiles,
- pasteFiles: (editor, files, directories) =>
+ insertFiles: (editor, input) =>
composeContext.editorFiles.uploadEditorFiles({
editor,
- files,
- directories,
+ ...input,
onUploaded: (ids) =>
ids.forEach(composeContext.editorFiles.makePublic),
}),
diff --git a/apps/web/src/features/email-compose/views/reply-input.tsx b/apps/web/src/features/email-compose/views/reply-input.tsx
index a1f2f169b4..3bf59e78dd 100644
--- a/apps/web/src/features/email-compose/views/reply-input.tsx
+++ b/apps/web/src/features/email-compose/views/reply-input.tsx
@@ -18,6 +18,7 @@ import { Button, cn, SendButton, Surface, Tooltip } from '@ui';
import type { LexicalEditor } from 'lexical';
import { $getRoot } from 'lexical';
import { createSignal, For, onMount, Show } from 'solid-js';
+import { createAttachmentViewer } from '../components/attachment-viewer';
import { EmailDateSelector } from '../components/email-date-selector';
import {
EmailScheduleBar,
@@ -177,6 +178,7 @@ export function ReplyInputView(props: ReplyInputViewProps) {
ids.forEach(composeContext.editorFiles.makePublic);
scheduleDraftSave();
},
+ onVideos: handleAddAttachments,
});
},
});
@@ -268,6 +270,8 @@ export function ReplyInputView(props: ReplyInputViewProps) {
}
});
+ const attachmentViewer = createAttachmentViewer();
+
const AttachmentsRow = (rowProps?: { class?: string }) => (
<Show when={form.attachments.list().length > 0}>
<div
@@ -295,9 +299,11 @@ export function ReplyInputView(props: ReplyInputViewProps) {
onRemove={() => {
if (!editingDisabled()) handleRemoveAttachment(attachment);
}}
+ onClick={attachmentViewer.onClickFor(attachment)}
/>
)}
</For>
+ <attachmentViewer.Viewer />
</div>
</Show>
);
@@ -446,6 +452,7 @@ export function ReplyInputView(props: ReplyInputViewProps) {
ids.forEach(composeContext.editorFiles.makePublic);
scheduleDraftSave();
},
+ onVideos: handleAddAttachments,
});
},
}}
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/utils/fileUploadUtils.ts b/apps/web/src/lib/core/component/LexicalMarkdown/utils/fileUploadUtils.ts
index 6a91bb15e2..675c7e0155 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/utils/fileUploadUtils.ts
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/utils/fileUploadUtils.ts
@@ -28,6 +28,20 @@ const getImageExtensionsHeic = () => [
];
const getVideoExtensions = () => blockNameToFileExtensions.video;
+export function isInlineVideoFileName(name: string) {
+ const ext = fileExtension(name);
+ return ext != null && getVideoExtensions().includes(ext);
+}
+
+export function isInlineMediaFileName(name: string) {
+ const ext = fileExtension(name);
+ return (
+ ext != null &&
+ (getImageExtensionsHeic().includes(ext) ||
+ getVideoExtensions().includes(ext))
+ );
+}
+
async function processInlineMediaFiles(
editor: LexicalEditor,
files: File[],
@@ -84,8 +98,6 @@ async function onFilesReady(
afterFileUpload?: (uploadedItemIds: string[]) => void,
constrainedMediaDimensions?: { width: number; height: number }
): Promise<void> {
- const IMAGE_EXTENSIONS_HEIC = getImageExtensionsHeic();
- const VIDEO_EXTENSIONS = getVideoExtensions();
const mediaFiles: File[] = [];
const filesToUpload: UploadInput[] = [];
@@ -94,11 +106,7 @@ async function onFilesReady(
filesToUpload.push(entry);
} else {
const file = isFileUploadEntry(entry) ? entry.file : entry;
- const ext = fileExtension(file.name);
- if (
- ext != null &&
- (IMAGE_EXTENSIONS_HEIC.includes(ext) || VIDEO_EXTENSIONS.includes(ext))
- ) {
+ if (isInlineMediaFileName(file.name)) {
mediaFiles.push(file);
} else {
filesToUpload.push(entry);
diff --git a/apps/web/src/lib/core/directive/fileFolderDrop.ts b/apps/web/src/lib/core/directive/fileFolderDrop.ts
index f44b4b45ef..acf31f1f0e 100644
--- a/apps/web/src/lib/core/directive/fileFolderDrop.ts
+++ b/apps/web/src/lib/core/directive/fileFolderDrop.ts
@@ -24,9 +24,12 @@ declare module 'solid-js' {
}
// Helper to convert File to FileSystemFileEntry for HTML-extracted images if webkitGetAsEntry fails
-// We only need to shim the file() method
+// Shim file() plus the name that drop handlers use to classify media
function fileToFileSystemFileEntry(file: File): FileSystemFileEntry {
return {
+ name: file.name,
+ isFile: true,
+ isDirectory: false,
file: (successCallback, _errorCallback) => {
return successCallback(file);
},