diff --git a/apps/web/src/components/chat/ChatComposer.tsx b/apps/web/src/components/chat/ChatComposer.tsx
index 6fb651c3471f6..af4871b451932 100644
--- a/apps/web/src/components/chat/ChatComposer.tsx
+++ b/apps/web/src/components/chat/ChatComposer.tsx
@@ -133,7 +133,8 @@ import {
fileAttachmentCapabilityBlockReason,
fileAttachmentStagingLimit,
isPreviewableComposerVideo,
- isImageOnlyClipboardHtml,
+ clipboardHtmlImageContent,
+ imagesToAttachBesidePastedText,
shouldHandleComposerAttachmentPaste,
} from "./composerAttachmentFiles";
import {
@@ -2947,18 +2948,19 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
const pastedContext =
!isLiteralPendingAnswer &&
(readPastedComposerContext(event.clipboardData)?.records.length ?? 0) > 0;
+ const canAttachFiles = !pastedContext && activeThreadId !== null && files.length > 0;
+ const htmlImageContent =
+ canAttachFiles && plainText.length > 0
+ ? clipboardHtmlImageContent(event.clipboardData.getData("text/html"))
+ : "none";
if (
folders.length > 0 ||
- (!pastedContext &&
- activeThreadId &&
- files.length > 0 &&
+ (canAttachFiles &&
shouldHandleComposerAttachmentPaste({
files,
plainText,
bypassAutoAttachment,
- htmlIsOnlyImage:
- plainText.length > 0 &&
- isImageOnlyClipboardHtml(event.clipboardData.getData("text/html")),
+ htmlIsOnlyImage: htmlImageContent === "only-image",
}))
) {
event.preventDefault();
@@ -2971,6 +2973,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
}
if (pastedContext) return;
+ const imagesBesideText = imagesToAttachBesidePastedText({
+ files,
+ plainText,
+ bypassAutoAttachment,
+ htmlHasImageAndText: htmlImageContent === "image-and-text",
+ });
+ if (imagesBesideText.length > 0) void addComposerAttachments(imagesBesideText);
if (!foldPastedText(plainText, bypassAutoAttachment)) {
return;
}
diff --git a/apps/web/src/components/chat/composerAttachmentFiles.test.ts b/apps/web/src/components/chat/composerAttachmentFiles.test.ts
index f842566d7cd60..ac43d667d80ca 100644
--- a/apps/web/src/components/chat/composerAttachmentFiles.test.ts
+++ b/apps/web/src/components/chat/composerAttachmentFiles.test.ts
@@ -13,6 +13,7 @@ import {
composerFileAttachmentMimeType,
fileAttachmentCapabilityBlockReason,
fileAttachmentStagingLimit,
+ imagesToAttachBesidePastedText,
normalizeComposerImageFileMimeType,
shouldHandleComposerAttachmentPaste,
} from "./composerAttachmentFiles";
@@ -141,6 +142,12 @@ describe("composer attachment files", () => {
expect(shouldHandleComposerAttachmentPaste({ files: [image], plainText: "image.png" })).toBe(
true,
);
+ // A QQ or WeChat message has its text beside an
in the HTML: the image attaches too.
+ const message = { files: [image], plainText: "Look at this", htmlHasImageAndText: true };
+ expect(shouldHandleComposerAttachmentPaste(message)).toBe(false);
+ expect(imagesToAttachBesidePastedText(message)).toEqual([image]);
+ expect(imagesToAttachBesidePastedText({ ...message, htmlHasImageAndText: false })).toEqual([]);
+ expect(imagesToAttachBesidePastedText({ ...message, bypassAutoAttachment: true })).toEqual([]);
});
it("preserves text when the clipboard also includes generic image files", () => {
diff --git a/apps/web/src/components/chat/composerAttachmentFiles.ts b/apps/web/src/components/chat/composerAttachmentFiles.ts
index 191c5841185ff..538d2dfd67304 100644
--- a/apps/web/src/components/chat/composerAttachmentFiles.ts
+++ b/apps/web/src/components/chat/composerAttachmentFiles.ts
@@ -247,11 +247,33 @@ function isOnlyFileNames(text: string, files: ReadonlyArray): boolean {
.every((line) => names.has(line));
}
-/** A browser's Copy Image puts only an
in text/html; rich text sources put the text there. */
-export function isImageOnlyClipboardHtml(html: string): boolean {
- if (html.length === 0) return false;
+/**
+ * A browser's Copy Image puts only an
in text/html; a chat message (QQ, WeChat) puts its text
+ * beside the
; rich text sources (Word, Pages) put only the text there.
+ */
+export function clipboardHtmlImageContent(html: string): "only-image" | "image-and-text" | "none" {
+ if (html.length === 0) return "none";
const body = new DOMParser().parseFromString(html, "text/html").body;
- return body.querySelector("img") !== null && (body.textContent ?? "").trim().length === 0;
+ if (body.querySelector("img") === null) return "none";
+ return (body.textContent ?? "").trim().length === 0 ? "only-image" : "image-and-text";
+}
+
+function isPastedImageFile(file: File): boolean {
+ const classification = classifyComposerAttachmentFile(file);
+ return classification === "image" || classification === "unsupported-image";
+}
+
+/** The images of a message copied with its text: they attach while the text pastes as text. */
+export function imagesToAttachBesidePastedText(input: {
+ readonly files: ReadonlyArray;
+ readonly plainText: string;
+ readonly bypassAutoAttachment?: boolean;
+ readonly htmlHasImageAndText: boolean;
+}): File[] {
+ if (input.bypassAutoAttachment || input.plainText.length === 0 || !input.htmlHasImageAndText) {
+ return [];
+ }
+ return input.files.filter(isPastedImageFile);
}
export function shouldHandleComposerAttachmentPaste(input: {
@@ -269,10 +291,7 @@ export function shouldHandleComposerAttachmentPaste(input: {
) {
return true;
}
- const hasImage = input.files.some((file) => {
- const classification = classifyComposerAttachmentFile(file);
- return classification === "image" || classification === "unsupported-image";
- });
+ const hasImage = input.files.some(isPastedImageFile);
if (input.plainText.length === 0) {
return hasImage || input.files.some((file) => classifyComposerAttachmentFile(file) === "file");
}