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

fix(whiteboards): some pasting issues

Browse Source
This commit is contained in:
Peng Xiao
2022-10-16 18:19:19 +08:00
parent c030ba3d03
commit 757ce2a528
3 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,16 +64,29 @@
(try (js/JSON.parse text)
(catch :default _ #js{})))
(defn- get-whiteboard-tldr-from-text
[text]
(when-let [matched-text (util/safe-re-find #"<whiteboard-tldr>(.*)</whiteboard-tldr>" text)]
(try-parse-as-json (second matched-text))))
(defn- get-whiteboard-shape-refs-text
[text]
(when-let [tldr (get-whiteboard-tldr-from-text text)]
(->> (gobj/get tldr "shapes")
(mapv (fn [shape]
(let [shape-id (gobj/get shape "id")]
(block-ref/->block-ref shape-id))))
(string/join "\n"))))
(defn- paste-copied-blocks-or-text
;; todo: logseq/whiteboard-shapes is now text/html
[text e html]
(util/stop e)
(let [copied-blocks (state/get-copied-blocks)
input (state/get-input)
input-id (state/get-edit-input-id)
text (string/replace text "\r\n" "\n") ;; Fix for Windows platform
whiteboard-shape? (= "logseq/whiteboard-shapes" (gobj/get (try-parse-as-json text) "type"))
text (if whiteboard-shape?
(block-ref/->block-ref (gobj/getValueByKeys (try-parse-as-json text) "shapes" 0 "id"))
text)
shape-refs-text (when-not (string/blank? html) (get-whiteboard-shape-refs-text html))
internal-paste? (and
(seq (:copy/blocks copied-blocks))
;; not copied from the external clipboard
@@ -85,6 +98,9 @@
(editor-handler/paste-blocks blocks {})))
(let [{:keys [value]} (editor-handler/get-selection-and-format)]
(cond
(not (string/blank? shape-refs-text))
(commands/simple-insert! input-id shape-refs-text nil)
(and (or (gp-util/url? text)
(and value (gp-util/url? (string/trim value))))
(not (string/blank? (util/get-selected-text))))
@@ -92,7 +108,7 @@
(and (block-ref/block-ref? text)
(editor-handler/wrapped-by? input block-ref/left-parens block-ref/right-parens))
(commands/simple-insert! (state/get-edit-input-id) (block-ref/get-block-ref-id text) nil)
(commands/simple-insert! input-id (block-ref/get-block-ref-id text) nil)
:else
;; from external
@@ -105,7 +121,6 @@
nil)))]
(if (string/blank? result) nil result))
text (or html-text text)
input-id (state/get-edit-input-id)
replace-text-f (fn []
(commands/delete-selection! input-id)
(commands/simple-insert! input-id text nil))]
@@ -172,7 +187,7 @@
(let [clipboard-data (gobj/get e "clipboardData")
html (when-not raw-paste? (.getData clipboard-data "text/html"))
text (.getData clipboard-data "text")]
(if-not (string/blank? text)
(if-not (and (string/blank? text) (string/blank? html))
(paste-text-or-blocks-aux input e text html)
(when id
(let [_handled