clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-03 02:16:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(pdf): incorrect highlight value

Browse Source
This commit is contained in:
charlie
2024-08-15 18:27:06 +08:00
parent b755369a0b
commit 837a32f03d
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/frontend/extensions/pdf/assets.cljs
View File

@@ -113,12 +113,16 @@
(pu/get-pid :logseq.property/hl-type) :area
(pu/get-pid :logseq.property.pdf/hl-stamp) stamp)
%)
db-base? (config/db-based-graph? (state/get-current-repo))
props (cond->
{(pu/get-pid :logseq.property/ls-type) :annotation
(pu/get-pid :logseq.property.pdf/hl-page) page
(pu/get-pid :logseq.property/hl-color) (:color properties)
(pu/get-pid :logseq.property.pdf/hl-value) hl}
(not (config/db-based-graph? (state/get-current-repo)))
(pu/get-pid :logseq.property/hl-color) (:color properties)}
db-base?
(assoc (pu/get-pid :logseq.property.pdf/hl-value) hl)
(not db-base?)
;; force custom uuid
(assoc :id (if (string? id) (uuid id) id)))
properties (wrap-props props)]
@@ -256,6 +260,7 @@
page-name (:block/title page)
file-path (pu/get-block-property-value block :logseq.property.pdf/file-path)
hl-page (pu/get-block-property-value block :logseq.property.pdf/hl-page)
hl-value (pu/get-block-property-value block :logseq.property.pdf/hl-value)
db-base? (config/db-based-graph? (state/get-current-repo))]
(when-let [target-key (and page-name (subs page-name 5))]
(p/let [hls (resolve-hls-data-by-key$ target-key)
@@ -263,7 +268,8 @@
file-path (or file-path (str "../assets/" target-key ".pdf"))
href (and db-base? (assets-handler/make-asset-url file-path))]
(if-let [matched (or (and hls (medley/find-first #(= id (:id %)) hls))
(and hl-page {:page hl-page}))]
(if hl-page {:page hl-page}
(when-let [page (some-> hl-value :page)] {:page page})))]
(do
(state/set-state! :pdf/ref-highlight matched)
;; open pdf viewer