fix: drag-drop / copy-paste should work for multiple files (logseq#11214

) Co-authored-by: Gabriel Horner <[email protected]>
BlackJohnny · Oct 18, 2024 · 53d8c5a · 53d8c5a
1 parent 226db20
commit 53d8c5a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/main/frontend/components/block.cljs b/src/main/frontend/components/block.cljs
@@ -2693,7 +2693,7 @@
                 (-> (editor-handler/save-assets! repo (js->clj files))
                     (p/then
                      (fn [res]
-                       (when-let [[asset-file-name file-obj asset-file-fpath matched-alias] (and (seq res) (first res))]
+                       (when-let [[asset-file-name file-obj asset-file-fpath matched-alias] (first res)]
                          (let [image? (config/ext-of-image? asset-file-name)
                                link-content (assets-handler/get-asset-file-link format
                                                                                 (if matched-alias
@@ -2709,7 +2709,8 @@
                              :edit-block? false
                              :replace-empty-target? true
                              :sibling?   true
-                             :before?    false}))))))))
+                             :before?    false}))
+                         (recur (rest res))))))))
 
             :else
             (prn ::unhandled-drop-data-transfer-type transfer-types))))))

diff --git a/src/main/frontend/handler/editor.cljs b/src/main/frontend/handler/editor.cljs
@@ -1540,10 +1540,9 @@
   (let [repo (state/get-current-repo)]
     (when (config/local-db? repo)
       (-> (save-assets! repo (js->clj files))
-          ;; FIXME: only the first asset is handled
           (p/then
            (fn [res]
-             (when-let [[asset-file-name file-obj asset-file-fpath matched-alias] (and (seq res) (first res))]
+             (when-let [[asset-file-name file-obj asset-file-fpath matched-alias] (first res)]
                (let [image? (config/ext-of-image? asset-file-name)]
                  (insert-command!
                   id
@@ -1558,7 +1557,8 @@
                   format
                   {:last-pattern (if drop-or-paste? "" commands/command-trigger)
                    :restore?     true
-                   :command      :insert-asset})))))
+                   :command      :insert-asset})
+                 (recur (rest res))))))
           (p/finally
             (fn []
               (reset! uploading? false)

diff --git a/src/main/frontend/handler/paste.cljs b/src/main/frontend/handler/paste.cljs
@@ -219,10 +219,11 @@
   (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)))
+      (loop [files files]
+        (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))
+          (recur (rest files))))
       (util/stop e))))
 
 (defn editor-on-paste!