Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
fix: Fix multi-file asset drops and folder-scoped deduplication (#6413)
Oleg Isonen0e30263787d3
diff --git a/apps/builder/app/builder/shared/assets/assets-shell.tsx b/apps/builder/app/builder/shared/assets/assets-shell.tsxindex b9c892b830..830d7c8500 100644--- a/apps/builder/app/builder/shared/assets/assets-shell.tsx+++ b/apps/builder/app/builder/shared/assets/assets-shell.tsx@@ -133,6 +133,7 @@ export const AssetsShell = ({accept,}: AssetsShellProps) => {const ref = useRef<HTMLDivElement | null>(null);+ const externalFilesRef = useRef<File[]>([]);const listViewportRef = useRef<HTMLDivElement | null>(null);const [monitorState, setMonitorState] =useState<ExternalMonitorDragState>(IDLE);@@ -219,7 +220,11 @@ export const AssetsShell = ({setMonitorState(IDLE);setDropTargetState(IDLE);- const droppedItemsPromise = readDroppedAssetItems(source.items);+ // The external adapter may expose the native DataTransferItemList.+ // Snapshot it before awaiting so all dropped files are retained.+ const droppedItemsPromise = readDroppedAssetItems(+ Array.from(source.items)+ );const droppedUrlsPromise = Promise.all(source.items.filter((item) => item.type === "text/uri-list")@@ -235,6 +240,10 @@ export const AssetsShell = ({droppedItemsPromise,droppedUrlsPromise,]);+ const droppedFiles = [+ ...externalFilesRef.current,+ ...droppedItems.files,+ ].filter((file, index, files) => files.indexOf(file) === index);let didCreateFolder = false;const fileGroups = allowFolderDrop? await createDroppedAssetFolderStructure({@@ -287,7 +296,7 @@ export const AssetsShell = ({}uploadDroppedFiles({- files: droppedItems.files,+ files: droppedFiles,type,accept,folderId,@@ -318,6 +327,9 @@ export const AssetsShell = ({}}onPointerDown={(event) => onPointerDown?.(event, listViewportRef.current)}onContextMenu={onContextMenu}+ onDropCapture={(event) => {+ externalFilesRef.current = Array.from(event.dataTransfer?.files ?? []);+ }}onKeyDown={onKeyDown}direction="column"css={{diff --git a/apps/builder/app/builder/shared/assets/upload-assets.test.ts b/apps/builder/app/builder/shared/assets/upload-assets.test.tsindex 9bbbc29d3a..cb47999ed1 100644--- a/apps/builder/app/builder/shared/assets/upload-assets.test.ts+++ b/apps/builder/app/builder/shared/assets/upload-assets.test.ts@@ -598,6 +598,25 @@ describe("upload-assets", () => {expect(revokeObjectURL).toHaveBeenCalledWith("blob:1");});+ test("keeps identical content with the same filename in different folders", async () => {+ const filesData = await getFilesData(+ "image",+ [+ new File(["same"], "image.png", { type: "image/png" }),+ new File(["same"], "image.png", { type: "image/png" }),+ ],+ "folder-a",+ (file) => `blob:${file instanceof File ? file.name : "unknown"}`+ );+ filesData[1].folderId = "folder-b";+ const revokeObjectURL = vi.fn();++ const uniqueFilesData = getUniqueFilesData(filesData, revokeObjectURL);++ expect(uniqueFilesData.size).toBe(2);+ expect(revokeObjectURL).not.toHaveBeenCalled();+ });+test("releases object URLs discarded during deduplication", async () => {const url = new URL("https://example.com/image.png");const filesData = await getFilesData("image", [url, url]);diff --git a/apps/builder/app/builder/shared/assets/upload-assets.tsx b/apps/builder/app/builder/shared/assets/upload-assets.tsxindex 0293ddc005..138b6bbe8a 100644--- a/apps/builder/app/builder/shared/assets/upload-assets.tsx+++ b/apps/builder/app/builder/shared/assets/upload-assets.tsx@@ -167,15 +167,19 @@ const getUniqueFilesData = () => {const uniqueFilesData = new Map<string, UploadingFileData>();for (const fileData of filesData) {- if (uniqueFilesData.has(fileData.fingerprintId)) {+ const key = getUploadDeduplicationKey(fileData);+ if (uniqueFilesData.has(key)) {revokeObjectURL(fileData.objectURL);continue;}- uniqueFilesData.set(fileData.fingerprintId, fileData);+ uniqueFilesData.set(key, fileData);}return uniqueFilesData;};+const getUploadDeduplicationKey = (fileData: UploadingFileData) =>+ `${fileData.folderId ?? "root"}:${fileData.fingerprintId}`;+export const waitForAssetUpload = (assetId: string): Promise<Asset> => {const existingAsset = $assets.get().get(assetId);if (existingAsset !== undefined) {@@ -509,7 +513,7 @@ export const uploadAssets = async <T extends File | URL>(const existingUploadsByFingerprint = new Map($uploadingFilesDataStore.get()- .map((fileData) => [fileData.fingerprintId, fileData])+ .map((fileData) => [getUploadDeduplicationKey(fileData), fileData]));for (const [@@ -553,7 +557,7 @@ export const uploadAssets = async <T extends File | URL>(});fileData.assetId = ticket.assetId;fileData.uploadName = ticket.name;- uploadTickets.set(fileData.fingerprintId, ticket);+ uploadTickets.set(getUploadDeduplicationKey(fileData), ticket);if (ticket.deduplicated) {URL.revokeObjectURL(fileData.objectURL);safeSetAsset(@@ -595,8 +599,9 @@ export const uploadAssets = async <T extends File | URL>();const uploadedAssetId =- uploadTickets.get(filesData[i].fingerprintId)?.assetId ??- existingUploadsByFingerprint.get(filesData[i].fingerprintId)?.assetId;+ uploadTickets.get(getUploadDeduplicationKey(filesData[i]))?.assetId ??+ existingUploadsByFingerprint.get(getUploadDeduplicationKey(filesData[i]))+ ?.assetId;if (uploadedAssetId !== undefined) {res.set(filesOrUrls[i], uploadedAssetId);}