Skip to content
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.

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

Update pdfjs-dist #2645

Merged
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -1,7 +1,7 @@
// @flow
import * as React from 'react';
import autobind from 'autobind-decorator';
import PDF from 'pdfjs-dist/webpack';
import * as PDF from 'pdfjs-dist/webpack';

type Props = {
body: Buffer,
Expand Down Expand Up @@ -36,15 +36,16 @@ class ResponsePDFViewer extends React.PureComponent<Props, State> {
const containerWidth = container.clientWidth;
const pdf = await PDF.getDocument({
data: this.props.body.toString('binary'),
});
}).promise;

for (let i = 1; i <= pdf.numPages; i++) {
const page = await pdf.getPage(i);
const density = window.devicePixelRatio || 1;

const { width: pdfWidth, height: pdfHeight } = page.getViewport(1);
const { width: pdfWidth, height: pdfHeight } = page.getViewport({ scale: 1 });
const ratio = pdfHeight / pdfWidth;
const scale = containerWidth / pdfWidth;
const viewport = page.getViewport(scale * density);
const viewport = page.getViewport({ scale: scale * density });

// set canvas for page
const canvas = document.createElement('canvas');
Expand All @@ -65,7 +66,7 @@ class ResponsePDFViewer extends React.PureComponent<Props, State> {
viewport: viewport,
};

page.render(renderContext);
await page.render(renderContext).promise;
}
}, 100);
}
Expand Down
6 changes: 3 additions & 3 deletions packages/insomnia-app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/insomnia-app/package.json
Expand Up @@ -152,7 +152,7 @@
"oauth-1.0a": "^2.2.2",
"openapi-2-kong": "^2.2.22",
"papaparse": "^5.2.0",
"pdfjs-dist": "^2.2.228",
"pdfjs-dist": "^2.5.207",
DMarby marked this conversation as resolved.
Show resolved Hide resolved
"prop-types": "^15.6.1",
"react": "^16.8.6",
"react-animated-tree": "^1.0.10",
Expand Down
15 changes: 15 additions & 0 deletions packages/insomnia-smoke-test/core/app.test.js
Expand Up @@ -78,4 +78,19 @@ describe('Application launch', function() {
const csvViewer = await debug.getCsvViewer(app);
await expect(csvViewer.getText()).resolves.toBe('a b c\n1 2 3');
});

it('sends PDF request and shows rich response', async () => {
// Cannot mock the pdf response using Prism because it is not yet supported
// https://github.com/stoplightio/prism/issues/1248#issuecomment-646056440
const pdfUrl = 'https://www.w3.org/WAI/ER/tests/xhtml/testfiles/resources/pdf/dummy.pdf';
develohpanda marked this conversation as resolved.
Show resolved Hide resolved
await debug.workspaceDropdownExists(app);
await debug.createNewRequest(app);
await debug.typeUrl(app, pdfUrl);
await debug.clickSendRequest(app);

await debug.expect200(app);
const pdfCanvas = await debug.getPdfCanvas(app);
// Investigate how we can extract text from the canvas, or compare images
await expect(pdfCanvas.isExisting()).resolves.toBe(true);
});
});
9 changes: 9 additions & 0 deletions packages/insomnia-smoke-test/modules/debug.js
Expand Up @@ -58,11 +58,20 @@ const getCsvViewer = async app => {
return csvViewer;
};

const getPdfCanvas = async app => {
const pdfViewer = await app.client.react$('ResponsePDFViewer');
await pdfViewer.waitForDisplayed();
const canvas = await pdfViewer.$('.S-PDF-ID canvas');
await canvas.waitForDisplayed();
return canvas;
};

module.exports = {
workspaceDropdownExists,
createNewRequest,
typeUrl,
clickSendRequest,
expect200,
getCsvViewer,
getPdfCanvas,
};