Updated reader, fixed popover hiding

michalrentka · Nov 27, 2024 · aab23bc · aab23bc
1 parent a72bc4b
commit aab23bc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/Zotero/Scenes/Detail/HTML:EPUB/Models/HtmlEpubReaderAction.swift b/Zotero/Scenes/Detail/HTML:EPUB/Models/HtmlEpubReaderAction.swift
@@ -14,7 +14,6 @@ enum HtmlEpubReaderAction {
     case deinitialiseReader
     case deselectAnnotationDuringEditing(String)
     case deselectSelectedAnnotation
-    case hideAnnotationPopover
     case initialiseReader
     case loadDocument
     case parseAndCacheComment(key: String, comment: String)

diff --git a/Zotero/Scenes/Detail/HTML:EPUB/ViewModels/HtmlEpubReaderActionHandler.swift b/Zotero/Scenes/Detail/HTML:EPUB/ViewModels/HtmlEpubReaderActionHandler.swift
@@ -85,13 +85,6 @@ final class HtmlEpubReaderActionHandler: ViewModelActionHandler, BackgroundDbPro
                 state.changes.insert(.popover)
             }
 
-        case .hideAnnotationPopover:
-            update(viewModel: viewModel) { state in
-                state.annotationPopoverKey = nil
-                state.annotationPopoverRect = nil
-                state.changes.insert(.popover)
-            }
-
         case .setComment(let key, let comment):
             set(comment: comment, key: key, viewModel: viewModel)
 
@@ -928,6 +921,9 @@ final class HtmlEpubReaderActionHandler: ViewModelActionHandler, BackgroundDbPro
             // Update selection
             if selectionDeleted {
                 _select(key: nil, didSelectInDocument: true, state: &state)
+                state.annotationPopoverKey = nil
+                state.annotationPopoverRect = nil
+                state.changes.insert(.popover)
             }
 
             // Disable sidebar editing if there are no results

diff --git a/Zotero/Scenes/Detail/HTML:EPUB/Views/HtmlEpubDocumentViewController.swift b/Zotero/Scenes/Detail/HTML:EPUB/Views/HtmlEpubDocumentViewController.swift
@@ -225,7 +225,6 @@ class HtmlEpubDocumentViewController: UIViewController {
                 }
 
                 if params.isEmpty {
-                    viewModel.process(action: .hideAnnotationPopover)
                     return
                 }
 

diff --git a/reader b/reader