enhance: editable block in conversation

logseq · tiensonqin · Mar 9, 2023 · Mar 9, 2023 · Mar 9, 2023 · Mar 9, 2023
commit 2c56509bbf8d6052348e9cb65b83254cb5b9c780
diff --git a/src/main/frontend/commands.cljs b/src/main/frontend/commands.cljs
@@ -235,10 +235,7 @@
      (cond
        (and (util/electron?) (config/local-db? (state/get-current-repo)))
 
-       ["Upload an asset" [[:editor/click-hidden-file-input :id]] "Upload file types like image, pdf, docx, etc.)"]
-
-       ;; ["Upload an image" [[:editor/click-hidden-file-input :id]]]
-       )]
+       ["Upload an asset" [[:editor/click-hidden-file-input :id]] "Upload file types like image, pdf, docx, etc.)"])]
 
     (headings)
 

diff --git a/src/main/frontend/components/ai.cljs b/src/main/frontend/components/ai.cljs
@@ -59,7 +59,7 @@
 (rum/defc conversation-message < rum/static
   [block]
   [:div.message {:class (get-in block [:block/properties :logseq.ai.type])}
-   (block/block-content {} (db/pull (:db/id block)) nil nil false)])
+   (block/single-block-cp (:block/uuid block))])
 
 (rum/defcs conversation < rum/reactive
   [state conversation-id]

diff --git a/src/main/frontend/components/editor.cljs b/src/main/frontend/components/editor.cljs
@@ -76,7 +76,7 @@
                                   (and
                                    (not (fn? command-steps))
                                    (not (contains? (set (map first command-steps)) :editor/input))
-                                   (not (contains? #{"Date picker" "Template" "Deadline" "Scheduled" "Upload an image"} command))))]
+                                   (not (contains? #{"Date picker" "Template" "Deadline" "Scheduled"} command))))]
               (editor-handler/insert-command! id command-steps
                                               format
                                               {:restore? restore-slash?
@@ -416,26 +416,6 @@
                     :exit  300}}
      (absolute-modal cp modal-name set-default-width? pos))))
 
-(rum/defc image-uploader < rum/reactive
-  [id format]
-  [:div.image-uploader
-   [:input
-    {:id        "upload-file"
-     :type      "file"
-     :on-change (fn [e]
-                  (let [files (.-files (.-target e))]
-                    (editor-handler/upload-asset id files format editor-handler/*asset-uploading? false)))
-     :hidden    true}]
-   #_:clj-kondo/ignore
-   (when-let [uploading? (util/react editor-handler/*asset-uploading?)]
-     (let [processing (util/react editor-handler/*asset-uploading-process)]
-       (transition-cp
-        [:div.flex.flex-row.align-center.rounded-md.shadow-sm.bg-base-2.px-1.py-1
-         (ui/loading
-          (util/format "Uploading %s%" (util/format "%2d" processing)))]
-        "upload-file"
-        false)))])
-
 (defn- set-up-key-down!
   [state format]
   (mixins/on-key-down
@@ -618,7 +598,4 @@
        :class             heading-class})
 
      (mock-textarea content)
-     (modals id format)
-
-     (when format
-       (image-uploader id format))]))
+     (modals id format)]))