Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/tidy-webp-backport.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@stackoverflow/stacks-editor": minor
---

Add support for WebP images to the v0 editor.
7 changes: 6 additions & 1 deletion src/shared/prosemirror-plugins/image-upload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,12 @@ export async function defaultImageUploadHandler(file: File): Promise<string> {
return json.UploadedImage;
}

const defaultAcceptedFileTypes = ["image/jpeg", "image/png", "image/gif"];
const defaultAcceptedFileTypes = [
"image/jpeg",
"image/png",
"image/gif",
"image/webp",
];
const defaultSizeLimitMib = 2;

enum ValidationResult {
Expand Down
58 changes: 36 additions & 22 deletions test/shared/prosemirror-plugins/image-upload.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,15 @@ describe("image upload plugin", () => {
expect(findAddButton(uploader).disabled).toBe(true);
const validationMessage = findValidationMessage(uploader);
expect(validationMessage.textContent).toBe(
"Please select an image (jpeg, png, gif) to upload"
"Please select an image (jpeg, png, gif, webp) to upload"
);
expect(validationMessage.classList).not.toContain("d-none");
});

it("should accept jpeg, png and gif by default if no acceptedFileTypes option is provided", async () => {
it("should accept jpeg, png, gif and webp by default if no acceptedFileTypes option is provided", async () => {
showImageUploader(view.editorView);
expect(uploader.uploadField.accept).toBe(
"image/jpeg, image/png, image/gif"
"image/jpeg, image/png, image/gif, image/webp"
);

await expect(
Expand Down Expand Up @@ -184,13 +184,22 @@ describe("image upload plugin", () => {
"d-none"
);

await expect(
uploader.showImagePreview(
mockFile("some webp file", "image/webp")
)
).resolves.toBeUndefined();
expect(findValidationMessage(uploader).classList).toContain(
"d-none"
);

await expect(
uploader.showImagePreview(
mockFile("some bmp file", "image/bmp")
)
).rejects.toBe("invalid filetype");
expect(findValidationMessage(uploader).textContent).toBe(
"Please select an image (jpeg, png, gif) to upload"
"Please select an image (jpeg, png, gif, webp) to upload"
);
});

Expand All @@ -215,26 +224,31 @@ describe("image upload plugin", () => {
expect(validationMessage.classList).toContain("d-none");
});

it("should reject unaccepted files when acceptedFileTypes option is defined", async () => {
setupTestVariables({
acceptedFileTypes: ["image/bmp"],
});
it.each(["image/gif", "image/webp"])(
"should reject %s when acceptedFileTypes option excludes it",
async (fileType) => {
setupTestVariables({
acceptedFileTypes: ["image/bmp"],
});

showImageUploader(view.editorView);
showImageUploader(view.editorView);

await expect(
uploader.showImagePreview(
mockFile("some gif file", "image/gif")
)
).rejects.toBe("invalid filetype");
expect(findPreviewElement(uploader).classList).toContain("d-none");
expect(findAddButton(uploader).disabled).toBe(true);
const validationMessage = findValidationMessage(uploader);
expect(validationMessage.textContent).toBe(
"Please select an image (bmp) to upload"
);
expect(validationMessage.classList).not.toContain("d-none");
});
await expect(
uploader.showImagePreview(
mockFile("some image file", fileType)
)
).rejects.toBe("invalid filetype");
expect(findPreviewElement(uploader).classList).toContain(
"d-none"
);
expect(findAddButton(uploader).disabled).toBe(true);
const validationMessage = findValidationMessage(uploader);
expect(validationMessage.textContent).toBe(
"Please select an image (bmp) to upload"
);
expect(validationMessage.classList).not.toContain("d-none");
}
);

it("should allow file upload within the size limit", async () => {
const sizeLimitMib = 2;
Expand Down
Loading