Merge branch 'develop'

molvqingtai · Oct 31, 2024 · 94c927c · 94c927c
2 parents 78e1cd7 + ebd22bc
commit 94c927c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/app/content/components/MessageInput.tsx b/src/app/content/components/MessageInput.tsx
@@ -1,4 +1,4 @@
-import { forwardRef, type ChangeEvent, CompositionEvent, type KeyboardEvent } from 'react'
+import { forwardRef, type ChangeEvent, CompositionEvent, type KeyboardEvent, ClipboardEvent } from 'react'
 
 import { cn } from '@/utils'
 import { Textarea } from '@/components/ui/Textarea'
@@ -14,6 +14,7 @@ export interface MessageInputProps {
   disabled?: boolean
   loading?: boolean
   onInput?: (e: ChangeEvent<HTMLTextAreaElement>) => void
+  onPaste?: (e: ClipboardEvent<HTMLTextAreaElement>) => void
   onKeyDown?: (e: KeyboardEvent<HTMLTextAreaElement>) => void
   onCompositionStart?: (e: CompositionEvent<HTMLTextAreaElement>) => void
   onCompositionEnd?: (e: CompositionEvent<HTMLTextAreaElement>) => void
@@ -31,6 +32,7 @@ const MessageInput = forwardRef<HTMLTextAreaElement, MessageInputProps>(
       className,
       maxLength = 500,
       onInput,
+      onPaste,
       onKeyDown,
       onCompositionStart,
       onCompositionEnd,
@@ -45,6 +47,7 @@ const MessageInput = forwardRef<HTMLTextAreaElement, MessageInputProps>(
         <ScrollArea className="box-border max-h-28 w-full rounded-lg border border-input bg-background ring-offset-background focus-within:ring-1 focus-within:ring-ring 2xl:max-h-40">
           <Textarea
             ref={ref}
+            onPaste={onPaste}
             onKeyDown={onKeyDown}
             autoFocus={autoFocus}
             maxLength={maxLength}

diff --git a/src/app/content/views/Footer/index.tsx b/src/app/content/views/Footer/index.tsx
@@ -1,4 +1,4 @@
-import { ChangeEvent, useMemo, useRef, useState, KeyboardEvent, type FC } from 'react'
+import { ChangeEvent, useMemo, useRef, useState, KeyboardEvent, type FC, ClipboardEvent } from 'react'
 import { CornerDownLeftIcon } from 'lucide-react'
 import { useRemeshDomain, useRemeshQuery, useRemeshSend } from 'remesh-react'
 import MessageInput from '../../components/MessageInput'
@@ -216,6 +216,13 @@ const Footer: FC = () => {
     send(messageInputDomain.command.InputCommand(currentMessage))
   }
 
+  const handlePaste = async (e: ClipboardEvent<HTMLTextAreaElement>) => {
+    const file = e.nativeEvent.clipboardData?.files[0]
+    if (['image/png', 'image/jpeg', 'image/webp'].includes(file?.type ?? '')) {
+      handleInjectImage(file!)
+    }
+  }
+
   const handleInjectEmoji = (emoji: string) => {
     const newMessage = `${message.slice(0, selectionEnd)}${emoji}${message.slice(selectionEnd)}`
 
@@ -335,6 +342,7 @@ const Footer: FC = () => {
         value={message}
         onInput={handleInput}
         loading={inputLoading}
+        onPaste={handlePaste}
         onKeyDown={handleKeyDown}
         maxLength={MESSAGE_MAX_LENGTH}
       ></MessageInput>