clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-06-01 19:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: UI crash

Browse Source
This commit is contained in:
Tienson Qin
2023-08-09 18:50:42 +08:00
parent 7aa420914e
commit 9f497c223b
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3417,7 +3417,9 @@
(:db/id parent)))))
{:debug-id page})])))))]
(and (:ref? config) (:group-by-page? config))
(and (:ref? config)
(:group-by-page? config)
(vector? (first blocks)))
[:div.flex.flex-col
(let [blocks (sort-by (comp :block/journal-day first) > blocks)]
(for [[page page-blocks] blocks]

31
src/main/frontend/handler/file_based/property/util.cljs
View File

@@ -363,21 +363,22 @@
;; The future plan is to separate those properties from the block' content.
(defn remove-built-in-properties
[format content]
(let [trim-content (string/trim content)]
(if (or
(and (= format :markdown)
(string/starts-with? trim-content "```")
(string/ends-with? trim-content "```"))
(and (= format :org)
(string/starts-with? trim-content "#+BEGIN_SRC")
(string/ends-with? trim-content "#+END_SRC")))
content
(let [built-in-properties* (built-in-properties)
content (reduce (fn [content key]
(remove-property format key content)) content built-in-properties*)]
(if (= format :org)
(string/replace-first content (re-pattern ":PROPERTIES:\n:END:\n*") "")
content)))))
(when content
(let [trim-content (string/trim content)]
(if (or
(and (= format :markdown)
(string/starts-with? trim-content "```")
(string/ends-with? trim-content "```"))
(and (= format :org)
(string/starts-with? trim-content "#+BEGIN_SRC")
(string/ends-with? trim-content "#+END_SRC")))
content
(let [built-in-properties* (built-in-properties)
content (reduce (fn [content key]
(remove-property format key content)) content built-in-properties*)]
(if (= format :org)
(string/replace-first content (re-pattern ":PROPERTIES:\n:END:\n*") "")
content))))))
(defn add-page-properties
[page-format properties-content properties]