Merge pull request #1225 from vivliostyle/fix/viewer-find

fix(viewer): Current page should be kept after Find results in "Not Found"

packages/viewer/src/viewmodels/find-box.ts

@@ -182,7 +182,9 @@ class FindBox {
         this.status(FindStatus.NotFound);
         window.clearInterval(this.intervalID);
         this.intervalID = 0;
-        return;
+        if (epage !== currentEPage) {
+          this.viewer.navigateToEPage(currentEPage);
+        }
       }
     }, 4);
 

packages/viewer/src/viewmodels/marks-store.ts

@@ -1052,6 +1052,7 @@ export class MarksBox {
 
   navigateToMark = (mark: Mark): void => {
     const { spineIndex, offsetInItem } = mark.start;
+    window.history.pushState(null, null);
     this.parent.viewer.navigateToPosition({ spineIndex, offsetInItem });
     if (!this.pinned()) {
       this.detailsElement.open = false;

packages/viewer/src/viewmodels/navigation.ts

@@ -316,6 +316,7 @@ class Navigation {
           "vivliostyle-page-number",
         ) as HTMLInputElement;
         pageNumberElem.value = pageNumber.toString();
+        window.history.pushState(null, null);
         this.viewer.navigateToEPage(epageNav);
 
         window.setTimeout(() => {
@@ -362,7 +363,7 @@ class Navigation {
         if (this.viewerOptions.renderAllPages()) {
           const pageNumber = Number(pageNumberText);
           const epageNav = this.viewer.epageFromPageNumber(pageNumber);
-          this.viewer.navigateToEPage(epageNav, false);
+          this.viewer.navigateToEPage(epageNav);
         } else {
           const pageNumberElem = document.getElementById(
             "vivliostyle-page-number",
@@ -416,6 +417,7 @@ class Navigation {
 
   navigateToFirst = (): boolean => {
     if (!this.isNavigateToFirstDisabled()) {
+      window.history.pushState(null, null);
       this.viewer.navigateToFirst();
       return true;
     } else {
@@ -425,6 +427,7 @@ class Navigation {
 
   navigateToLast = (): boolean => {
     if (!this.isNavigateToLastDisabled()) {
+      window.history.pushState(null, null);
       this.viewer.navigateToLast();
       return true;
     } else {
@@ -562,7 +565,7 @@ class Navigation {
     ) as HTMLInputElement;
     const pageNumber = Number(pageNumberElem.value);
     const epageNav = this.viewer.epageFromPageNumber(pageNumber);
-    this.viewer.navigateToEPage(epageNav, false);
+    this.viewer.navigateToEPage(epageNav);
 
     return true;
   };

packages/viewer/src/viewmodels/viewer.ts

@@ -209,6 +209,7 @@ class Viewer {
     });
     this.coreViewer.addListener("hyperlink", (payload) => {
       if (payload.internal) {
+        window.history.pushState(null, null);
         this.navigateToInternalUrl(payload.href);
 
         // When navigate from TOC, TOC box may or may not become hidden by autohide.
@@ -278,24 +279,18 @@ class Viewer {
   }
 
   navigateToFirst(): void {
-    window.history.pushState(null, null);
     this.coreViewer.navigateToPage(Navigation.FIRST);
   }
 
   navigateToLast(): void {
-    window.history.pushState(null, null);
     this.coreViewer.navigateToPage(Navigation.LAST);
   }
 
-  navigateToEPage(epage: number, pushHistory?: boolean): void {
-    if (pushHistory === undefined || pushHistory) {
-      window.history.pushState(null, null);
-    }
+  navigateToEPage(epage: number): void {
     this.coreViewer.navigateToPage(Navigation.EPAGE, epage);
   }
 
   navigateToInternalUrl(href: string): void {
-    window.history.pushState(null, null);
     this.coreViewer.navigateToInternalUrl(href);
   }
 
@@ -304,7 +299,6 @@ class Viewer {
     pageIndex?: number;
     offsetInItem?: number;
   }): void {
-    window.history.pushState(null, null);
     this.coreViewer.navigateToPosition(position);
   }