Fixed disabling active annotation tool

zotero · Dec 13, 2024 · a86ae5b · a86ae5b
1 parent bdef9d7
commit a86ae5b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/Zotero/Scenes/Detail/HTML:EPUB/Views/HtmlEpubDocumentViewController.swift b/Zotero/Scenes/Detail/HTML:EPUB/Views/HtmlEpubDocumentViewController.swift
@@ -274,6 +274,7 @@ class HtmlEpubDocumentViewController: UIViewController {
 
 extension HtmlEpubDocumentViewController: ParentWithSidebarDocumentController {
     func disableAnnotationTools() {
-        set(tool: nil)
+        guard let tool = viewModel.state.activeTool else { return }
+        viewModel.process(action: .toggleTool(tool))
     }
 }
diff --git a/Zotero/Scenes/Detail/ParentWithSidebarController.swift b/Zotero/Scenes/Detail/ParentWithSidebarController.swift
@@ -59,8 +59,7 @@ extension ParentWithSidebarController {
         checkbox.rx.controlEvent(.touchUpInside)
             .subscribe(onNext: { [weak self, weak checkbox] _ in
                 guard let self, let checkbox else { return }
-                checkbox.isSelected = !checkbox.isSelected
-                annotationToolbarHandler?.set(hidden: !checkbox.isSelected, animated: true)
+                setAnnotationToolbar(hidden: checkbox.isSelected)
             })
             .disposed(by: disposeBag)
         let barButton = UIBarButtonItem(customView: checkbox)
@@ -71,10 +70,16 @@ extension ParentWithSidebarController {
         return barButton
     }
 
+    private func setAnnotationToolbar(hidden: Bool) {
+        (toolbarButton.customView as? CheckboxButton)?.isSelected = !hidden
+        annotationToolbarHandler?.set(hidden: hidden, animated: true)
+        if hidden {
+            documentController?.disableAnnotationTools()
+        }
+    }
+
     func closeAnnotationToolbar() {
-        (toolbarButton.customView as? CheckboxButton)?.isSelected = false
-        annotationToolbarHandler?.set(hidden: true, animated: true)
-        documentController?.disableAnnotationTools()
+        setAnnotationToolbar(hidden: true)
     }
 
     func toggleSidebar(animated: Bool, sidebarButtonTag: Int) {