Skip to content

Fix Worker was terminated error on unmount #1877

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
wojtekmaj merged 3 commits into from
Sep 18, 2024
+16 −6
Merged

Fix Worker was terminated error on unmount #1877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73e7c76
Fix "Worker was terminated" error on unmount
andriivitiv Aug 28, 2024
3312c7a
Simplify unit test
wojtekmaj Sep 18, 2024
e6c9668
Minor formatting
wojtekmaj Sep 18, 2024
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
10 changes: 10 additions & 0 deletions packages/react-pdf/src/Document.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,4 +695,14 @@ describe('Document', () => {

vi.mocked(globalThis.console.error).mockRestore();
});

it('does not throw an error on unmount', async () => {
const { func: onLoadProgress, promise: onLoadProgressPromise } = makeAsyncCallback();

const { unmount } = render(<Document file={pdfFile} onLoadProgress={onLoadProgress} />);

await onLoadProgressPromise;

expect(unmount).not.toThrowError();
});
});
12 changes: 6 additions & 6 deletions packages/react-pdf/src/Document.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
import useResolver from './shared/hooks/useResolver.js';

import type { PDFDocumentProxy } from 'pdfjs-dist';
import type { DocumentInitParameters } from 'pdfjs-dist/types/src/display/api.js';
import type { EventProps } from 'make-event-props';
import type {
ClassName,
Expand Down Expand Up @@ -507,10 +508,9 @@ const Document: React.ForwardRefExoticComponent<
return;
}

const documentInitParams: Source = {
...source,
...options,
};
const documentInitParams: DocumentInitParameters = options
? { ...source, ...options }
: source;

const destroyable = pdfjs.getDocument(documentInitParams);
if (onLoadProgress) {
Expand All @@ -521,7 +521,7 @@ const Document: React.ForwardRefExoticComponent<
}
const loadingTask = destroyable;

loadingTask.promise
const loadingPromise = loadingTask.promise
.then((nextPdf) => {
pdfDispatch({ type: 'RESOLVE', value: nextPdf });
})
Expand All @@ -534,7 +534,7 @@ const Document: React.ForwardRefExoticComponent<
});

return () => {
loadingTask.destroy();
loadingPromise.finally(() => loadingTask.destroy());

@QichenZhu QichenZhu Apr 13, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change introduced a race condition when quickly switching to a new PDF file. The cleanup could run asynchronously after the new PDF started loading and cause a crash.

It's now fixed with PRs mozilla/pdf.js#20503, Expensify/react-fast-pdf#51, Expensify/react-fast-pdf#52, and Expensify/App#80160.

};
},
[options, pdfDispatch, source],
Expand Down