Compare commits

...

51 Commits

Author SHA1 Message Date
Matthew Mogford 2079bdc8b4 updated CHANGELOG.md 2024-07-31 14:31:15 +01:00
Matthew Mogford c01f8c6a06 0.1.14 2024-07-31 14:28:21 +01:00
Matthew Mogford aa454b058d updated CHANGELOG.md 2024-07-31 14:28:21 +01:00
Millroy Fernandes 14ba80fed5
Merge pull request #158 from Alcumus/readd-pdfjs-dist
fix: readded missing library
2024-07-31 08:36:45 +01:00
Millroy Fernandes bd833cd530 fix: readded missing library 2024-07-30 15:09:23 +01:00
Millroy Fernandes 3a444d289b
Merge pull request #155 from Alcumus/revert-154-cjs_fix
Revert "fix: possible fix for cjs support"
2024-06-25 12:43:33 +01:00
Millroy Fernandes 89b674c513
Revert "fix: possible fix for cjs support" 2024-06-25 12:43:21 +01:00
Millroy Fernandes 57d7ba6ce3
Merge pull request #154 from Alcumus/cjs_fix
fix: possible fix for cjs support
2024-06-25 12:37:55 +01:00
Millroy Fernandes d69a91111c fix: possible fix for cjs support 2024-06-25 12:33:19 +01:00
Matthew Mogford b6588b7079 0.1.13 2024-06-21 16:25:30 +01:00
Matthew Mogford e129617119 updated CHANGELOG.md 2024-06-21 16:25:29 +01:00
Matthew Mogford 40427e399c 0.1.12 2024-06-21 13:37:45 +01:00
Matthew Mogford 1079e67338 updated CHANGELOG.md 2024-06-21 13:37:44 +01:00
Matthew Mogford 4e430a7e55
Merge pull request #152 from Alcumus/patch/update-react-pdf-to-v9
Patch/update react pdf to v9
2024-06-21 13:35:14 +01:00
Matthew Mogford b12e8226c5
Update CHANGELOG.md 2024-06-21 13:34:49 +01:00
Matthew Mogford 30c429c7b4 Update react-pdf to 9.0.0 2024-06-21 13:34:11 +01:00
Matthew Mogford e5b8bbec96 updated CHANGELOG.md 2024-06-21 13:32:43 +01:00
Matthew Mogford 9ff6eb4638 0.1.11 2024-05-14 11:45:41 +01:00
Matthew Mogford 5c82aea1c9 updated CHANGELOG.md 2024-05-14 11:45:40 +01:00
Matthew Mogford 68e249b2ce Removed non-required @types packages and included bavel__core and babel__traverse 2024-05-14 11:45:15 +01:00
Matthew Mogford cc063d54f5 0.1.10 2024-05-14 10:24:32 +01:00
Matthew Mogford 6993785de9 updated CHANGELOG.md 2024-05-14 10:24:32 +01:00
Matthew Mogford 6e90fd2b28
Merge pull request #128 from Alcumus/renovate/configure
Configure Renovate
2024-05-14 10:23:30 +01:00
Matthew Mogford 549e413bf8 0.1.9 2024-05-14 10:22:23 +01:00
Matthew Mogford b4ae196052 updated CHANGELOG.md 2024-05-14 10:22:23 +01:00
Matthew Mogford c2affa08a1
Merge pull request #143 from Alcumus/bump/styled-components
Bump styled-components
2024-05-14 10:21:06 +01:00
Matthew Mogford ed48fa8621 Bumped @types/styled-components to 5.1.34 2024-05-14 10:17:25 +01:00
Matthew Mogford 78807984ca Bumped styled-components to 5.3.11 2024-05-14 10:17:12 +01:00
Matthew Mogford 7f26585016 0.1.8 2024-05-14 10:06:04 +01:00
Matthew Mogford 70997a27b8 updated CHANGELOG.md 2024-05-14 10:06:03 +01:00
Matthew Mogford a7a8932a58
Merge pull request #140 from Alcumus/whitesource-remediate/react-pdf-8.x
chore(deps): update dependency react-pdf to v8
2024-05-14 10:05:33 +01:00
mend-for-github-com[bot] f54d05855f
chore(deps): update dependency react-pdf to v8 2024-05-14 08:30:48 +00:00
Matthew Mogford 8fca398a0a 0.1.7 2024-05-13 18:15:07 +01:00
Matthew Mogford 8fbeb8b502 updated CHANGELOG.md 2024-05-13 18:15:07 +01:00
Matthew Mogford d2e7d5c81f
Merge pull request #139 from Alcumus/whitesource-remediate/pdfjs-dist-4.x
chore(deps): update dependency pdfjs-dist to v4
2024-05-13 18:13:13 +01:00
Matthew Mogford 68c8cf8880 0.1.6 2024-05-13 18:05:51 +01:00
Matthew Mogford a983f90c35 updated CHANGELOG.md 2024-05-13 18:05:50 +01:00
mend-for-github-com[bot] 556a0956c4
chore(deps): update dependency pdfjs-dist to v4 2024-05-13 17:00:18 +00:00
Matthew Mogford 76f7fe7c63
Merge pull request #114 from Alcumus/introduce-whitesource
Create .whitesource
2024-05-13 17:57:40 +01:00
renovate[bot] 399d6c35fa
Add renovate.json 2023-07-31 02:27:42 +00:00
Mark Gabb 0cf3a6cb5a
Create .whitesource 2022-07-11 19:31:55 +01:00
Matthew Mogford fc604da9fb 0.1.5 2020-10-29 12:11:16 +00:00
Matthew Mogford 3659fc4177 updated CHANGELOG.md 2020-10-29 12:11:16 +00:00
Matthew Mogford fa5d7b49ea
Merge pull request #55 from Alcumus/fix/TiffRenderer-corrupted-file-error
fix(TIFFRenderer file Corrupt): Don't crash if parseTIFF fails becaus…
2020-10-29 12:10:23 +00:00
Matthew Mogford 30755e57ec fix(TIFFRenderer file Corrupt): Don't crash if parseTIFF fails because of corrupted file.
Display error to user.
2020-10-29 12:09:53 +00:00
Matthew Mogford 745f7f333e 0.1.4 2020-10-29 11:46:31 +00:00
Matthew Mogford efd81faa83 updated CHANGELOG.md 2020-10-29 11:46:31 +00:00
Matthew Mogford bcb5e1223a
Merge pull request #54 from Alcumus/fix/TiffRenderer-undefined-arraybuffer
fix(TIFFRenderer crash): If parseTiff is supplied with an undefined t…
2020-10-29 11:46:05 +00:00
Matthew Mogford eedeac1e0d fix(TIFFRenderer crash): If parseTiff is supplied with an undefined tiffArrayBuffer. Return out. 2020-10-29 11:45:14 +00:00
Matthew Mogford 4d84be8a7c 0.1.3 2020-10-29 09:09:40 +00:00
Matthew Mogford dcc5e57a90 updated CHANGELOG.md 2020-10-29 09:09:40 +00:00
9 changed files with 124 additions and 19 deletions

