fixes issue which caused text to stay scrambled when switching betwee…

…n paginated and scroll mode
d-i-t-a · Jan 31, 2024 · 47df832 · 47df832
1 parent fb33796
commit 47df832
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/modules/protection/ContentProtectionModule.ts b/src/modules/protection/ContentProtectionModule.ts
@@ -937,7 +937,7 @@ export class ContentProtectionModule implements ReaderModule {
       this.toggleRect(rect, this.securityContainer, this.isHacked)
     );
   }
-  handleResize() {
+  async handleResize() {
     if (this.properties?.enableObfuscation) {
       const onDoResize = debounce(() => {
         this.calcRects(this.rects);
@@ -946,7 +946,7 @@ export class ContentProtectionModule implements ReaderModule {
             this.toggleRect(rect, this.securityContainer, this.isHacked)
           );
         }
-      }, 10);
+      }, 50);
       if (this.rects) {
         this.observe();
         onDoResize();
@@ -1126,8 +1126,8 @@ export class ContentProtectionModule implements ReaderModule {
     }
     return true;
   }
-  copyToClipboard(textToClipboard) {
-    textToClipboard = textToClipboard.substring(
+  copyToClipboard(textToClipboard: string | undefined) {
+    textToClipboard = textToClipboard?.substring(
       0,
       this.properties?.charactersToCopy ?? 0
     );

diff --git a/src/navigator/IFrameNavigator.ts b/src/navigator/IFrameNavigator.ts
@@ -2646,7 +2646,11 @@ export class IFrameNavigator extends EventEmitter implements Navigator {
       if (oldPosition) {
         this.view?.goToProgression(oldPosition);
       }
-      await this.updatePositionInfo(false);
+      this.updatePositionInfo(false);
+
+      if (this.contentProtectionModule !== undefined) {
+        await this.contentProtectionModule.handleResize();
+      }
 
       if (this.annotationModule !== undefined) {
         await this.annotationModule.handleResize();
@@ -2663,14 +2667,11 @@ export class IFrameNavigator extends EventEmitter implements Navigator {
       if (this.pageBreakModule !== undefined) {
         await this.pageBreakModule.handleResize();
       }
-      if (this.contentProtectionModule !== undefined) {
-        this.contentProtectionModule.handleResize();
-      }
       if (this.lineFocusModule !== undefined) {
         this.lineFocusModule.handleResize();
       }
       if (this.historyModule !== undefined) {
-        this.historyModule.handleResize();
+        await this.historyModule.handleResize();
       }
     }, 150);
   }