clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-04 10:56:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: clear shortcut listeners when unmount

Browse Source 
Related to https://github.com/logseq/logseq/issues/572.
This commit is contained in:
Tienson Qin
2020-11-07 21:40:36 +08:00
parent 6918eb03c1
commit ff80d85907
7 changed files with 111 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -738,7 +738,7 @@
(defn- with-timetracking-properties
[block value]
(let [new-marker (first (re-find format/bare-marker-pattern value))
(let [new-marker (first (re-find format/bare-marker-pattern (or value "")))
new-marker (if new-marker (string/lower-case (string/trim new-marker)))
properties (into {} (:block/properties block))]
(if (and
@@ -1647,67 +1647,68 @@
string/join))
(defn move-up-down
[state e up?]
(let [{:keys [id block-id block block-parent-id dummy? value pos format] :as block-state} (get-state state)
block (db/entity [:block/uuid block-id])
meta (:block/meta block)
page (:block/page block)
block-dom-node (gdom/getElement block-parent-id)
prev-block (get-prev-block-non-collapsed block-dom-node)
next-block (get-next-block-non-collapsed block-dom-node)
repo (state/get-current-repo)
move-upwards-to-parent? (and up? prev-block (< (d/attr prev-block "level") (:block/level block)))
move-down-to-higher-level? (and (not up?) next-block (< (d/attr next-block "level") (:block/level block)))]
(when-let [sibling-block (cond
move-upwards-to-parent?
prev-block
move-down-to-higher-level?
next-block
:else
(let [f (if up? util/get-prev-block-with-same-level util/get-next-block-with-same-level)]
(f block-dom-node)))]
(when-let [sibling-block-id (d/attr sibling-block "blockid")]
(when-let [sibling-block (db/pull-block (medley/uuid sibling-block-id))]
(let [sibling-meta (:block/meta sibling-block)
hc1 (db/get-block-and-children-no-cache repo (:block/uuid block))
hc2 (if (or move-upwards-to-parent? move-down-to-higher-level?)
[sibling-block]
(db/get-block-and-children-no-cache repo (:block/uuid sibling-block)))]
;; Same page and next to the other
(when (and
(= (:db/id (:block/page block))
(:db/id (:block/page sibling-block)))
(or
(and up? (= (:end-pos (:block/meta (last hc2))) (:start-pos (:block/meta (first hc1)))))
(and (not up?) (= (:end-pos (:block/meta (last hc1))) (:start-pos (:block/meta (first hc2)))))))
(let [hc1-content (block-and-children-content hc1)
hc2-content (block-and-children-content hc2)
file (db/get-block-file (:block/uuid block))
file-path (:file/path file)
old-file-content (db/get-file file-path)
[start-pos end-pos new-content blocks] (if up?
[(:start-pos sibling-meta)
(get-in (last hc1) [:block/meta :end-pos])
(str hc1-content hc2-content)
(concat hc1 hc2)]
[(:start-pos meta)
(get-in (last hc2) [:block/meta :end-pos])
(str hc2-content hc1-content)
(concat hc2 hc1)])]
(when (and start-pos end-pos)
(let [new-file-content (utf8/insert! old-file-content start-pos end-pos new-content)
modified-time (modified-time-tx page file)
blocks-meta (rebuild-blocks-meta start-pos blocks)]
(profile
(str "Move block " (if up? "up: " "down: "))
(repo-handler/transact-react-and-alter-file!
repo
(concat
blocks-meta
modified-time)
{:key :block/change
:data (map (fn [block] (assoc block :block/page page)) blocks)}
[[file-path new-file-content]]))))))))))))
[e up?]
(when-let [block-id (:block/uuid (state/get-edit-block))]
(let [block-parent-id (state/get-editing-block-dom-id)
block (db/entity [:block/uuid block-id])
meta (:block/meta block)
page (:block/page block)
block-dom-node (gdom/getElement block-parent-id)
prev-block (get-prev-block-non-collapsed block-dom-node)
next-block (get-next-block-non-collapsed block-dom-node)
repo (state/get-current-repo)
move-upwards-to-parent? (and up? prev-block (< (d/attr prev-block "level") (:block/level block)))
move-down-to-higher-level? (and (not up?) next-block (< (d/attr next-block "level") (:block/level block)))]
(when-let [sibling-block (cond
move-upwards-to-parent?
prev-block
move-down-to-higher-level?
next-block
:else
(let [f (if up? util/get-prev-block-with-same-level util/get-next-block-with-same-level)]
(f block-dom-node)))]
(when-let [sibling-block-id (d/attr sibling-block "blockid")]
(when-let [sibling-block (db/pull-block (medley/uuid sibling-block-id))]
(let [sibling-meta (:block/meta sibling-block)
hc1 (db/get-block-and-children-no-cache repo (:block/uuid block))
hc2 (if (or move-upwards-to-parent? move-down-to-higher-level?)
[sibling-block]
(db/get-block-and-children-no-cache repo (:block/uuid sibling-block)))]
;; Same page and next to the other
(when (and
(= (:db/id (:block/page block))
(:db/id (:block/page sibling-block)))
(or
(and up? (= (:end-pos (:block/meta (last hc2))) (:start-pos (:block/meta (first hc1)))))
(and (not up?) (= (:end-pos (:block/meta (last hc1))) (:start-pos (:block/meta (first hc2)))))))
(let [hc1-content (block-and-children-content hc1)
hc2-content (block-and-children-content hc2)
file (db/get-block-file (:block/uuid block))
file-path (:file/path file)
old-file-content (db/get-file file-path)
[start-pos end-pos new-content blocks] (if up?
[(:start-pos sibling-meta)
(get-in (last hc1) [:block/meta :end-pos])
(str hc1-content hc2-content)
(concat hc1 hc2)]
[(:start-pos meta)
(get-in (last hc2) [:block/meta :end-pos])
(str hc2-content hc1-content)
(concat hc2 hc1)])]
(when (and start-pos end-pos)
(let [new-file-content (utf8/insert! old-file-content start-pos end-pos new-content)
modified-time (modified-time-tx page file)
blocks-meta (rebuild-blocks-meta start-pos blocks)]
(profile
(str "Move block " (if up? "up: " "down: "))
(repo-handler/transact-react-and-alter-file!
repo
(concat
blocks-meta
modified-time)
{:key :block/change
:data (map (fn [block] (assoc block :block/page page)) blocks)}
[[file-path new-file-content]])))))))))))))
(defn expand!
[]