From 0c495c7264fa1a2702386ac162a6c348b106660e Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Tue, 30 May 2023 15:19:06 +0800
Subject: [PATCH] Implement clear on cancel of edit note

---
 .../omnivore/ui/reader/WebReaderLoadingContainer.kt        | 2 ++
 .../app/omnivore/omnivore/ui/reader/WebReaderViewModel.kt  | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderLoadingContainer.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderLoadingContainer.kt
index b5f63643a..e0864f086 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderLoadingContainer.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderLoadingContainer.kt
@@ -240,6 +240,8 @@ fun WebReaderLoadingContainer(slug: String? = null, requestID: String? = null,
               coroutineScope.launch {
                 if (save) {
                   webReaderViewModel.saveAnnotation(note ?: "")
+                } else {
+                  webReaderViewModel.cancelAnnotation()
                 }
                 webReaderViewModel.annotation = null
               }
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderViewModel.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderViewModel.kt
index 752647bd4..0eb4747c8 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderViewModel.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderViewModel.kt
@@ -328,6 +328,13 @@ class WebReaderViewModel @Inject constructor(
     cancelAnnotationEdit()
   }
 
+  fun cancelAnnotation() {
+    val script = "var event = new Event('dismissHighlight');document.dispatchEvent(event);"
+
+    enqueueScript(script)
+    cancelAnnotationEdit()
+  }
+
   fun cancelAnnotationEdit() {
     annotation = null
     resetBottomSheet()