@internetarchive/bookreader 5.0.0-120 → 5.0.0-121

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/bookreader",
-  "version": "5.0.0-120",
+  "version": "5.0.0-121",
   "description": "The Internet Archive BookReader.",
   "type": "module",
   "files": [

package/src/plugins/plugin.text_selection.js

@@ -97,7 +97,7 @@ export class TextSelectionPlugin extends BookReaderPlugin {
   }
 
   async initTextFragment() {
-    if (this.br.options.verifyTextFragment && !await this.br.options.verifyTextFragment(this.br.targetTextFragment)) {
+    if (this.br.options.verifyTextFragment && !await this.br.options.verifyTextFragment.call(this, this.br.targetTextFragment)) {
       return;
     }
 

package/src/util/TextSelectionManager.js

@@ -1277,18 +1277,25 @@ export class BookReaderTextFragment {
   }
 
   /**
-   * Generates a URL pointing to the page with the text fragment highlighted. Maintains all existing
-   * parameters in the url.
+   * Generates a URL pointing to the page with the text fragment highlighted.
    */
   toUrl() {
-    const params = new URLSearchParams(window.location.search);
-    params.set('text', this.toNormalizedString());
+    // Strip all other parameters
+    const params = new URLSearchParams({
+      text: this.toNormalizedString(),
+    });
 
     const currentUrl = window.location;
-    const pageNum = this.pageNumber || `n${this.pageIndex}`;
-    const adjustedUrlPageNumPath = currentUrl.pathname.replace(/((?:^|[#/])page)\/[^/]+/, `$1/${pageNum}`);
-    const hash = currentUrl.hash ? currentUrl.hash.replace(/((?:^|[#/])page)\/[^/]+/, `$1/${pageNum}`) : '';
-    return `${currentUrl.origin}${adjustedUrlPageNumPath}?${params}${hash}`;
+    const pageNum = encodeURIComponent(this.pageNumber || `n${this.pageIndex}`);
+    // In urlMode 'hash' the BookReader state lives in the hash (e.g. #page/4/mode/2up)
+    const isHashMode = /^#\/?page\//.test(currentUrl.hash);
+    if (isHashMode) {
+      return `${currentUrl.origin}${currentUrl.pathname}?${params}#page/${pageNum}`;
+    }
+
+    // urlMode 'history': only keep /page/X in the path, adding it if missing
+    const basePath = currentUrl.pathname.replace(/\/page\/.*/, '').replace(/\/+$/, '');
+    return `${currentUrl.origin}${basePath}/page/${pageNum}?${params}`;
   }
 
   /**