greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: Desktop App fails to render images that are on newline 

close #2317
pull/2335/head
Tienson Qin 2021-06-29 20:58:47 +08:00
parent eee9ed5113
commit 3cfdbd6655
2 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/frontend/components/block.cljs
View File

@ -644,23 +644,21 @@
(defn- show-link?
[config metadata s full-text]
(let [img-formats (set (map name (config/img-formats)))
metadata-show (:show (safe-read-string metadata))]
metadata-show (:show (safe-read-string metadata))
format (get-in config [:block :block/format])]
(or
;; markdown
(and
(= :markdown (get-in config [:block :block/format]))
(string/starts-with? (string/triml full-text) "!"))
;; org
(and
(= :org (get-in config [:block :block/format]))
(= :org format)
(or
(and
(nil? metadata-show)
(or
(config/local-asset? s)
(text/image-link? img-formats s)))
(true? (boolean metadata-show)))))))
(true? (boolean metadata-show))))
;; markdown
(string/starts-with? (string/triml full-text) "!"))))
(defn inline
[{:keys [html-export?] :as config} item]
@ -1788,6 +1786,7 @@
(:block/content (second (:rum/args new-state)))))}
[state config {:block/keys [uuid title body meta content page format repo children pre-block? top? properties refs path-refs heading-level level type] :as block}]
(let [blocks-container-id (:blocks-container-id config)
config (update config :block merge block)
heading? (and (= type :heading) heading-level (<= heading-level 6))
*control-show? (get state ::control-show?)
*ref-collapsed? (get state ::ref-collapsed?)

34
src/main/frontend/db/react.cljs
View File

@ -293,28 +293,26 @@
(when-let [cache (get @query-state related-key)]
(let [{:keys [query inputs transform-fn query-fn inputs-fn]} cache]
(when (or query query-fn)
(let [new-result (profile
"takes"
(->
(cond
query-fn
(profile
"Query:"
(doall (query-fn db)))
(let [new-result (->
(cond
query-fn
(profile
"Query:"
(doall (query-fn db)))
inputs-fn
(let [inputs (inputs-fn)]
(apply d/q query db inputs))
inputs-fn
(let [inputs (inputs-fn)]
(apply d/q query db inputs))
(keyword? query)
(db-utils/get-key-value repo-url query)
(keyword? query)
(db-utils/get-key-value repo-url query)
(seq inputs)
(apply d/q query db inputs)
(seq inputs)
(apply d/q query db inputs)
:else
(d/q query db))
transform-fn))]
:else
(d/q query db))
transform-fn)]
(set-new-result! related-key new-result)))))))))
(defn transact-react!