Merge pull request #784 from d-i-t-a/bugfix/history-on-internal-links

fixes reading position in history on internal links
d-i-t-a · Feb 17, 2024 · e7672b5 · e7672b5
2 parents eeadf7c + 154271b
commit e7672b5
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/modules/history/HistoryModule.ts b/src/modules/history/HistoryModule.ts
@@ -119,7 +119,6 @@ export class HistoryModule implements ReaderModule {
   }
 
   async push(locator: Locator, history: boolean) {
-    let lastInHistory;
     if (history && this.annotator) {
       let lastReadingPosition =
         (await this.annotator.getLastReadingPosition()) as
@@ -141,13 +140,24 @@ export class HistoryModule implements ReaderModule {
         ) {
           this.history.push(lastReadingPosition);
           this.historyCurrentIndex = this.history.length - 1;
+        } else {
+          const lastInHistory = this.history[this.history.length - 1];
+          if (
+            (lastInHistory &&
+              lastInHistory.href !== locator.href &&
+              lastInHistory.locations !== locator.locations) ||
+            lastInHistory === undefined
+          ) {
+            this.history.push(lastReadingPosition);
+            this.historyCurrentIndex = this.history.length - 1;
+          }
         }
       }
 
       if (this.historyCurrentIndex < this.history.length - 1) {
         this.history = this.history.slice(0, this.historyCurrentIndex);
       }
-      lastInHistory = this.history[this.history.length - 1];
+      const lastInHistory = this.history[this.history.length - 1];
       if (
         (lastInHistory && lastInHistory.href !== locator.href) ||
         lastInHistory === undefined