Merge pull request #774 from d-i-t-a/develop

2.4.4
d-i-t-a · Feb 7, 2024 · 1413711 · 1413711
2 parents ca0e267 + 920f0c6
commit 1413711
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 19 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@d-i-t-a/reader",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "description": "A viewer application for EPUB files.",
   "repository": "https://github.com/d-i-t-a/R2D2BC",
   "license": "Apache-2.0",

diff --git a/src/model/user-settings/UserSettings.ts b/src/model/user-settings/UserSettings.ts
@@ -188,7 +188,9 @@ export class UserSettings implements IUserSettings {
         log.log(settings.verticalScroll);
       }
       if (initialUserSettings.appearance) {
-        settings.appearance = UserSettings.parseAppearanceSetting(initialUserSettings.appearance)
+        settings.appearance = UserSettings.parseAppearanceSetting(
+          initialUserSettings.appearance
+        );
         let prop = settings.userProperties.getByRef(ReadiumCSS.APPEARANCE_REF);
         if (prop) {
           prop.value = settings.appearance;
@@ -953,8 +955,9 @@ export class UserSettings implements IUserSettings {
   }
 
   async resetUserSettings(): Promise<void> {
-    await this.store.remove(this.USERSETTINGS);
+    this.store.remove(this.USERSETTINGS);
     await this.reset();
+    this.viewChangeCallback();
     this.settingsChangeCallback();
   }
 
@@ -987,7 +990,9 @@ export class UserSettings implements IUserSettings {
 
   async applyUserSettings(userSettings: Partial<UserSettings>): Promise<void> {
     if (userSettings.appearance) {
-      this.appearance = UserSettings.parseAppearanceSetting(userSettings.appearance)
+      this.appearance = UserSettings.parseAppearanceSetting(
+        userSettings.appearance
+      );
       let prop = this.userProperties?.getByRef(ReadiumCSS.APPEARANCE_REF);
       if (prop) {
         prop.value = this.appearance;
@@ -1119,10 +1124,7 @@ export class UserSettings implements IUserSettings {
     inputSetting: InitialUserSettings["appearance"]
   ): number {
     let a: string;
-    if (
-      inputSetting === "day" ||
-      inputSetting === "readium-default-on"
-    ) {
+    if (inputSetting === "day" || inputSetting === "readium-default-on") {
       a = UserSettings.appearanceValues[0];
     } else if (
       inputSetting === "sepia" ||
@@ -1137,9 +1139,7 @@ export class UserSettings implements IUserSettings {
     } else {
       a = inputSetting;
     }
-    return UserSettings.appearanceValues.findIndex(
-      (el: any) => el === a
-    );
+    return UserSettings.appearanceValues.findIndex((el: any) => el === a);
   }
 
   async scroll(scroll: boolean): Promise<void> {
@@ -1163,8 +1163,9 @@ export class UserSettings implements IUserSettings {
       (
         this.userProperties?.getByRef(ReadiumCSS.FONT_SIZE_REF) as Incremental
       ).increment();
-      this.fontSize = this.userProperties?.getByRef(ReadiumCSS.FONT_SIZE_REF)
-        ?.value;
+      this.fontSize = this.userProperties?.getByRef(
+        ReadiumCSS.FONT_SIZE_REF
+      )?.value;
       let prop = this.userProperties?.getByRef(ReadiumCSS.FONT_SIZE_REF);
       if (prop) {
         await this.storeProperty(prop);
@@ -1216,8 +1217,9 @@ export class UserSettings implements IUserSettings {
       (
         this.userProperties?.getByRef(ReadiumCSS.FONT_SIZE_REF) as Incremental
       ).decrement();
-      this.fontSize = this.userProperties?.getByRef(ReadiumCSS.FONT_SIZE_REF)
-        ?.value;
+      this.fontSize = this.userProperties?.getByRef(
+        ReadiumCSS.FONT_SIZE_REF
+      )?.value;
       let prop = this.userProperties?.getByRef(ReadiumCSS.FONT_SIZE_REF);
       if (prop) {
         await this.storeProperty(prop);

diff --git a/src/modules/protection/ContentProtectionModule.ts b/src/modules/protection/ContentProtectionModule.ts
@@ -1435,8 +1435,27 @@ export class ContentProtectionModule implements ReaderModule {
     const windowRight = windowLeft + this.wrapper.clientWidth;
     const right = rect.left + rect.width;
     const bottom = rect.top + rect.height;
-    const windowTop = this.wrapper.scrollTop;
-    const windowBottom = windowTop + this.wrapper.clientHeight;
+    const windowTop =
+      this.wrapper.scrollTop -
+      (rect.node.parentElement
+        ? parseInt(
+            getComputedStyle(rect.node.parentElement).lineHeight.replace(
+              "px",
+              ""
+            )
+          )
+        : 10);
+    const windowBottom =
+      windowTop +
+      this.wrapper.clientHeight +
+      (rect.node.parentElement
+        ? parseInt(
+            getComputedStyle(rect.node.parentElement).lineHeight.replace(
+              "px",
+              ""
+            )
+          )
+        : 10);
 
     const isAbove = bottom < windowTop;
     const isBelow = rect.top > windowBottom;