clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-06-01 19:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: can't paste block with children to empty target

Browse Source
This commit is contained in:
Tienson Qin
2026-01-29 16:00:56 +08:00
parent ee80960146
commit 8116067f85
5 changed files with 77 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,6 +63,7 @@
[logseq.shui.dialog.core :as shui-dialog]
[logseq.shui.popup.core :as shui-popup]
[logseq.shui.ui :as shui]
[medley.core :as medley]
[promesa.core :as p]
[rum.core :as rum]))
@@ -1319,7 +1320,7 @@
(fs/write-plain-text-file! repo dir file-rpath content nil)))))
(defn- new-asset-block
[repo ^js file {:keys [repo-dir asset-dir-rpath external-url]}]
[repo ^js file {:keys [repo-dir asset-dir-rpath external-url] :as opts}]
;; WARN file name maybe fully qualified path when paste file
(p/let [[file title] (if (map? file) [(:src file) (:title file)] [file nil])
[file external-url] (if (string? file) [nil file] [file external-url])
@@ -1339,7 +1340,7 @@
false)
nil)
;; new asset block
(let [block-id (ldb/new-block-id)
(let [block-id (or (:block/uuid opts) (ldb/new-block-id))
ext (when file-name (db-asset/asset-path->type file-name))
_ (when (string/blank? ext)
(throw (ex-info "File doesn't have a valid ext."
@@ -1375,13 +1376,18 @@
today-page (if (nil? today-page-e)
(state/pub-event! [:page/create today-page-name])
today-page-e)
edit-block (or (state/get-edit-block) last-edit-block)
empty-target? (if (state/get-edit-block)
(string/blank? (state/get-edit-content))
(string/blank? (:block/title last-edit-block)))
blocks* (p/all
(for [^js file files]
(for [^js [idx file] (medley/indexed files)]
(new-asset-block repo file
{:repo-dir repo-dir
:asset-dir-rpath asset-dir-rpath})))
:asset-dir-rpath asset-dir-rpath
:block/uuid (when (and (zero? idx) empty-target?)
(:block/uuid edit-block))})))
blocks (remove nil? blocks*)
edit-block (or (state/get-edit-block) last-edit-block)
insert-to-current-block-page? (and (:block/uuid edit-block) (not pdf-area?))
target (cond
insert-to-current-block-page?

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

@@ -224,9 +224,11 @@
(when id
(let [clipboard-data (gobj/get e "clipboardData")
files (.-files clipboard-data)]
(editor-handler/upload-asset! id files
(get (state/get-edit-block) :block/format :markdown)
editor-handler/*asset-uploading? true)
(p/let [blocks (editor-handler/upload-asset! id files
(get (state/get-edit-block) :block/format :markdown)
editor-handler/*asset-uploading? true)]
(when-let [asset (first blocks)]
(editor-handler/edit-block! asset :max {})))
(util/stop e))))
(defn editor-on-paste!