Skip to content

fix: replace FileReader with URL.createObjectURL #1701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 16, 2022
Merged

fix: replace FileReader with URL.createObjectURL #1701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion src/components/MessageInput/hooks/useAttachments.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,13 @@ export const useAttachments = <
file.type.startsWith('image/') &&
!file.type.endsWith('.photoshop') // photoshop files begin with 'image/'
) {
dispatch({ file, id, state: 'uploading', type: 'setImageUpload' });
dispatch({
file,
id,
previewUri: URL.createObjectURL?.(file),
state: 'uploading',
type: 'setImageUpload',
});
} else if (file instanceof File && !noFiles) {
dispatch({ file, id, state: 'uploading', type: 'setFileUpload' });
}
Expand Down
35 changes: 9 additions & 26 deletions src/components/MessageInput/hooks/useImageUploads.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,11 @@ export const useImageUploads = <
return;
}

if (img.previewUri) URL.revokeObjectURL?.(img.previewUri);

dispatch({
id,
previewUri: undefined,
state: 'finished',
type: 'setImageUpload',
url: response.file,
Expand All @@ -108,32 +111,12 @@ export const useImageUploads = <
);

useEffect(() => {
if (FileReader) {
const upload = Object.values(imageUploads).find(
(imageUpload) =>
imageUpload.state === 'uploading' && !!imageUpload.file && !imageUpload.previewUri,
);
if (upload) {
const { file, id } = upload;
// TODO: Possibly use URL.createObjectURL instead. However, then we need
// to release the previews when not used anymore though.
const reader = new FileReader();
reader.onload = (event) => {
if (typeof event.target?.result !== 'string') return;
dispatch({
id,
previewUri: event.target.result,
type: 'setImageUpload',
});
};
reader.readAsDataURL((file as unknown) as Blob);
uploadImage(id);
return () => {
reader.onload = null;
};
}
}
return;
const upload = Object.values(imageUploads).find(
(imageUpload) => imageUpload.state === 'uploading' && imageUpload.file,
);
if (!upload) return;

uploadImage(upload.id);
}, [imageUploads, uploadImage]);

return {
Expand Down