greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor: set-editor-show-* should end with '!'

pull/648/head
Yukun Guo 2020-11-13 16:17:21 +08:00
parent 75392d254f
commit 6193f85499
6 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/frontend/commands.cljs
View File

@ -395,22 +395,22 @@
(state/set-edit-content! input-id new-value)))))
(defmethod handle-step :editor/search-page [[_]]
(state/set-editor-show-page-search true))
(state/set-editor-show-page-search! true))
(defmethod handle-step :editor/search-page-hashtag [[_]]
(state/set-editor-show-page-search-hashtag true))
(state/set-editor-show-page-search-hashtag! true))
(defmethod handle-step :editor/search-block [[_ type]]
(state/set-editor-show-block-search true))
(state/set-editor-show-block-search! true))
(defmethod handle-step :editor/search-template [[_]]
(state/set-editor-show-template-search true))
(state/set-editor-show-template-search! true))
(defmethod handle-step :editor/show-input [[_ option]]
(state/set-editor-show-input option))
(state/set-editor-show-input! option))
(defmethod handle-step :editor/show-date-picker [[_]]
(state/set-editor-show-date-picker true))
(state/set-editor-show-date-picker! true))
(defmethod handle-step :editor/click-hidden-file-input [[_ input-id]]
(when-let [input-file (gdom/getElement "upload-file")]

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

@ -990,12 +990,12 @@
(do
(reset! show? false)
(reset! commands/*current-command nil)
(state/set-editor-show-date-picker false)
(state/set-editor-show-date-picker! false)
(state/set-timestamp-block! nil))
(do
(reset! show? true)
(reset! commands/*current-command typ)
(state/set-editor-show-date-picker true)
(state/set-editor-show-date-picker! true)
(state/set-timestamp-block! {:block block
:typ typ
:show? show?}))))}

4
src/main/frontend/components/datetime.cljs
View File

@ -117,7 +117,7 @@
(when show?
(reset! show? false))))
(clear-timestamp!)
(state/set-editor-show-date-picker false)))]]))
(state/set-editor-show-date-picker! false)))]]))
(rum/defc date-picker < rum/reactive
{:init (fn [state]
@ -156,7 +156,7 @@
(util/format "[[%s]]" journal)
format
nil)
(state/set-editor-show-date-picker false))
(state/set-editor-show-date-picker! false))
(swap! *timestamp assoc :date date)))})
(when deadline-or-schedule?
(time-repeater))])))

24
src/main/frontend/components/editor.cljs
View File

@ -85,7 +85,7 @@
(editor-handler/get-matched-pages q))
chosen-handler (if (state/sub :editor/show-page-search-hashtag?)
(fn [chosen _click?]
(state/set-editor-show-page-search false)
(state/set-editor-show-page-search! false)
(editor-handler/insert-command! id
(util/format "#%s" (if (string/includes? chosen " ")
(str "[[" chosen "]]")
@ -93,14 +93,14 @@
format
{:last-pattern (str "#" (if @editor-handler/*selected-text "" q))}))
(fn [chosen _click?]
(state/set-editor-show-page-search false)
(state/set-editor-show-page-search! false)
(editor-handler/insert-command! id
(util/format "[[%s]]" chosen)
format
{:last-pattern (str "[[" (if @editor-handler/*selected-text "" q))
:postfix-fn (fn [s] (util/replace-first "]]" s ""))})))
non-exist-page-handler (fn [_state]
(state/set-editor-show-page-search false)
(state/set-editor-show-page-search! false)
(util/cursor-move-forward input 2))]
(ui/auto-complete
matched-pages
@ -125,7 +125,7 @@
matched-blocks (when-not (string/blank? q)
(editor-handler/get-matched-blocks q))
chosen-handler (fn [chosen _click?]
(state/set-editor-show-block-search false)
(state/set-editor-show-block-search! false)
(let [uuid-string (str (:block/uuid chosen))]
;; block reference
@ -143,7 +143,7 @@
(when-let [input (gdom/getElement id)]
(.focus input))))
non-exist-block-handler (fn [_state]
(state/set-editor-show-block-search false)
(state/set-editor-show-block-search! false)
(util/cursor-move-forward input 2))]
(ui/auto-complete
matched-blocks
@ -189,7 +189,7 @@
content (if (string/includes? (string/trim edit-content) "\n")
content
(text/remove-level-spaces content format))]
(state/set-editor-show-template-search false)
(state/set-editor-show-template-search! false)
(editor-handler/insert-command! id
content
format
@ -197,7 +197,7 @@
(when-let [input (gdom/getElement id)]
(.focus input)))
non-exist-handler (fn [_state]
(state/set-editor-show-template-search false))]
(state/set-editor-show-template-search! false))]
(ui/auto-complete
matched-templates
{:on-chosen chosen-handler
@ -445,17 +445,17 @@
(commands/delete-pair! id)
(cond
(and (= deleted "[") (state/get-editor-show-page-search))
(state/set-editor-show-page-search false)
(state/set-editor-show-page-search! false)
(and (= deleted "(") (state/get-editor-show-block-search))
(state/set-editor-show-block-search false)
(state/set-editor-show-block-search! false)
:else
nil))
;; deleting hashtag
(and (= deleted "#") (state/get-editor-show-page-search-hashtag))
(state/set-editor-show-page-search-hashtag false)
(state/set-editor-show-page-search-hashtag! false)
:else
nil)))
@ -485,7 +485,7 @@
(= "#" (util/nth-safe value (dec pos)))))
(and (= key " ")
(state/get-editor-show-page-search-hashtag)))
(state/set-editor-show-page-search-hashtag false)
(state/set-editor-show-page-search-hashtag! false)
(and
(not= key-code 8) ;; backspace
@ -501,7 +501,7 @@
(and
(= key " ")
(state/get-editor-show-page-search-hashtag))
(state/set-editor-show-page-search-hashtag false)
(state/set-editor-show-page-search-hashtag! false)
(and
(contains? (set/difference (set (keys editor-handler/reversed-autopair-map))

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

@ -712,11 +712,11 @@
(defn clear-when-saved!
[]
(state/set-editor-show-input nil)
(state/set-editor-show-date-picker false)
(state/set-editor-show-page-search false)
(state/set-editor-show-block-search false)
(state/set-editor-show-template-search false)
(state/set-editor-show-input! nil)
(state/set-editor-show-date-picker! false)
(state/set-editor-show-page-search! false)
(state/set-editor-show-block-search! false)
(state/set-editor-show-template-search! false)
(commands/restore-state true))
(defn get-state
@ -1879,7 +1879,7 @@
(.click input))))))
nil)
(state/set-editor-show-input nil)
(state/set-editor-show-input! nil)
(when-let [saved-cursor (get @state/state :editor/last-saved-cursor)]
(when-let [input (gdom/getElement id)]
@ -1934,6 +1934,6 @@
(when (or (< current-pos pos)
(string/includes? q "]")
(string/includes? q ")"))
(state/set-editor-show-block-search false)
(state/set-editor-show-page-search false)
(state/set-editor-show-page-search-hashtag false))))))
(state/set-editor-show-block-search! false)
(state/set-editor-show-page-search! false)
(state/set-editor-show-page-search-hashtag! false))))))

12
src/main/frontend/state.cljs
View File

@ -356,11 +356,11 @@
[value]
(set-state! :search/q value))
(defn set-editor-show-page-search
(defn set-editor-show-page-search!
[value]
(set-state! :editor/show-page-search? value)
(set-state! :editor/show-page-search-hashtag? false))
(defn set-editor-show-page-search-hashtag
(defn set-editor-show-page-search-hashtag!
[value]
(set-state! :editor/show-page-search? value)
(set-state! :editor/show-page-search-hashtag? value))
@ -371,25 +371,25 @@
(defn get-editor-show-page-search-hashtag
[]
(get @state :editor/show-page-search-hashtag?))
(defn set-editor-show-block-search
(defn set-editor-show-block-search!
[value]
(set-state! :editor/show-block-search? value))
(defn get-editor-show-block-search
[]
(get @state :editor/show-block-search?))
(defn set-editor-show-template-search
(defn set-editor-show-template-search!
[value]
(set-state! :editor/show-template-search? value))
(defn get-editor-show-template-search
[]
(get @state :editor/show-template-search?))
(defn set-editor-show-date-picker
(defn set-editor-show-date-picker!
[value]
(set-state! :editor/show-date-picker? value))
(defn get-editor-show-date-picker
[]
(get @state :editor/show-date-picker?))
(defn set-editor-show-input
(defn set-editor-show-input!
[value]
(set-state! :editor/show-input value))
(defn get-editor-show-input