Skip to content

Commit 6df6df3

Browse files
committed
Merge branch 'master' into pdfjs-2.0.943
2 parents 1f1848a + 856576f commit 6df6df3

File tree

8 files changed

+841
-957
lines changed

8 files changed

+841
-957
lines changed

README.md

+3-11
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ Minimal demo page is included in sample directory.
2222

2323
React-PDF is under constant development. This documentation is written for React-PDF 4.x branch. If you want to see documentation for other versions of React-PDF, use dropdown on top of GitHub page to switch to an appropriate tag. Here are quick links to the newest docs from each branch:
2424

25-
* [v3.x](https://github.com/wojtekmaj/react-pdf/blob/v3.0.5/README.md)
26-
* [v2.x](https://github.com/wojtekmaj/react-pdf/blob/v2.5.3/README.md)
25+
* [v3.x](https://github.com/wojtekmaj/react-pdf/blob/v3.x/README.md)
26+
* [v2.x](https://github.com/wojtekmaj/react-pdf/blob/v2.x/README.md)
2727
* [v1.x](https://github.com/wojtekmaj/react-pdf/blob/v1.8.3/README.md)
2828

2929
## Getting started
@@ -297,12 +297,4 @@ Thank you to all our backers! [Become a backer](https://opencollective.com/react
297297

298298
Thank you to all our contributors that helped on this project!
299299

300-
[![0](https://sourcerer.io/fame/wojtekmaj/wojtekmaj/react-pdf/images/0)](https://sourcerer.io/fame/wojtekmaj/wojtekmaj/react-pdf/links/0)
301-
[![1](https://sourcerer.io/fame/wojtekmaj/wojtekmaj/react-pdf/images/1)](https://sourcerer.io/fame/wojtekmaj/wojtekmaj/react-pdf/links/1)
302-
[![2](https://sourcerer.io/fame/wojtekmaj/wojtekmaj/react-pdf/images/2)](https://sourcerer.io/fame/wojtekmaj/wojtekmaj/react-pdf/links/2)
303-
[![3](https://sourcerer.io/fame/wojtekmaj/wojtekmaj/react-pdf/images/3)](https://sourcerer.io/fame/wojtekmaj/wojtekmaj/react-pdf/links/3)
304-
[![4](https://sourcerer.io/fame/wojtekmaj/wojtekmaj/react-pdf/images/4)](https://sourcerer.io/fame/wojtekmaj/wojtekmaj/react-pdf/links/4)
305-
[![5](https://sourcerer.io/fame/wojtekmaj/wojtekmaj/react-pdf/images/5)](https://sourcerer.io/fame/wojtekmaj/wojtekmaj/react-pdf/links/5)
306-
[![6](https://sourcerer.io/fame/wojtekmaj/wojtekmaj/react-pdf/images/6)](https://sourcerer.io/fame/wojtekmaj/wojtekmaj/react-pdf/links/6)
307-
[![7](https://sourcerer.io/fame/wojtekmaj/wojtekmaj/react-pdf/images/7)](https://sourcerer.io/fame/wojtekmaj/wojtekmaj/react-pdf/links/7)
308-
300+
![Top Contributors](https://opencollective.com/react-pdf/contributors.svg?width=890&button=false)

__mocks__/_failing_pdf.js

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ export default {
33
fingerprint: 'a62067476e69734bb8eb60122615dfbf',
44
numPages: 4,
55
},
6+
fingerprint: 'a62067476e69734bb8eb60122615dfbf',
67
getDestination: () => new Promise((resolve, reject) => reject(new Error())),
78
getOutline: () => new Promise((resolve, reject) => reject(new Error())),
89
getPage: () => new Promise((resolve, reject) => reject(new Error())),

__mocks__/_silently_failing_pdf.js

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ export default {
55
fingerprint: 'a62067476e69734bb8eb60122615dfbf',
66
numPages: 4,
77
},
8+
fingerprint: 'a62067476e69734bb8eb60122615dfbf',
89
getDestination: () => new Promise((resolve, reject) => reject(new RenderingCancelledException())),
910
getOutline: () => new Promise((resolve, reject) => reject(new RenderingCancelledException())),
1011
getPage: () => new Promise((resolve, reject) => reject(new RenderingCancelledException())),

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-pdf",
3-
"version": "4.0.0-beta.5",
3+
"version": "4.0.0-beta.6",
44
"description": "Display PDFs in your React app as easily as if they were images.",
55
"main": "dist/entry.js",
66
"es6": "src/entry.js",

sample/parcel/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-pdf-sample-page-parcel",
3-
"version": "4.0.0-beta.5",
3+
"version": "4.0.0-beta.6",
44
"description": "A sample page for React-PDF.",
55
"private": true,
66
"scripts": {

sample/webpack/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-pdf-sample-page-webpack",
3-
"version": "4.0.0-beta.5",
3+
"version": "4.0.0-beta.6",
44
"description": "A sample page for React-PDF.",
55
"private": true,
66
"scripts": {

src/shared/propTypes.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export const isPageIndex = (props, propName, componentName) => {
7474
return new Error(`Expected \`${propName}\` to be greater or equal to 0.`);
7575
}
7676

77-
const { numPages } = pdf._pdfInfo;
77+
const { numPages } = pdf;
7878

7979
if (pageIndex + 1 > numPages) {
8080
return new Error(`Expected \`${propName}\` to be less or equal to ${numPages - 1}.`);
@@ -103,7 +103,7 @@ export const isPageNumber = (props, propName, componentName) => {
103103
return new Error(`Expected \`${propName}\` to be greater or equal to 1.`);
104104
}
105105

106-
const { numPages } = pdf._pdfInfo;
106+
const { numPages } = pdf;
107107

108108
if (pageNumber > numPages) {
109109
return new Error(`Expected \`${propName}\` to be less or equal to ${numPages}.`);

yarn.lock

+831-941
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)