greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: several issues on clicking the whiteboard shape ref

pull/7102/head
Peng Xiao 2022-10-24 23:00:11 +08:00 committed by Tienson Qin
parent 93dd107b8f
commit 65ecde222e
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,13 +37,13 @@
[frontend.format.block :as block]
[frontend.format.mldoc :as mldoc]
[frontend.fs :as fs]
[frontend.handler.assets :as assets-handler]
[frontend.handler.block :as block-handler]
[frontend.handler.common :as common-handler]
[frontend.handler.dnd :as dnd]
[frontend.handler.editor :as editor-handler]
[frontend.handler.file-sync :as file-sync]
[frontend.handler.plugin :as plugin-handler]
[frontend.handler.assets :as assets-handler]
[frontend.handler.query :as query-handler]
[frontend.handler.repeated :as repeated]
[frontend.handler.route :as route-handler]
@ -72,6 +72,7 @@
[logseq.graph-parser.util :as gp-util]
[logseq.graph-parser.util.block-ref :as block-ref]
[logseq.graph-parser.util.page-ref :as page-ref]
[logseq.graph-parser.whiteboard :as gp-whiteboard]
[medley.core :as medley]
[promesa.core :as p]
[reitit.frontend.easy :as rfe]
@ -1654,6 +1655,9 @@
(defn- bullet-on-click
[e block uuid]
(cond
(gp-whiteboard/shape-block? block)
(route-handler/redirect-to-whiteboard! (get-in block [:block/page :block/name]) {:block-id uuid})
(gobj/get e "shiftKey")
(do
(state/sidebar-add-block!
@ -2701,6 +2705,7 @@
doc-mode? (:document/mode? config)
embed? (:embed? config)
reference? (:reference? config)
whiteboard-block? (gp-whiteboard/shape-block? block)
block-id (str "ls-block-" blocks-container-id "-" uuid)
has-child? (first (:block/_parent (db/entity (:db/id block))))
attrs (on-drag-and-mouse-attrs block uuid top? block-id *move-to)
@ -2767,7 +2772,9 @@
(when @*show-left-menu?
(block-left-menu config block))
(block-content-or-editor config block edit-input-id block-id edit? false)
(if whiteboard-block?
(block-reference {} (str uuid) nil)
(block-content-or-editor config block edit-input-id block-id edit? false))
(when @*show-right-menu?
(block-right-menu config block edit?))]