From 22bfbf1ce8b5ed9bea8cfc6268293bd7ceb25a2d Mon Sep 17 00:00:00 2001 From: A S Date: Mon, 9 Sep 2019 23:42:36 +1000 Subject: [PATCH] pdfjs-dist expand exports, export pdfjs-dist from react-pdf (#38117) * pdfjs-dist module definition * Declare pdfjs export in react-pdf * Remove react-pdf/package.json, fix-up default export * Add pdfjs test to react-pdf --- types/pdfjs-dist/index.d.ts | 8 ++++++++ types/react-pdf/dist/entry.parcel.d.ts | 1 + types/react-pdf/dist/entry.webpack.d.ts | 1 + types/react-pdf/dist/pdfjs-dist.d.ts | 3 +++ types/react-pdf/index.d.ts | 7 ++----- types/react-pdf/react-pdf-tests.tsx | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 types/react-pdf/dist/pdfjs-dist.d.ts diff --git a/types/pdfjs-dist/index.d.ts b/types/pdfjs-dist/index.d.ts index dd09a68060..029c4308e9 100644 --- a/types/pdfjs-dist/index.d.ts +++ b/types/pdfjs-dist/index.d.ts @@ -6,6 +6,14 @@ /// +declare const version: string; + +declare const GlobalWorkerOptions: GlobalWorkerOptions; + +interface GlobalWorkerOptions { + workerSrc: string; +} + interface PDFPromise { isResolved(): boolean; isRejected(): boolean; diff --git a/types/react-pdf/dist/entry.parcel.d.ts b/types/react-pdf/dist/entry.parcel.d.ts index e9669bb471..2763d71595 100644 --- a/types/react-pdf/dist/entry.parcel.d.ts +++ b/types/react-pdf/dist/entry.parcel.d.ts @@ -1,3 +1,4 @@ export { default as Document } from './Document'; export { default as Page } from './Page'; export { default as Outline } from './Outline'; +export { default as pdfjs } from './pdfjs-dist'; diff --git a/types/react-pdf/dist/entry.webpack.d.ts b/types/react-pdf/dist/entry.webpack.d.ts index e9669bb471..2763d71595 100644 --- a/types/react-pdf/dist/entry.webpack.d.ts +++ b/types/react-pdf/dist/entry.webpack.d.ts @@ -1,3 +1,4 @@ export { default as Document } from './Document'; export { default as Page } from './Page'; export { default as Outline } from './Outline'; +export { default as pdfjs } from './pdfjs-dist'; diff --git a/types/react-pdf/dist/pdfjs-dist.d.ts b/types/react-pdf/dist/pdfjs-dist.d.ts new file mode 100644 index 0000000000..2f29eb2e6e --- /dev/null +++ b/types/react-pdf/dist/pdfjs-dist.d.ts @@ -0,0 +1,3 @@ +import * as pdfjs from 'pdfjs-dist'; + +export default pdfjs; diff --git a/types/react-pdf/index.d.ts b/types/react-pdf/index.d.ts index bf492cf6a1..7c3f2e39c1 100644 --- a/types/react-pdf/index.d.ts +++ b/types/react-pdf/index.d.ts @@ -8,9 +8,6 @@ import Document from './dist/Document'; import Page from './dist/Page'; import Outline from './dist/Outline'; +import pdfjs from './dist/pdfjs-dist'; -export { - Document, - Page, - Outline -}; +export { pdfjs, Document, Page, Outline }; diff --git a/types/react-pdf/react-pdf-tests.tsx b/types/react-pdf/react-pdf-tests.tsx index 0a86b7da41..fd518c86e0 100644 --- a/types/react-pdf/react-pdf-tests.tsx +++ b/types/react-pdf/react-pdf-tests.tsx @@ -1,7 +1,9 @@ import * as React from 'react'; -import { Document, Page } from 'react-pdf'; +import { Document, Page, pdfjs } from 'react-pdf'; import { PDFDocumentProxy } from 'pdfjs-dist'; +pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.js`; + interface State { numPages: number | null; pageNumber: number;