@d-i-t-a/reader 2.1.5 → 2.1.7

package/dist/esm/index.js

@@ -42925,14 +42925,14 @@ var SearchModule = class {
     this.currentSearchHighlights = [];
     this.bookSearchResult = [];
     reset();
-    this.searchAndPaintChapter(term, 0, async () => {
+    await this.searchAndPaintChapter(term, 0, async () => {
     });
-    var chapter = this.searchChapter(term);
-    var book = this.searchBook(term);
     if (current) {
-      return chapter;
+      await this.searchBook(term);
+      return await this.searchChapter(term);
     } else {
-      return book;
+      await this.searchChapter(term);
+      return await this.searchBook(term);
     }
   }
   async goToSearchID(href, index2, current) {
@@ -43140,18 +43140,33 @@ var SearchModule = class {
       }
       if (tocItem) {
         let href = this.publication.getAbsoluteHref(tocItem.Href);
-        await fetch(href, this.delegate.requestConfig).then((r) => r.text()).then(async (data) => {
-          let parser = new DOMParser();
-          let doc = parser.parseFromString(this.delegate.requestConfig?.encoded ? this.decodeBase64(data) : data, "application/xhtml+xml");
-          if (tocItem) {
-            searchDocDomSeek(term, doc, tocItem.Href, tocItem.Title).then((result) => {
-              result.forEach((searchItem) => {
-                localSearchResultBook.push(searchItem);
-                this.bookSearchResult.push(searchItem);
+        if (this.delegate.api?.getContent) {
+          await this.delegate.api?.getContent(href).then((content) => {
+            let parser = new DOMParser();
+            let doc = parser.parseFromString(this.delegate.requestConfig?.encoded ? this.decodeBase64(content) : content, "application/xhtml+xml");
+            if (tocItem) {
+              searchDocDomSeek(term, doc, tocItem.Href, tocItem.Title).then((result) => {
+                result.forEach((searchItem) => {
+                  localSearchResultBook.push(searchItem);
+                  this.bookSearchResult.push(searchItem);
+                });
               });
-            });
-          }
-        });
+            }
+          });
+        } else {
+          await fetch(href, this.delegate.requestConfig).then((r) => r.text()).then(async (data) => {
+            let parser = new DOMParser();
+            let doc = parser.parseFromString(this.delegate.requestConfig?.encoded ? this.decodeBase64(data) : data, "application/xhtml+xml");
+            if (tocItem) {
+              searchDocDomSeek(term, doc, tocItem.Href, tocItem.Title).then((result) => {
+                result.forEach((searchItem) => {
+                  localSearchResultBook.push(searchItem);
+                  this.bookSearchResult.push(searchItem);
+                });
+              });
+            }
+          });
+        }
       }
       if (index2 === this.publication.readingOrder.length - 1) {
         return localSearchResultBook;
@@ -43177,17 +43192,31 @@ var SearchModule = class {
     }
     if (tocItem) {
       let href = this.publication.getAbsoluteHref(tocItem.Href);
-      await fetch(href, this.delegate.requestConfig).then((r) => r.text()).then(async (data) => {
-        let parser = new DOMParser();
-        let doc = parser.parseFromString(this.delegate.requestConfig?.encoded ? this.decodeBase64(data) : data, "application/xhtml+xml");
-        if (tocItem) {
-          searchDocDomSeek(term, doc, tocItem.Href, tocItem.Title).then((result) => {
-            result.forEach((searchItem) => {
-              localSearchResultBook.push(searchItem);
+      if (this.delegate.api?.getContent) {
+        await this.delegate.api?.getContent(href).then((content) => {
+          let parser = new DOMParser();
+          let doc = parser.parseFromString(this.delegate.requestConfig?.encoded ? this.decodeBase64(content) : content, "application/xhtml+xml");
+          if (tocItem) {
+            searchDocDomSeek(term, doc, tocItem.Href, tocItem.Title).then((result) => {
+              result.forEach((searchItem) => {
+                localSearchResultBook.push(searchItem);
+              });
             });
-          });
-        }
-      });
+          }
+        });
+      } else {
+        await fetch(href, this.delegate.requestConfig).then((r) => r.text()).then(async (data) => {
+          let parser = new DOMParser();
+          let doc = parser.parseFromString(this.delegate.requestConfig?.encoded ? this.decodeBase64(data) : data, "application/xhtml+xml");
+          if (tocItem) {
+            searchDocDomSeek(term, doc, tocItem.Href, tocItem.Title).then((result) => {
+              result.forEach((searchItem) => {
+                localSearchResultBook.push(searchItem);
+              });
+            });
+          }
+        });
+      }
     }
     return localSearchResultBook;
   }