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

Fix pasting file - fixes #8926

Browse Source 
Also remove unused mocks in formatted paste and clean up
editor-on-paste!
This commit is contained in:
Gabriel Horner
2023-03-28 13:56:03 -04:00
committed by Andelf
parent 37230c229f
commit 07a3adcb52
2 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/frontend/handler/paste.cljs
View File

@@ -181,6 +181,16 @@
(paste-text-in-one-block-at-point))
(paste-copied-blocks-or-text text e html)))
(defn- paste-file-if-exists [id e]
(when id
(let [clipboard-data (gobj/get e "clipboardData")
files (.-files clipboard-data)]
(when-let [file (first files)]
(when-let [block (state/get-edit-block)]
(editor-handler/upload-asset id #js[file] (:block/format block)
editor-handler/*asset-uploading? true)))
(util/stop e))))
(defn editor-on-paste!
"Pastes with formatting and includes the following features:
- handles internal pastes to correctly paste at the block level
@@ -194,29 +204,19 @@
[id]
(fn [e]
(state/set-state! :editor/on-paste? true)
(let [input (state/get-input)
clipboard-data (gobj/get e "clipboardData")
(let [clipboard-data (gobj/get e "clipboardData")
html (.getData clipboard-data "text/html")
text (.getData clipboard-data "text")
files (.-files text)
paste-file-if-exist (fn []
(when id
(let [_handled
(let [clipboard-data (gobj/get e "clipboardData")
files (.-files clipboard-data)]
(when-let [file (first files)]
(when-let [block (state/get-edit-block)]
(editor-handler/upload-asset id #js[file] (:block/format block)
editor-handler/*asset-uploading? true))))]
(util/stop e))))]
text (.getData clipboard-data "text")]
(cond
(and (string/blank? text) (string/blank? html)) (paste-file-if-exist)
(and (seq files) (state/preferred-pasting-file?)) (paste-file-if-exist)
(and (string/blank? text) (string/blank? html))
(paste-file-if-exists id e)
(and (seq (.-files clipboard-data)) (state/preferred-pasting-file?))
(paste-file-if-exists id e)
:else
(let [text' (or (when (gp-util/url? text)
(wrap-macro-url text))
text)]
(paste-text-or-blocks-aux input e text' html))))))
(paste-text-or-blocks-aux (state/get-input) e text' html))))))
(defn editor-on-paste-raw!
"Raw pastes without _any_ formatting. Can also replace selected text with a paste"