webui: Allow editing file attachments when editing messages.

tools/server/webui/src/components/ChatMessage.tsx

@@ -1,16 +1,19 @@
-import { useMemo, useState } from 'react';
+import { useMemo, useState, ClipboardEvent } from 'react';
 import { useAppContext } from '../utils/app.context';
-import { Message, PendingMessage } from '../utils/types';
+import { Message, MessageExtra, PendingMessage } from '../utils/types';
 import { classNames } from '../utils/misc';
 import MarkdownDisplay, { CopyButton } from './MarkdownDisplay';
 import {
   ArrowPathIcon,
   ChevronLeftIcon,
   ChevronRightIcon,
+  PaperClipIcon,
   PencilSquareIcon,
 } from '@heroicons/react/24/outline';
 import ChatInputExtraContextItem from './ChatInputExtraContextItem';
 import { BtnWithTooltips } from '../utils/common';
+import Dropzone from 'react-dropzone';
+import { useChatExtraContext } from './useChatExtraContext';
 
 interface SplitMessage {
   content: PendingMessage['content'];
@@ -33,12 +36,18 @@ export default function ChatMessage({
   siblingCurrIdx: number;
   id?: string;
   onRegenerateMessage(msg: Message): void;
-  onEditMessage(msg: Message, content: string): void;
+  onEditMessage(
+    msg: Message,
+    content: string,
+    extra: MessageExtra[] | undefined
+  ): void;
   onChangeSibling(sibling: Message['id']): void;
   isPending?: boolean;
 }) {
   const { viewingChat, config } = useAppContext();
+  const extraContext = useChatExtraContext(msg.extra ?? []);
   const [editingContent, setEditingContent] = useState<string | null>(null);
+  const [isDrag, setIsDrag] = useState(false);
   const timings = useMemo(
     () =>
       msg.timings
@@ -107,36 +116,92 @@ export default function ChatMessage({
           className={classNames({
             'chat-bubble markdown': true,
             'chat-bubble bg-transparent': !isUser,
+            'opacity-50': isDrag, // simply visual feedback to inform user that the file will be accepted
           })}
         >
           {/* textarea for editing message */}
           {editingContent !== null && (
-            <>
-              <textarea
-                dir="auto"
-                className="textarea textarea-bordered bg-base-100 text-base-content max-w-2xl w-[calc(90vw-8em)] h-24"
-                value={editingContent}
-                onChange={(e) => setEditingContent(e.target.value)}
-              ></textarea>
-              <br />
-              <button
-                className="btn btn-ghost mt-2 mr-2"
-                onClick={() => setEditingContent(null)}
-              >
-                Cancel
-              </button>
-              <button
-                className="btn mt-2"
-                onClick={() => {
-                  if (msg.content !== null) {
-                    setEditingContent(null);
-                    onEditMessage(msg as Message, editingContent);
-                  }
-                }}
-              >
-                Submit
-              </button>
-            </>
+            <Dropzone
+              noClick
+              onDrop={(files: File[]) => {
+                setIsDrag(false);
+                extraContext.onFileAdded(files);
+              }}
+              onDragEnter={() => setIsDrag(true)}
+              onDragLeave={() => setIsDrag(false)}
+              multiple={true}
+            >
+              {({ getRootProps, getInputProps }) => (
+                <div
+                  className="flex flex-col w-full"
+                  onPasteCapture={(e: ClipboardEvent<HTMLInputElement>) => {
+                    const files = Array.from(e.clipboardData.items)
+                      .filter((item) => item.kind === 'file')
+                      .map((item) => item.getAsFile())
+                      .filter((file) => file !== null);
+
+                    if (files.length > 0) {
+                      e.preventDefault();
+                      extraContext.onFileAdded(files);
+                    }
+                  }}
+                  {...getRootProps()}
+                >
+                  <ChatInputExtraContextItem
+                    items={extraContext.items}
+                    removeItem={extraContext.removeItem}
+                  />
+
+                  <div className="flex flex-row gap-2 ml-2">
+                    <textarea
+                      dir="auto"
+                      className="textarea textarea-bordered bg-base-100 text-base-content max-w-2xl w-[calc(90vw-8em)] h-24"
+                      value={editingContent}
+                      onChange={(e) => setEditingContent(e.target.value)}
+                    />
+                    <label
+                      htmlFor="file-upload"
+                      className={classNames({
+                        'btn w-8 h-8 p-0 rounded-full': true,
+                      })}
+                    >
+                      <PaperClipIcon className="h-5 w-5" />
+                    </label>
+                    <input
+                      id="file-upload"
+                      type="file"
+                      className="hidden"
+                      {...getInputProps()}
+                      hidden
+                    />
+                  </div>
+
+                  <div className="flex flex-row gap-2 ml-2">
+                    <button
+                      className="btn btn-ghost mt-2 mr-2"
+                      onClick={() => setEditingContent(null)}
+                    >
+                      Cancel
+                    </button>
+                    <button
+                      className="btn mt-2"
+                      onClick={() => {
+                        if (msg.content !== null) {
+                          setEditingContent(null);
+                          onEditMessage(
+                            msg as Message,
+                            editingContent,
+                            extraContext.items
+                          );
+                        }
+                      }}
+                    >
+                      Submit
+                    </button>
+                  </div>
+                </div>
+              )}
+            </Dropzone>
           )}
           {/* not editing content, render message */}
           {editingContent === null && (

tools/server/webui/src/components/ChatScreen.tsx

@@ -1,7 +1,12 @@
 import { ClipboardEvent, useEffect, useMemo, useRef, useState } from 'react';
 import { CallbackGeneratedChunk, useAppContext } from '../utils/app.context';
 import ChatMessage from './ChatMessage';
-import { CanvasType, Message, PendingMessage } from '../utils/types';
+import {
+  CanvasType,
+  Message,
+  MessageExtra,
+  PendingMessage,
+} from '../utils/types';
 import { classNames, cleanCurrentUrl } from '../utils/misc';
 import CanvasPyInterpreter from './CanvasPyInterpreter';
 import StorageUtils from '../utils/storage';
@@ -158,15 +163,19 @@ export default function ChatScreen() {
   // for vscode context
   textarea.refOnSubmit.current = sendNewMessage;
 
-  const handleEditMessage = async (msg: Message, content: string) => {
+  const handleEditMessage = async (
+    msg: Message,
+    content: string,
+    extra: MessageExtra[] | undefined
+  ) => {
     if (!viewingChat) return;
     setCurrNodeId(msg.id);
     scrollToBottom(false);
     await replaceMessageAndGenerate(
       viewingChat.conv.id,
       msg.parent,
       content,
-      msg.extra,
+      extra,
       onChunk
     );
     setCurrNodeId(-1);

tools/server/webui/src/components/useChatExtraContext.tsx

@@ -23,9 +23,11 @@ export interface ChatExtraContextApi {
   onFileAdded: (files: File[]) => void; // used by "upload" button
 }
 
-export function useChatExtraContext(): ChatExtraContextApi {
+export function useChatExtraContext(
+  initialItems: MessageExtra[] = []
+): ChatExtraContextApi {
   const { serverProps, config } = useAppContext();
-  const [items, setItems] = useState<MessageExtra[]>([]);
+  const [items, setItems] = useState<MessageExtra[]>(initialItems);
 
   const addItems = (newItems: MessageExtra[]) => {
     setItems((prev) => [...prev, ...newItems]);