From abf9411933870dd08cc26ca276de6df9e9027517 Mon Sep 17 00:00:00 2001
From: Aferdita Muriqi <aferdita.muriqi@gmail.com>
Date: Wed, 14 Dec 2022 00:48:12 -0500
Subject: [PATCH 1/3] await results for entire book

---
 src/modules/search/SearchModule.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/search/SearchModule.ts b/src/modules/search/SearchModule.ts
index 16508b41..90152965 100644
--- a/src/modules/search/SearchModule.ts
+++ b/src/modules/search/SearchModule.ts
@@ -718,7 +718,7 @@ export class SearchModule implements ReaderModule {
       if (tocItem) {
         let href = this.publication.getAbsoluteHref(tocItem.Href);
         if (this.delegate.api?.getContent) {
-          this.delegate.api?.getContent(href).then((content) => {
+          await this.delegate.api?.getContent(href).then((content) => {
             let parser = new DOMParser();
             let doc = parser.parseFromString(
               this.delegate.requestConfig?.encoded
@@ -793,7 +793,7 @@ export class SearchModule implements ReaderModule {
     if (tocItem) {
       let href = this.publication.getAbsoluteHref(tocItem.Href);
       if (this.delegate.api?.getContent) {
-        this.delegate.api?.getContent(href).then((content) => {
+        await this.delegate.api?.getContent(href).then((content) => {
           let parser = new DOMParser();
           let doc = parser.parseFromString(
             this.delegate.requestConfig?.encoded

From 58b1ff3a04037b216401bdde4fba1d9cc67d7416 Mon Sep 17 00:00:00 2001
From: Aferdita Muriqi <aferdita.muriqi@gmail.com>
Date: Wed, 14 Dec 2022 01:02:53 -0500
Subject: [PATCH 2/3] reset search before new search

---
 src/modules/search/SearchModule.ts | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/modules/search/SearchModule.ts b/src/modules/search/SearchModule.ts
index 90152965..3b406489 100644
--- a/src/modules/search/SearchModule.ts
+++ b/src/modules/search/SearchModule.ts
@@ -26,12 +26,14 @@ import {
   removeEventListenerOptional,
 } from "../../utils/EventHandler";
 import { AnnotationMarker, Locations, Locator } from "../../model/Locator";
-import { DEFAULT_BACKGROUND_COLOR } from "../highlight/TextHighlighter";
+import {
+  DEFAULT_BACKGROUND_COLOR,
+  TextHighlighter,
+} from "../highlight/TextHighlighter";
 import { HighlightType, IHighlight } from "../highlight/common/highlight";
 import { ISelectionInfo } from "../highlight/common/selection";
 import { SHA256 } from "jscrypto";
-import { searchDocDomSeek, reset } from "./searchWithDomSeek";
-import { TextHighlighter } from "../highlight/TextHighlighter";
+import { reset, searchDocDomSeek } from "./searchWithDomSeek";
 import log from "loglevel";
 
 export interface SearchModuleAPI {}
@@ -400,17 +402,16 @@ export class SearchModule implements ReaderModule {
     this.currentChapterSearchResult = [];
     this.currentSearchHighlights = [];
     this.bookSearchResult = [];
-    reset();
 
-    this.searchAndPaintChapter(term, 0, async () => {});
-
-    var chapter = this.searchChapter(term);
-    var book = this.searchBook(term);
+    reset();
+    await this.searchAndPaintChapter(term, 0, async () => {});
 
     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: string, index: number, current: boolean) {

From 8654e2fd35cfe58c0f35e85fd99e5cf57caab701 Mon Sep 17 00:00:00 2001
From: Aferdita Muriqi <aferdita.muriqi@gmail.com>
Date: Wed, 14 Dec 2022 01:03:18 -0500
Subject: [PATCH 3/3] version bump

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8db69606..3b5ec0b0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@d-i-t-a/reader",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@d-i-t-a/reader",
-      "version": "2.1.6",
+      "version": "2.1.7",
       "license": "Apache-2.0",
       "dependencies": {
         "@types/sass": "^1.43.1",
diff --git a/package.json b/package.json
index 16ce59f8..efe6cd10 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@d-i-t-a/reader",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "description": "A viewer application for EPUB files.",
   "repository": "https://github.com/d-i-t-a/R2D2BC",
   "license": "Apache-2.0",