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: embed self in property value

Browse Source
This commit is contained in:
Tienson Qin
2025-03-02 16:09:21 +08:00
parent d5dbd42cab
commit 0a29d32c65
4 changed files with 125 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@
[frontend.format.block :as block]
[frontend.format.mldoc :as mldoc]
[frontend.handler.editor :as editor-handler]
[frontend.handler.notification :as notification]
[frontend.mobile.util :as mobile-util]
[frontend.state :as state]
[frontend.util :as util]
@@ -17,6 +18,7 @@
[lambdaisland.glogi :as log]
[logseq.common.util :as common-util]
[logseq.common.util.block-ref :as block-ref]
[logseq.db :as ldb]
[logseq.db.frontend.content :as db-content]
[logseq.graph-parser.block :as gp-block]
[promesa.core :as p]))
@@ -189,32 +191,38 @@
;; todo: logseq/whiteboard-shapes is now text/html
[input text e html]
(util/stop e)
(->
(p/let [{:keys [graph blocks embed-block?]} (get-copied-blocks)]
(if (and (seq blocks) (= graph (state/get-current-repo)))
(let [repo (state/get-current-repo)]
(->
(p/let [{:keys [graph blocks embed-block?]} (get-copied-blocks)]
(if (and (seq blocks) (= graph repo))
;; Handle internal paste
(let [revert-cut-txs (get-revert-cut-txs blocks)
keep-uuid? (= (state/get-block-op-type) :cut)
blocks (if (config/db-based-graph? (state/get-current-repo))
(map (fn [b] (dissoc b :block/properties)) blocks)
blocks)]
(if embed-block?
(when-let [block-id (:block/uuid (first blocks))]
(when-let [current-block (state/get-edit-block)]
(p/do!
(editor-handler/api-insert-new-block! ""
{:block-uuid (:block/uuid current-block)
:sibling? true
:replace-empty-target? true
:other-attrs {:block/link (:db/id (db/entity [:block/uuid block-id]))}})
(state/clear-edit!))))
(editor-handler/paste-blocks blocks {:revert-cut-txs revert-cut-txs
:keep-uuid? keep-uuid?})))
(paste-copied-text input text html)))
(p/catch (fn [error]
(log/error :msg "Paste failed" :exception error)
(state/pub-event! [:capture-error {:error error
:payload {:type ::paste-copied-blocks-or-text}}])))))
(let [revert-cut-txs (get-revert-cut-txs blocks)
keep-uuid? (= (state/get-block-op-type) :cut)
blocks (if (config/db-based-graph? (state/get-current-repo))
(map (fn [b] (dissoc b :block/properties)) blocks)
blocks)]
(if embed-block?
(when-let [block-id (:block/uuid (first blocks))]
(when-let [current-block (state/get-edit-block)]
(cond
(some #(= block-id (:block/uuid %)) (db/get-block-parents repo (:block/uuid current-block) {}))
(notification/show! "Can't embed parent block as its own property" :error)
:else
(p/do!
(editor-handler/api-insert-new-block! ""
{:block-uuid (:block/uuid current-block)
:sibling? true
:replace-empty-target? true
:other-attrs {:block/link (:db/id (db/entity [:block/uuid block-id]))}})
(state/clear-edit!)))))
(editor-handler/paste-blocks blocks {:revert-cut-txs revert-cut-txs
:keep-uuid? keep-uuid?})))
(paste-copied-text input text html)))
(p/catch (fn [error]
(log/error :msg "Paste failed" :exception error)
(state/pub-event! [:capture-error {:error error
:payload {:type ::paste-copied-blocks-or-text}}]))))))
(defn paste-text-in-one-block-at-point
[]