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

fix: bottom actions sometimes not working

pull/2906/head
Tienson Qin 2021-09-30 13:31:16 +08:00
parent a0e9c5a393
commit f3e480874c
2 changed files with 76 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,57 +202,81 @@
(rum/defc mobile-bar < rum/reactive
[parent-state parent-id]
[:div#mobile-editor-toolbar.bg-base-2.fix-ios-fixed-bottom
[:button.bottom-action
{:on-click #(editor-handler/indent-outdent true)}
(ui/icon "chevrons-right")]
[:button.bottom-action
{:on-click #(editor-handler/indent-outdent false)}
(ui/icon "chevrons-left")]
[:button.bottom-action
{:on-click (editor-handler/move-up-down true)}
(ui/icon "chevron-up")]
[:button.bottom-action
{:on-click (editor-handler/move-up-down false)}
(ui/icon "chevron-down")]
[:button.bottom-action
{:on-click #(editor-handler/cycle-todo!)}
(ui/icon "checkbox")]
[:button.bottom-action
{:on-click #(do
(commands/simple-insert! parent-id "\n"
{:forward-pos 1})
;; TODO: should we add this focus step to `simple-insert!`?
(when-let [input (gdom/getElement parent-id)]
(.focus input)))}
(ui/icon "arrow-back")]
[:button.bottom-action.text-sm
{:on-click #(do
(commands/simple-insert!
parent-id "[[]]"
{:backward-pos 2
:check-fn (fn [_ _ new-pos]
(reset! commands/*slash-caret-pos new-pos)
(commands/handle-step [:editor/search-page]))})
(when-let [input (gdom/getElement parent-id)]
(.focus input)))}
"[["]
[:button.bottom-action.text-sm
{:on-click #(do
(commands/simple-insert!
parent-id "(())"
{:backward-pos 2
:check-fn (fn [_ _ new-pos]
(reset! commands/*slash-caret-pos new-pos)
(commands/handle-step [:editor/search-block]))})
(when-let [input (gdom/getElement parent-id)]
(.focus input)))}
"(("]
[:button.bottom-action.text-sm
{:on-click #(do
(commands/simple-insert! parent-id "/" {})
(when-let [input (gdom/getElement parent-id)]
(.focus input)))}
"/"]])
[:div.flex.justify-evenly.w-full
[:div
[:button.bottom-action
{:on-mouse-down (fn [e]
(util/stop e)
(editor-handler/indent-outdent true))}
(ui/icon "chevrons-right")]]
[:div
[:button.bottom-action
{:on-mouse-down (fn [e]
(util/stop e)
(editor-handler/indent-outdent false))}
(ui/icon "chevrons-left")]]
[:div
[:button.bottom-action
{:on-mouse-down (fn [e]
(util/stop e)
((editor-handler/move-up-down true)))}
(ui/icon "chevron-up")]]
[:div
[:button.bottom-action
{:on-mouse-down (fn [e]
(util/stop e)
((editor-handler/move-up-down false)))}
(ui/icon "chevron-down")]]
[:div
[:button.bottom-action
{:on-mouse-down (fn [e]
(util/stop e)
(editor-handler/cycle-todo!))}
(ui/icon "checkbox")]]
[:div
[:button.bottom-action
{:on-mouse-down (fn [e]
(util/stop e)
(commands/simple-insert! parent-id "\n"
{:forward-pos 1})
;; TODO: should we add this focus step to `simple-insert!`?
(when-let [input (gdom/getElement parent-id)]
(.focus input)))}
(ui/icon "arrow-back")]]
[:div
[:button.bottom-action.text-sm
{:on-mouse-down (fn [e]
(util/stop e)
(commands/simple-insert!
parent-id "[[]]"
{:backward-pos 2
:check-fn (fn [_ _ new-pos]
(reset! commands/*slash-caret-pos new-pos)
(commands/handle-step [:editor/search-page]))})
(when-let [input (gdom/getElement parent-id)]
(.focus input)))}
"[["]]
[:div
[:button.bottom-action.text-sm
{:on-mouse-down (fn [e]
(util/stop e)
(commands/simple-insert!
parent-id "(())"
{:backward-pos 2
:check-fn (fn [_ _ new-pos]
(reset! commands/*slash-caret-pos new-pos)
(commands/handle-step [:editor/search-block]))})
(when-let [input (gdom/getElement parent-id)]
(.focus input)))}
"(("]]
[:div
[:button.bottom-action.text-sm
{:on-mouse-down (fn [e]
(util/stop e)
(commands/simple-insert! parent-id "/" {})
(when-let [input (gdom/getElement parent-id)]
(.focus input)))}
"/"]]]])
(rum/defcs input < rum/reactive
(rum/local {} ::input-value)

2
src/main/frontend/components/editor.css
View File

@ -11,7 +11,7 @@
transition: top 0.3s;
> button {
button {
padding: 10px;
}
}