Fix the editing of the annotations after a rotation

uclouvain · Mar 11, 2024 · 9a780fd · 9a780fd
1 parent fa043d5
commit 9a780fd
Show file tree

Hide file tree

Showing 10 changed files with 164 additions and 113 deletions.
diff --git a/frontend/DocumentEditor.vue b/frontend/DocumentEditor.vue
@@ -31,7 +31,7 @@
           class="viewerContainer"
           tabindex="0"
       >
-        <div class="pdfViewer" />
+        <div class="pdfViewer" ref="pdfViewer" />
       </div>
     </div>
 
@@ -229,6 +229,7 @@ export default defineComponent({
           const viewer = new PDFViewer({
             container: this.$refs.viewerContainer as HTMLDivElement,
             eventBus: new EventBus(),
+            viewer: this.$refs.pdfViewer as HTMLDivElement,
           });
           viewer.setDocument(pdfDocument);
 
@@ -258,6 +259,7 @@ export default defineComponent({
     rotate(rotation: number) {
       // @ts-ignore bad typing from lib, see https://github.com/mozilla/pdf.js/pull/16362
       (this.viewer?.getPageView(this.currentPage - 1) as PDFPageView).update({rotation});
+      this.viewer?.update();  // To correctly display annotation layers after a rotation
       if (rotation !== 0) {
         this.rotations[this.currentPage - 1] = rotation;
       } else {

diff --git a/frontend/components/ToolbarRotation.vue b/frontend/components/ToolbarRotation.vue
@@ -29,14 +29,14 @@
     <button
         type="button"
         class="btn btn-default"
-        @click="$emit('onRotate', (currentRotation - 90) % 360)"
+        @click="$emit('onRotate', ((currentRotation - 90) % 360 + 360) % 360)"
     >
       <span class="fas fa-rotate-left" />
     </button>
     <button
         type="button"
         class="btn btn-default"
-        @click="$emit('onRotate', (currentRotation + 90) % 360)"
+        @click="$emit('onRotate', ((currentRotation + 90) % 360 + 360) % 360)"
     >
       <span class="fas fa-rotate-right" />
     </button>

diff --git a/osis_document/static/osis_document/osis-document-editor.css b/osis_document/static/osis_document/osis-document-editor.css
diff --git a/osis_document/static/osis_document/osis-document-editor.umd.min.js b/osis_document/static/osis_document/osis-document-editor.umd.min.js
diff --git a/osis_document/static/osis_document/osis-document-editor.umd.min.js.map b/osis_document/static/osis_document/osis-document-editor.umd.min.js.map
diff --git a/osis_document/static/osis_document/osis-document.umd.min.js b/osis_document/static/osis_document/osis-document.umd.min.js
diff --git a/osis_document/static/osis_document/osis-document.umd.min.js.map b/osis_document/static/osis_document/osis-document.umd.min.js.map
diff --git a/osis_document/static/pdfjs/pdf.worker.min.js b/osis_document/static/pdfjs/pdf.worker.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -51,7 +51,7 @@
     "vue-tsc": "^1.0.24"
   },
   "dependencies": {
-    "pdfjs-dist": "^3.5.141",
+    "pdfjs-dist": "3.6.172",
     "tiny-emitter": "^2.1.0",
     "vue-uuid": "^3.0.0"
   }