Allow rendering of document annotations (#1042)

zotero · Dec 12, 2024 · 6f8e87d · 6f8e87d
1 parent 6d803cd
commit 6f8e87d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/Zotero/Controllers/AnnotationPreviewController.swift b/Zotero/Controllers/AnnotationPreviewController.swift
@@ -54,7 +54,7 @@ final class AnnotationPreviewController: NSObject {
         }
 
         init?(annotation: PSPDFKit.Annotation, parentKey: String, libraryId: LibraryIdentifier, imageSize: CGSize, imageScale: CGFloat, isDark: Bool, type: PreviewType) {
-            guard annotation.shouldRenderPreview && annotation.isZoteroAnnotation, let document = annotation.document else { return nil }
+            guard annotation.shouldRenderPreview, let document = annotation.document else { return nil }
             key = annotation.previewId
             self.parentKey = parentKey
             self.libraryId = libraryId

diff --git a/Zotero/Scenes/Detail/PDF/ViewModels/PDFReaderActionHandler.swift b/Zotero/Scenes/Detail/PDF/ViewModels/PDFReaderActionHandler.swift
@@ -301,12 +301,10 @@ final class PDFReaderActionHandler: ViewModelActionHandler, BackgroundDbProcessi
     private func storeAnnotationPreviewsIfNeeded(isDark: Bool, in viewModel: ViewModel<PDFReaderActionHandler>) {
         let libraryId = viewModel.state.library.identifier
 
-        // Load area annotations if needed.
+        // Load annotation previews if needed.
         for (_, annotations) in viewModel.state.document.allAnnotations(of: [.square, .ink, .freeText]) {
             for annotation in annotations {
-                guard annotation.shouldRenderPreview && annotation.isZoteroAnnotation &&
-                      !annotationPreviewController.hasPreview(for: annotation.previewId, parentKey: viewModel.state.key, libraryId: libraryId, isDark: isDark)
-                else { continue }
+                guard !annotationPreviewController.hasPreview(for: annotation.previewId, parentKey: viewModel.state.key, libraryId: libraryId, isDark: isDark) else { continue }
                 annotationPreviewController.store(for: annotation, parentKey: viewModel.state.key, libraryId: libraryId, isDark: isDark)
             }
         }