clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-28 16:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(whiteboard): fallback codemirror to hljs in whiteboard

Browse Source
This commit is contained in:
Peng Xiao
2022-10-10 16:10:40 +08:00
committed by Tienson Qin
parent 46d873b61d
commit a06cb23c7f
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -540,7 +540,7 @@
(:db/id page-entity)
:page))
(whiteboard-handler/inside-portal (.-target e))
(whiteboard-handler/inside-portal? (.-target e))
(whiteboard-handler/add-new-block-portal-shape!
page-name
(whiteboard-handler/closest-shape (.-target e)))
@@ -894,7 +894,7 @@
(:db/id block)
:block-ref)
(whiteboard-handler/inside-portal (.-target e))
(whiteboard-handler/inside-portal? (.-target e))
(whiteboard-handler/add-new-block-portal-shape!
(:block/uuid block)
(whiteboard-handler/closest-shape (.-target e)))
@@ -1661,7 +1661,7 @@
:block)
(util/stop e))
(whiteboard-handler/inside-portal (.-target e))
(whiteboard-handler/inside-portal? (.-target e))
(do (whiteboard-handler/add-new-block-portal-shape!
uuid
(whiteboard-handler/closest-shape (.-target e)))
@@ -3219,23 +3219,32 @@
(let [{:keys [lines language]} options
attr (when language
{:data-lang language})
code (apply str lines)]
code (apply str lines)
[inside-portal? set-inside-portal?] (rum/use-state nil)]
(cond
html-export?
(highlight/html-export attr code)
:else
(let [language (if (contains? #{"edn" "clj" "cljc" "cljs"} language) "clojure" language)]
(if (:slide? config)
(highlight/highlight (str (random-uuid))
{:class (str "language-" language)
:data-lang language}
code)
[:div
(lazy-editor/editor config (str (d/squuid)) attr code options)
(let [options (:options options)]
(when (and (= language "clojure") (contains? (set options) ":results"))
(sci/eval-result code)))]))))))
[:div {:ref (fn [el]
(println "(whiteboard-handler/inside-portal el)" (whiteboard-handler/inside-portal? el))
(set-inside-portal? (and el (whiteboard-handler/inside-portal? el))))}
(cond
(nil? inside-portal?) nil
(or (:slide? config) inside-portal?)
(highlight/highlight (str (random-uuid))
{:class (str "language-" language)
:data-lang language}
code)
:else
[:<>
(lazy-editor/editor config (str (d/squuid)) attr code options)
(let [options (:options options)]
(when (and (= language "clojure") (contains? (set options) ":results"))
(sci/eval-result code)))])])))))
(defn ^:large-vars/cleanup-todo markup-element-cp
[{:keys [html-export?] :as config} item]