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

Merge branch 'master' into fix-IOS-bottom-fixed-position

Browse Source
This commit is contained in:
Charlie
2020-11-09 17:26:54 +08:00
committed by GitHub
parent 7a20921ab6 411aebea71
commit c2848b1b29
40 changed files with 711 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -335,12 +335,6 @@
*slash-caret-pos)))])
(rum/defcs box < rum/reactive
(mixins/keyboard-mixin (util/->system-modifier "ctrl+shift+a") editor-handler/select-all-blocks!)
(mixins/keyboard-mixin (if util/mac? "meta+shift+up" "alt+shift+up")
(fn [state e]
(editor-handler/move-up-down state e true)))
(mixins/keyboard-mixin (if util/mac? "meta+shift+down" "alt+shift+down")
(fn [state e] (editor-handler/move-up-down state e false)))
(mixins/event-mixin
(fn [state]
(let [{:keys [id format block]} (get-state state)
@@ -590,6 +584,8 @@
{:did-mount (fn [state]
(let [[{:keys [dummy? format block-parent-id]} id] (:rum/args state)
content (get-in @state/state [:editor/content id])]
(when block-parent-id
(state/set-editing-block-dom-id! block-parent-id))
(editor-handler/restore-cursor-pos! id content dummy?)
(when-let [input (gdom/getElement id)]
@@ -656,7 +652,7 @@
{:re-render-root? true}))))
(editor-handler/save-block! (get-state state) value)))
state)}
[state {:keys [on-hide dummy? node format block]
[state {:keys [on-hide dummy? node format block block-parent-id]
:or {dummy? false}
:as option} id config]
(let [content (state/sub [:editor/content id])]