clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-26 23:25:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into whiteboards

Browse Source
This commit is contained in:
Peng Xiao
2022-08-23 11:33:30 +08:00
parent ebfcba284e 803ff779df
commit 62e962a4b4
23 changed files with 439 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/frontend/handler/editor.cljs
View File

@@ -260,40 +260,6 @@
(and (not= current-id id)
(db/entity [:block/uuid id]))))
(defn- attach-page-properties-if-exists!
[block]
(if (and (:block/pre-block? block)
(seq (:block/properties block)))
(let [page-properties (:block/properties block)
str->page (fn [n] (block/page-name->map n true))
refs (->> page-properties
(filter (fn [[_ v]] (coll? v)))
(vals)
(apply concat)
(set)
(map str->page)
(concat (:block/refs block))
(util/distinct-by :block/name))
{:keys [tags alias]} page-properties
page-tx (let [id (:db/id (:block/page block))
retract-attributes (when id
(mapv (fn [attribute]
[:db/retract id attribute])
[:block/properties :block/tags :block/alias]))
tags (->> (map str->page tags) (remove nil?))
alias (->> (map str->page alias) (remove nil?))
tx (cond-> {:db/id id
:block/properties page-properties}
(seq tags)
(assoc :block/tags tags)
(seq alias)
(assoc :block/alias alias))]
(conj retract-attributes tx))]
(assoc block
:block/refs refs
:db/other-tx page-tx))
block))
(defn- remove-non-existed-refs!
[refs]
(remove (fn [x] (or
@@ -386,7 +352,6 @@
block
(dissoc block :block/pre-block?))
block (update block :block/refs remove-non-existed-refs!)
block (attach-page-properties-if-exists! block)
new-properties (merge
(select-keys properties (property/hidden-properties))
(:block/properties block))]
@@ -2712,7 +2677,7 @@
(surround-by? input "#" :end)
(= key "#"))]
(cond
(and (contains? #{"ArrowLeft" "ArrowRight" "ArrowUp" "ArrowDown"} key)
(and (contains? #{"ArrowLeft" "ArrowRight"} key)
(contains? #{:property-search :property-value-search} (state/get-editor-action)))
(state/clear-editor-action!)