24
.whitesource Normal file
View File

@ -0,0 +1,24 @@
{
"scanSettings": {
"configMode": "AUTO",
"configExternalURL": "",
"projectToken": "",
"baseBranches": [],
"enableLicenseViolations": "true"
},
"checkRunSettings": {
"vulnerableCheckRunConclusionLevel": "failure",
"displayMode": "diff"
},
"issueSettings": {
"minSeverityLevel": "LOW",
"issueType": "DEPENDENCY"
},
"remediateSettings": {
"workflowRules": {
"enabled": true
},
"extends": ["github>whitesource/merge-confidence:beta"],
"transitiveRemediation": true
}
}

View File

@ -1,3 +1,62 @@
#### 0.1.15 (2024-07-31)
#### 0.1.14 (2024-07-31)
##### Bug Fixes
* readded missing library ([bd833cd5](https://github.com/Alcumus/react-doc-viewer/commit/bd833cd53083a634f3aa685608b733119cb87f92))
* possible fix for cjs support ([d69a9111](https://github.com/Alcumus/react-doc-viewer/commit/d69a91111cd65abf8865a9beabeda1b292e3fc0c))
##### Other Changes
* possible fix for cjs support" ([89b674c5](https://github.com/Alcumus/react-doc-viewer/commit/89b674c513a8733d2fe30adf893b2879dfa26a23))
#### 0.1.13 (2024-06-21)
#### 0.1.12 (2024-06-21)
#### 0.1.11 (2024-05-14)
#### 0.1.10 (2024-05-14)
#### 0.1.9 (2024-05-14)
#### 0.1.8 (2024-05-14)
##### Chores
* **deps:** update dependency react-pdf to v8 ([f54d0585](https://github.com/Alcumus/react-doc-viewer/commit/f54d05855f764ca1c522157116e832ee8ca7caf0))
#### 0.1.7 (2024-05-13)
##### Chores
* **deps:** update dependency pdfjs-dist to v4 ([556a0956](https://github.com/Alcumus/react-doc-viewer/commit/556a0956c4447bdf95a8bf17ea5595cf97c54fdd))
#### 0.1.6 (2024-05-13)
#### 0.1.5 (2020-10-29)
##### Bug Fixes
* **TIFFRenderer file Corrupt:** Don't crash if parseTIFF fails because of corrupted file. ([30755e57](https://github.com/Alcumus/react-doc-viewer/commit/30755e57ec0bef8a665ce1c6f9e8f93c4ada55dc))
#### 0.1.4 (2020-10-29)
##### Bug Fixes
* **TIFFRenderer crash:** If parseTiff is supplied with an undefined tiffArrayBuffer. Return out. ([eedeac1e](https://github.com/Alcumus/react-doc-viewer/commit/eedeac1e0deada4126e77058d5c52b1ed92f200f))
#### 0.1.3 (2020-10-29)
##### New Features
* **TIF:** Added .tif as an option to render within TIFFRenderer. ([a32f9b0f](https://github.com/Alcumus/react-doc-viewer/commit/a32f9b0ffff1a0a37d14a6dd948e1d0f52ffe6c6))
##### Other Changes
* fix/pptx ([60c27812](https://github.com/Alcumus/react-doc-viewer/commit/60c27812f658d4edf4a7cc1673c26a95b838eca1))
#### 0.1.2 (2020-10-26)
##### Bug Fixes

View File

@ -1,6 +1,6 @@
{
"name": "react-doc-viewer",
"version": "0.1.2",
"version": "0.1.14",
"description": "Document viewer for react. Renders online/local documents.",
"author": "Matthew Mogford",
"license": "ISC",
@ -10,27 +10,27 @@
"main": "build/index.js",
"types": "build/index.d.ts",
"dependencies": {
"pdfjs-dist": "2.4.456",
"react-pdf": "5.0.0",
"styled-components": "^5.1.1",
"pdfjs-dist": "^4.5.136",
"react-pdf": "9.0.0",
"styled-components": "^5.3.11",
"wl-msg-reader": "^0.2.0"
},
"devDependencies": {
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^7.1.2",
"@types/babel__core": "7.1.19",
"@types/babel__traverse": "7.17.1",
"@types/jest": "^24.0.0",
"@types/node": "^12.0.0",
"@types/pdfjs-dist": "2.1.5",
"@types/react": "^16.9.46",
"@types/react-dom": "^16.9.8",
"@types/react-pdf": "4.0.5",
"@types/styled-components": "^5.1.2",
"@types/styled-components": "^5.1.34",
"generate-changelog": "^1.8.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-scripts": "3.4.3",
"typescript": "^3.9.7"
"react-scripts": "4.0.3",
"typescript": "^4.0.0"
},
"scripts": {
"start": "react-scripts start",

6
renovate.json Normal file
View File

@ -0,0 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base"
]
}

View File

@ -1,14 +1,16 @@
// @ts-ignore
import * as pdfjsWorker from "pdfjs-dist/build/pdf.worker.entry";
import React from "react";
import { pdfjs } from "react-pdf";
import styled from "styled-components";
import { DocRenderer, IStyledProps } from "../../types";
import PDFPages from "./components/pages/PDFPages";
import { getMetaURL } from "../../utils/importMeta";
import PDFControls from "./components/PDFControls";
import PDFPages from "./components/pages/PDFPages";
import { PDFProvider } from "./state";
pdfjs.GlobalWorkerOptions.workerSrc = pdfjsWorker;
pdfjs.GlobalWorkerOptions.workerSrc = new URL(
"pdfjs-dist/build/pdf.worker.min.mjs",
getMetaURL()
).toString();
const PDFRenderer: DocRenderer = ({ mainState }) => {
return (

View File

@ -11,15 +11,28 @@ const TIFFRenderer: DocRenderer = (props) => {
} = props;
const [loadedCanvas, setLoadedCanvas] = useState(false);
const [corruptedFile, setCorruptedFile] = useState(false);
useEffect(() => {
if (!currentDocument || loadedCanvas) return;
var canvas = document.getElementById("tiff-img");
try {
canvas && parseTIFF(currentDocument.fileData as ArrayBuffer, canvas);
setLoadedCanvas(true);
} catch (error) {
setCorruptedFile(true);
}
}, []);
if (corruptedFile) {
return (
<ImageProxyRenderer {...props}>
<div>Your file is corrupted. Please check it on your machine.</div>
</ImageProxyRenderer>
);
}
return (
<ImageProxyRenderer {...props}>
<Canvas id="tiff-img" />

View File

@ -347,14 +347,14 @@ const parseFileDirectory = (byteOffset) => {
export const parseTIFF = (tiffArrayBuffer, _canvas) => {
let canvas = _canvas || document.createElement("canvas");
if (!tiffArrayBuffer) return;
tiffDataView = new DataView(tiffArrayBuffer);
// canvas = _canvas;
littleEndian = isLittleEndian(tiffDataView);
if (!hasTowel(tiffDataView, littleEndian)) {
return;
}
if (!hasTowel(tiffDataView, littleEndian)) return;
var firstIFDByteOffset = getBytes(4, 4);

1
src/utils/importMeta.ts Normal file
View File

@ -0,0 +1 @@
export const getMetaURL = () => import.meta.url;

View File

@ -2,7 +2,7 @@
"compilerOptions": {
"outDir": "./build",
"target": "es5",
"module": "commonjs",
"module": "esnext",
"lib": ["dom", "dom.iterable", "esnext"],
"declaration": true,
"allowJs": true,