clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-03 18:36:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: support both markdown headings and bullets

Browse Source
This commit is contained in:
Tienson Qin
2021-04-28 20:13:54 +08:00
parent 1869052361
commit b34be68137
7 changed files with 42 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/frontend/handler/editor.cljs
View File

@@ -15,8 +15,6 @@
[frontend.format :as format]
[frontend.format.block :as block]
[frontend.image :as image]
[cljs-time.core :as t]
[cljs-time.coerce :as tc]
[frontend.db :as db]
[goog.object :as gobj]
[goog.dom :as gdom]
@@ -126,12 +124,6 @@
(state/set-edit-content! edit-id new-value)
(util/move-cursor-to input (+ cur-pos forward-pos)))))
(defn focus-on-block!
[block-id]
(when block-id
(route-handler/redirect! {:to :page
:path-params {:name (str block-id)}})))
(defn open-block-in-sidebar!
[block-id]
(when block-id
@@ -288,9 +280,11 @@
(let [ast (mldoc/->edn (string/trim content) (mldoc/default-config format))
first-elem-type (first (ffirst ast))
properties? (= "Properties" first-elem-type)
markdown-heading? (and (= format :markdown)
(= "Heading" first-elem-type))
heading? (= "Paragraph" first-elem-type)
content (string/triml content)
content' (if properties?
content' (if (or properties? markdown-heading?)
content
(str (config/get-block-pattern format) (if heading? " " "\n") content))
block (block/parse-block (assoc block :block/content content'))
@@ -1655,9 +1649,10 @@
(defn close-autocomplete-if-outside
[input]
(when (or (state/get-editor-show-page-search?)
(state/get-editor-show-page-search-hashtag?)
(state/get-editor-show-block-search?))
(when (and input
(or (state/get-editor-show-page-search?)
(state/get-editor-show-page-search-hashtag?)
(state/get-editor-show-block-search?)))
(when-let [q (get-search-q)]
(let [value (gobj/get input "value")
pos (:editor/last-saved-cursor @state/state)
@@ -2188,11 +2183,6 @@
(state/set-last-pos! (:pos (util/get-caret-pos input)))
(reset! commands/*slash-caret-pos (util/get-caret-pos input)))
(and
(= key " ")
(state/get-editor-show-page-search-hashtag?))
(state/set-editor-show-page-search-hashtag! false)
(and
(contains? (set/difference (set (keys reversed-autopair-map))
#{"`"})
@@ -2248,6 +2238,9 @@
(let [k (gobj/get e "key")
format (:format (get-state))]
(when-not (state/get-editor-show-input)
(when (= k " ")
(state/set-editor-show-page-search-hashtag! false))
(when (and @*show-commands (not= key-code 191)) ; not /
(let [matched-commands (get-matched-commands input)]
(if (seq matched-commands)