From 8bb6e7be6bce87b952f154868b3199e014bc3176 Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Mon, 22 Jul 2024 17:10:56 +0800 Subject: [PATCH] enhance: (()) to embed && [[]] to reference --- src/main/frontend/commands.cljs | 11 +++++++---- src/main/frontend/components/block.cljs | 1 - src/main/frontend/handler/editor.cljs | 7 +++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/frontend/commands.cljs b/src/main/frontend/commands.cljs index c1d63aac0d..91f90e4178 100644 --- a/src/main/frontend/commands.cljs +++ b/src/main/frontend/commands.cljs @@ -280,13 +280,14 @@ (->> (concat ;; basic - [["Page reference" + [[(if db? "Block reference" "Page reference") [[:editor/input page-ref/left-and-right-brackets {:backward-pos 2}] [:editor/search-page]] - "Create a backlink to a page" + (if db? "Create a backlink to a page" + "Create a backlink to a BLOCK") :icon/pageRef "BASIC"] - ["Page embed" (embed-page) "Embed a page here" :icon/pageEmbed] + (when-not db? ["Page embed" (embed-page) "Embed a page here" :icon/pageEmbed]) (when-not db? ["Block reference" [[:editor/input block-ref/left-and-right-parens {:backward-pos 2}] [:editor/search-block :reference]] @@ -785,7 +786,9 @@ (defmethod handle-step :editor/search-page-hashtag [[_]] (state/set-editor-action! :page-search-hashtag)) -(defmethod handle-step :editor/search-block [[_ _type]] +(defmethod handle-step :editor/search-block [[_ type]] + (when (and (= type :embed) (config/db-based-graph? (state/get-current-repo))) + (reset! *current-command "Block embed")) (state/set-editor-action! :block-search)) (defmethod handle-step :editor/search-template [[_]] diff --git a/src/main/frontend/components/block.cljs b/src/main/frontend/components/block.cljs index b4eae666e9..7108543161 100644 --- a/src/main/frontend/components/block.cljs +++ b/src/main/frontend/components/block.cljs @@ -2475,7 +2475,6 @@ (cond (:block/name block) [:div.flex.flex-row.items-center.gap-1 - (when-not (:table? config) (icon/get-page-icon block {})) (page-cp config block)] :else diff --git a/src/main/frontend/handler/editor.cljs b/src/main/frontend/handler/editor.cljs index 85eafd7ee4..ebb5376599 100644 --- a/src/main/frontend/handler/editor.cljs +++ b/src/main/frontend/handler/editor.cljs @@ -1609,10 +1609,9 @@ (state/set-editor-action-data! {:pos (cursor/get-caret-pos input) :selected selected})) - (and (= prefix block-ref/left-parens) - (not (config/db-based-graph? (state/get-current-repo)))) - (do - (commands/handle-step [:editor/search-block :reference]) + (= prefix block-ref/left-parens) + (let [db-based? (config/db-based-graph? (state/get-current-repo))] + (commands/handle-step [:editor/search-block (if db-based? :embed :reference)]) (state/set-editor-action-data! {:pos (cursor/get-caret-pos input) :selected selected})))))))