Skip to content

Commit e72231c

Browse files
committed
fix(composer): preserve import slots when restoring stashes
1 parent 6a3f3eb commit e72231c

3 files changed

Lines changed: 28 additions & 15 deletions

File tree

‎apps/web/src/components/chat/ChatComposer.tsx‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,10 @@ import {
331331
import { ComposerPromptLengthValidation } from "./ComposerPromptLengthValidation";
332332
import { PierreEntryIcon } from "./PierreEntryIcon";
333333
import { pendingDraftWork } from "./pendingDraftWork";
334-
import { importComposerThreadAttachment } from "./composerThreadImport";
334+
import {
335+
importComposerThreadAttachment,
336+
remainingComposerAttachmentSlots,
337+
} from "./composerThreadImport";
335338
import { isTimelineScrollTarget } from "./timelineScrollTarget";
336339
import {
337340
createComposerScrollGestureState,
@@ -4746,11 +4749,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
47464749
}
47474750
appendedFiles.push(restored);
47484751
}
4749-
const capacity = Math.max(
4750-
0,
4751-
PROVIDER_SEND_TURN_MAX_ATTACHMENTS -
4752-
composerImagesRef.current.length -
4753-
composerFilesNow.length,
4752+
const capacity = remainingComposerAttachmentSlots(
4753+
composerImagesRef.current.length + composerFilesNow.length,
4754+
pendingThreadImportsRef.current.get(composerTargetKey(composerDraftTarget)) ?? 0,
47544755
);
47554756
// Marker replacements reuse their marker's slot; only appended files
47564757
// consume capacity.
@@ -4805,12 +4806,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
48054806
(image) => `${image.mimeType}\0${image.sizeBytes}\0${image.name}`,
48064807
),
48074808
);
4808-
const capacity = Math.max(
4809-
0,
4810-
PROVIDER_SEND_TURN_MAX_ATTACHMENTS -
4811-
composerImagesRef.current.length -
4812-
composerFilesRef.current.length -
4813-
restoredFileCount,
4809+
const capacity = remainingComposerAttachmentSlots(
4810+
composerImagesRef.current.length + composerFilesRef.current.length + restoredFileCount,
4811+
pendingThreadImportsRef.current.get(composerTargetKey(composerDraftTarget)) ?? 0,
48144812
);
48154813
const pending = entry.attachments.filter(
48164814
(attachment) =>

‎apps/web/src/components/chat/composerThreadImport.test.ts‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ import { PROVIDER_SEND_TURN_MAX_ATTACHMENTS } from "@t3tools/contracts";
22
import { describe, expect, it, vi } from "vite-plus/test";
33

44
import { DraftId, useComposerDraftStore } from "../../composerDraftStore";
5-
import { importComposerThreadAttachment } from "./composerThreadImport";
5+
import {
6+
importComposerThreadAttachment,
7+
remainingComposerAttachmentSlots,
8+
} from "./composerThreadImport";
69

710
function deferredFile() {
811
let resolve!: (file: File) => void;
@@ -63,7 +66,7 @@ describe("importComposerThreadAttachment", () => {
6366
});
6467

6568
it.each(["file", "image"])(
66-
"reserves the final slot during an overlapping %s attachment",
69+
"reserves the final slot while restoring a stashed %s",
6770
async (kind) => {
6871
const pendingImports = new Map<string, number>();
6972
const targetKey = "draft";
@@ -73,7 +76,12 @@ describe("importComposerThreadAttachment", () => {
7376
);
7477
const countReservedAttachments = () => attached.length + (pendingImports.get(targetKey) ?? 0);
7578
const attach = async (file: File) => {
76-
if (countReservedAttachments() >= PROVIDER_SEND_TURN_MAX_ATTACHMENTS) return false;
79+
if (
80+
remainingComposerAttachmentSlots(attached.length, pendingImports.get(targetKey) ?? 0) ===
81+
0
82+
) {
83+
return false;
84+
}
7785
attached.push(file.name);
7886
return true;
7987
};

‎apps/web/src/components/chat/composerThreadImport.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
import { PROVIDER_SEND_TURN_MAX_ATTACHMENTS } from "@t3tools/contracts";
22

3+
export function remainingComposerAttachmentSlots(
4+
attachmentCount: number,
5+
pendingThreadImports: number,
6+
) {
7+
return Math.max(0, PROVIDER_SEND_TURN_MAX_ATTACHMENTS - attachmentCount - pendingThreadImports);
8+
}
9+
310
export async function importComposerThreadAttachment(input: {
411
readonly targetKey: string;
512
readonly pendingImports: Map<string, number>;

0 commit comments

Comments
 (0)