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

fix(editor): move hashtag page search from keyup to :did-update

Browse Source
This commit is contained in:
Andelf
2022-11-21 18:14:19 +08:00
committed by Tienson Qin
parent 27fbd338de
commit 664e98ce28
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1771,7 +1771,7 @@
(handle-command-input-close id))
(defn close-autocomplete-if-outside
(defn- close-autocomplete-if-outside
[input]
(when (and input
(contains? #{:page-search :page-search-hashtag :block-search} (state/get-editor-action))
@@ -1825,7 +1825,9 @@
;; TODO: is it cross-browser compatible?
;; (not= (gobj/get native-e "inputType") "insertFromPaste")
(cond
(= last-input-char (state/get-editor-command-trigger))
;; By default, "/" is also used as namespace separator in Logseq.
(and (= last-input-char (state/get-editor-command-trigger))
(not (contains? #{:page-search-hashtag} (state/sub :editor/action))))
(do
(state/set-editor-action-data! {:pos (cursor/get-caret-pos input)})
(commands/reinit-matched-commands!)
@@ -1856,6 +1858,13 @@
(and (= last-input-char commands/colon) (= :property-search (state/get-editor-action)))
(state/clear-editor-action!)
;; Open "Search page or New page" auto-complete
(= last-input-char commands/hashtag)
(do
(state/set-editor-action-data! {:pos (cursor/get-caret-pos input)})
(state/set-editor-last-pos! pos)
(state/set-editor-action! :page-search-hashtag))
:else
nil)))
@@ -2671,6 +2680,7 @@
nil))
(defn ^:large-vars/cleanup-todo keydown-not-matched-handler
"NOTE: Keydown cannot be used on Android platform"
[format]
(fn [e _key-code]
(let [input-id (state/get-edit-input-id)
@@ -2751,14 +2761,6 @@
(cursor/move-cursor-forward input)
(autopair input-id key format nil)))
(and hashtag? (or (zero? pos) (re-matches #"\s" (get value (dec pos)))))
(do
(commands/handle-step [:editor/search-page-hashtag])
(if (= key "#")
(state/set-editor-last-pos! (inc (cursor/pos input))) ;; In keydown handler, the `#` is not inserted yet.
(state/set-editor-last-pos! (cursor/pos input)))
(state/set-editor-action-data! {:pos (cursor/get-caret-pos input)}))
(let [sym "$"]
(and (= key sym)
(>= (count value) 1)