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

fix: keep copy-paste buffer intact when deleting blocks

Browse Source 
Related to #1507
This commit is contained in:
Tienson Qin
2021-03-22 16:16:55 +08:00
parent a1f5c715d0
commit ba5259feb9
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/frontend/components/content.cljs
View File

@@ -51,7 +51,7 @@
[:div.py-1.rounded-md.bg-base-3.shadow-xs
(ui/menu-link
{:key "cut"
:on-click editor-handler/cut-selection-blocks}
:on-click #(editor-handler/cut-selection-blocks true)}
"Cut")
(ui/menu-link
{:key "copy"
@@ -254,8 +254,8 @@
(defn- cut-blocks-and-clear-selections!
[_]
(editor-handler/cut-selection-blocks)
[copy?]
(editor-handler/cut-selection-blocks copy?)
(editor-handler/clear-selection! nil))
(rum/defc hidden-selection < rum/reactive
@@ -264,11 +264,11 @@
(editor-handler/copy-selection-blocks)
(editor-handler/clear-selection! nil)))
(mixins/keyboard-mixin (util/->system-modifier "ctrl+x")
cut-blocks-and-clear-selections!)
(fn [] (cut-blocks-and-clear-selections! true)))
(mixins/keyboard-mixin "backspace"
cut-blocks-and-clear-selections!)
(fn [] (cut-blocks-and-clear-selections! false)))
(mixins/keyboard-mixin "delete"
cut-blocks-and-clear-selections!)
(fn [] (cut-blocks-and-clear-selections! false)))
[]
[:div#selection.hidden])

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

@@ -1219,8 +1219,8 @@
(common-handler/copy-to-clipboard-without-id-property! content)))))
(defn cut-selection-blocks
[]
(copy-selection-blocks)
[copy?]
(when copy? (copy-selection-blocks))
(when-let [blocks (seq (get-selected-blocks-with-children))]
(let [repo (dom/attr (first blocks) "repo")
ids (distinct (map #(uuid (dom/attr % "blockid")) blocks))]