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

Merge branch 'master' into feat/capacitor-new

Browse Source
This commit is contained in:
Tienson Qin
2025-06-03 00:36:17 +08:00
parent 48d541acd0 17f5e9127c
commit a4bfa4477e
9 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/frontend/components/property.cljs
View File

@@ -558,7 +558,7 @@
(assoc state
::id (str (random-uuid))
::block block)))}
[state _target-block {:keys [sidebar-properties? page-title?] :as opts}]
[state _target-block {:keys [sidebar-properties?] :as opts}]
(let [id (::id state)
db-id (:db/id (::block state))
block (db/sub-block db-id)
@@ -577,10 +577,9 @@
(or
;; built-in
(and (not (ldb/public-built-in-property? ent))
;; TODO: Use ldb/built-in? when intermittent lazy loading issue fixed
(get db-property/built-in-properties (:db/ident ent)))
(ldb/built-in? ent))
;; other position
(when-not (or sidebar-properties? page-title?
(when-not (or sidebar-properties?
(and (:sidebar? opts) (= (:id opts) (str (:block/uuid block))))
show-empty-and-hidden-properties?)
(outliner-property/property-with-other-position? ent))
@@ -604,8 +603,8 @@
state-hide-empty-properties?
(nil? (get block property-id))
:else
;; For sidebar and page properties, ignore these checks
(when-not (or sidebar-properties? page-title?)
;; sidebar properties ignore these checks
(when-not sidebar-properties?
(cond
root-block?
false

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

@@ -3901,6 +3901,7 @@
(or
(util/collapsed? block)
(and (or (:list-view? config) (:ref? config))
(or (:block/_parent block) (:block.temp/has-children? block))
(integer? (:block-level config))
(>= (:block-level config) (state/get-ref-open-blocks-level)))
(and (or (:view? config) (:popup? config))