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

Merge branch 'master' into disable-webview-resize

Browse Source
This commit is contained in:
llcc
2022-05-12 09:53:30 +08:00
committed by GitHub
parent f8b659d0f9 2d2a05228a
commit 407325ecc2
21 changed files with 409 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -454,11 +454,12 @@
(declare save-current-block!)
(defn outliner-insert-block!
[config current-block new-block {:keys [sibling? keep-uuid? replace-empty-target?]}]
(let [ref-top-block? (and (:ref? config)
(not (:ref-child? config)))
(let [ref-query-top-block? (and (or (:ref? config)
(:custom-query? config))
(not (:ref-query-child? config)))
has-children? (db/has-children? (:block/uuid current-block))
sibling? (cond
ref-top-block?
ref-query-top-block?
false
(boolean? sibling?)
@@ -2872,11 +2873,13 @@
[text e]
(let [copied-blocks (state/get-copied-blocks)
copied-block-ids (:copy/block-ids copied-blocks)
copied-graph (:copy/graph copied-blocks)
input (state/get-input)
*stop-event? (atom true)]
(cond
;; Internal blocks by either copy or cut blocks
(and
(= copied-graph (state/get-current-repo))
(or (seq copied-block-ids)
(seq (:copy/full-blocks copied-blocks)))
text
@@ -3462,12 +3465,11 @@
1. References.
2. Custom queries."
[block config]
(if (or (:ref? config)
(:custom-query? config))
(and
(seq (:block/children block))
(or
(:custom-query? config)
(>= (:ref/level block)
(state/get-ref-open-blocks-level))))
(util/collapsed? block)))
(or
(and
(or (:ref? config) (:custom-query? config))
(>= (inc (:block/level block))
(state/get-ref-open-blocks-level))
;; has children
(first (:block/_parent (db/entity (:db/id block)))))
(util/collapsed? block)))