Merge pull request #5 from PDFTron/update-to-webviewer-7.2

Upgraded version of WebViewer to 7.2
ApryseSDK · Dec 8, 2020 · c8cd562 · c8cd562
2 parents 3dc73fb + 9d69584
commit c8cd562
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 45 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@pdftron/webviewer": "^6.3.1",
+    "@pdftron/webviewer": "^7.2.0",
     "@reach/router": "^1.3.3",
     "@reduxjs/toolkit": "^1.3.6",
     "@testing-library/jest-dom": "^4.2.4",

diff --git a/src/components/PrepareDocument/PrepareDocument.js b/src/components/PrepareDocument/PrepareDocument.js
@@ -44,24 +44,19 @@ const PrepareDocument = () => {
       {
         path: 'webviewer',
         disabledElements: [
-          'toolsButton',
+          'ribbons',
+          'toggleNotesButton',
           'searchButton',
           'menuButton',
-          'contextMenuPopup',
-          'freeHandToolGroupButton',
-          'textToolGroupButton',
-          'shapeToolGroupButton',
-          'signatureToolButton',
-          'eraserToolButton',
-          'stickyToolButton',
-          'freeTextToolButton',
-          'miscToolGroupButton',
         ],
       },
       viewer.current,
     ).then(instance => {
       const { iframeWindow } = instance;
 
+      // select only the view group
+      instance.setToolbarGroup('toolbarGroup-View');
+
       setInstance(instance);
 
       const iframeDoc = iframeWindow.document.body;
@@ -164,13 +159,7 @@ const PrepareDocument = () => {
 
         // customize styles of the form field
         Annotations.WidgetAnnotation.getCustomStyles = function (widget) {
-          if (widget instanceof Annotations.TextWidgetAnnotation) {
-            return {
-              'background-color': '#a5c7ff',
-              color: 'white',
-              'font-size': '20px',
-            };
-          } else if (widget instanceof Annotations.SignatureWidgetAnnotation) {
+          if (widget instanceof Annotations.SignatureWidgetAnnotation) {
             return {
               border: '1px solid #a5c7ff',
             };
@@ -203,14 +192,14 @@ const PrepareDocument = () => {
       return; //don't add field to an invalid page location
     }
     const page_idx =
-      page.first !== null ? page.first : docViewer.getCurrentPage() - 1;
+      page.first !== null ? page.first : docViewer.getCurrentPage();
     const page_info = doc.getPageInfo(page_idx);
     const page_point = displayMode.windowToPage(point, page_idx);
     const zoom = docViewer.getZoom();
 
     var textAnnot = new Annotations.FreeTextAnnotation();
-    textAnnot.PageNumber = page_idx + 1;
-    const rotation = docViewer.getCompleteRotation(page_idx + 1) * 90;
+    textAnnot.PageNumber = page_idx;
+    const rotation = docViewer.getCompleteRotation(page_idx) * 90;
     textAnnot.Rotation = rotation;
     if (rotation === 270 || rotation === 90) {
       textAnnot.Width = 50.0 / zoom;

diff --git a/src/components/SignDocument/SignDocument.js b/src/components/SignDocument/SignDocument.js
@@ -25,25 +25,27 @@ const SignDocument = () => {
       {
         path: 'webviewer',
         disabledElements: [
-          'toolsButton',
+          'ribbons',
+          'toggleNotesButton',
           'searchButton',
           'menuButton',
-          'contextMenuPopup',
-          'freeHandToolGroupButton',
-          'textToolGroupButton',
-          'shapeToolGroupButton',
-          'signatureToolButton',
-          'eraserToolButton',
-          'stickyToolButton',
-          'freeTextToolButton',
-          'miscToolGroupButton',
+          'rubberStampToolGroupButton',
+          'stampToolGroupButton',
+          'fileAttachmentToolGroupButton',
+          'calloutToolGroupButton',
+          'undo',
+          'redo',
+          'eraserToolButton'
         ],
       },
       viewer.current,
     ).then(async instance => {
       const { docViewer, annotManager, Annotations } = instance;
       setAnnotatManager(annotManager);
 
+      // select only the insert group
+      instance.setToolbarGroup('toolbarGroup-Insert');
+
       // load document
       const storageRef = storage.ref();
       const URL = await storageRef.child(docRef).getDownloadURL();

diff --git a/src/components/ViewDocument/ViewDocument.js b/src/components/ViewDocument/ViewDocument.js
@@ -21,22 +21,16 @@ const ViewDocument = () => {
       {
         path: 'webviewer',
         disabledElements: [
-          'toolsButton',
-          'searchButton',
-          'menuButton',
+          'ribbons',
+          'toggleNotesButton',
           'contextMenuPopup',
-          'freeHandToolGroupButton',
-          'textToolGroupButton',
-          'shapeToolGroupButton',
-          'signatureToolButton',
-          'eraserToolButton',
-          'stickyToolButton',
-          'freeTextToolButton',
-          'miscToolGroupButton',
         ],
       },
       viewer.current,
     ).then(async instance => {
+      // select only the view group
+      instance.setToolbarGroup('toolbarGroup-View');
+
       setInstance(instance);
 
       // load document