feat: displaying whiteboard text shape in outliner

This commit is contained in:
Peng Xiao
2022-07-22 14:47:57 +08:00
parent 4d42877f3d
commit 45798ba714
6 changed files with 15 additions and 11 deletions

View File

@@ -770,6 +770,9 @@
;; pdf annotation
[:annotation true] (pdf-assets/open-block-ref! block)
[:whiteboard-shape true] (route-handler/redirect-to-whiteboard!
(get-in block [:block/page :block/name]) {:block-id block-id})
;; default open block page
:else (route-handler/redirect-to-page! id))))))}
@@ -2075,6 +2078,9 @@
(seq title)
(build-block-title config block)
(= block-type :whiteboard-shape)
content
:else
nil)]
@@ -2095,7 +2101,8 @@
(let [hidden? (property/properties-hidden? properties)]
(not hidden?))
(not (and block-ref? (or (seq title) (seq body))))
(not (:slide? config)))
(not (:slide? config))
(not= block-type :whiteboard-shape))
(properties-cp config block))
(when (and (not block-ref-with-title?) (seq body))

View File

@@ -33,16 +33,11 @@
:pageId page-title}])))))
(defn- block->shape [block]
(let [properties (:block/properties block)
uuid (str (:block/uuid block))]
(merge properties
;; Use the block's id as the shape's id.
{:id uuid})))
(:block/properties block))
(defn- shape->block [shape page-name]
(let [properties shape
block {:block/uuid (uuid (:id properties))
:block/page {:block/name page-name}
(let [properties (assoc shape :ls-type :whiteboard-shape)
block {:block/page {:block/name page-name}
:block/properties properties}
additional-props (with-whiteboard-block-props shape)]
(merge block additional-props)))

View File

@@ -23,6 +23,7 @@
(def blocks-pull-keys-with-persisted-ids
'[:block/properties
:block/uuid
{:block/page [:block/name :block/uuid]}
{:block/left [:block/name :block/uuid]}
{:block/parent [:block/name :block/uuid]}