From f2cf388abeb661994351838fb67187484be7bc15 Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Mon, 29 Mar 2021 23:38:03 +0800 Subject: [PATCH] fix: macro render --- src/main/frontend/components/block.cljs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/frontend/components/block.cljs b/src/main/frontend/components/block.cljs index 23d45440b..c614770ec 100644 --- a/src/main/frontend/components/block.cljs +++ b/src/main/frontend/components/block.cljs @@ -953,11 +953,11 @@ macro-content (when macro-content (template/resolve-dynamic-template! macro-content))] (render-macro config name arguments macro-content format)) - (when-let [macro-txt (macro->text name arguments)] - (let [macro-txt (when macro-txt - (template/resolve-dynamic-template! macro-txt)) - format (get-in config [:block :block/format] :markdown)] - (render-macro config name arguments macro-txt format)))))) + (let [macro-content (or + (get (state/get-macros) name) + (get (state/get-macros) (keyword name))) + format (get-in config [:block :block/format] :markdown)] + (render-macro config name arguments macro-content format))))) :else ""))