Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/support form in conversation #9980

Merged
merged 8 commits into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions web/app/components/base/markdown-blocks/button.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { useChatContext } from '@/app/components/base/chat/chat/context'
import Button from '@/app/components/base/button'
import cn from '@/utils/classnames'

const MarkdownButton = ({ node }: any) => {
const { onSend } = useChatContext()
const variant = node.properties.dataVariant
const message = node.properties.dataMessage
const size = node.properties.dataSize

return <Button
variant={variant}
size={size}
className={cn('!h-8 !px-3 select-none')}
onClick={() => onSend?.(message)}
>
<span className='text-[13px]'>{node.children[0]?.value || ''}</span>
</Button>
}
MarkdownButton.displayName = 'MarkdownButton'

export default MarkdownButton
137 changes: 137 additions & 0 deletions web/app/components/base/markdown-blocks/form.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
import Button from '@/app/components/base/button'
import Input from '@/app/components/base/input'
import Textarea from '@/app/components/base/textarea'
import { useChatContext } from '@/app/components/base/chat/chat/context'

enum DATA_FORMAT {
TEXT = 'text',
JSON = 'json',
}
enum SUPPORTED_TAGS {
LABEL = 'label',
INPUT = 'input',
TEXTAREA = 'textarea',
BUTTON = 'button',
}
enum SUPPORTED_TYPES {
TEXT = 'text',
PASSWORD = 'password',
EMAIL = 'email',
NUMBER = 'number',
}
const MarkdownForm = ({ node }: any) => {
// const supportedTypes = ['text', 'password', 'email', 'number']
// <form data-format="text">
// <label for="username">Username:</label>
// <input type="text" name="username" />
// <label for="password">Password:</label>
// <input type="password" name="password" />
// <label for="content">Content:</label>
// <textarea name="content"></textarea>
// <button data-size="small" data-variant="primary">Login</button>
// </form>
const { onSend } = useChatContext()

const getFormValues = (children: any) => {
const formValues: { [key: string]: any } = {}
children.forEach((child: any) => {
if (child.tagName === SUPPORTED_TAGS.INPUT)
formValues[child.properties.name] = child.properties.value
if (child.tagName === SUPPORTED_TAGS.TEXTAREA)
formValues[child.properties.name] = child.properties.value
})
return formValues
}
const onSubmit = (e: any) => {
e.preventDefault()
const format = node.properties.dataFormat || DATA_FORMAT.TEXT
const result = getFormValues(node.children)
if (format === DATA_FORMAT.JSON) {
onSend?.(JSON.stringify(result))
}
else {
const textResult = Object.entries(result)
.map(([key, value]) => `${key}: ${value}`)
.join('\n')
onSend?.(textResult)
}
}
return (
<form
autoComplete="off"
className='flex flex-col self-stretch'
onSubmit={(e: any) => {
e.preventDefault()
e.stopPropagation()
}}
>
{node.children.filter((i: any) => i.type === 'element').map((child: any, index: number) => {
if (child.tagName === SUPPORTED_TAGS.LABEL) {
return (
<label
key={index}
htmlFor={child.properties.for}
className="my-2 system-md-semibold text-text-secondary"
>
{child.children[0]?.value || ''}
</label>
)
}
if (child.tagName === SUPPORTED_TAGS.INPUT) {
if (Object.values(SUPPORTED_TYPES).includes(child.properties.type)) {
return (
<Input
key={index}
type={child.properties.type}
name={child.properties.name}
placeholder={child.properties.placeholder}
value={child.properties.value}
onChange={(e) => {
e.preventDefault()
child.properties.value = e.target.value
}}
/>
)
}
else {
return <p key={index}>Unsupported input type: {child.properties.type}</p>
}
}
if (child.tagName === SUPPORTED_TAGS.TEXTAREA) {
return (
<Textarea
key={index}
name={child.properties.name}
placeholder={child.properties.placeholder}
value={child.properties.value}
onChange={(e) => {
e.preventDefault()
child.properties.value = e.target.value
}}
/>
)
}
if (child.tagName === SUPPORTED_TAGS.BUTTON) {
const variant = child.properties.dataVariant
const size = child.properties.dataSize

return (
<Button
variant={variant}
size={size}
className='mt-4'
key={index}
onClick={onSubmit}
>
<span className='text-[13px]'>{child.children[0]?.value || ''}</span>
</Button>
)
}

return <p key={index}>Unsupported tag: {child.tagName}</p>
})}
</form>
)
}
MarkdownForm.displayName = 'MarkdownForm'
export default MarkdownForm
20 changes: 3 additions & 17 deletions web/app/components/base/markdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import { useChatContext } from '@/app/components/base/chat/chat/context'
import VideoGallery from '@/app/components/base/video-gallery'
import AudioGallery from '@/app/components/base/audio-gallery'
import SVGRenderer from '@/app/components/base/svg-gallery'
import Button from '@/app/components/base/button'
import MarkdownButton from '@/app/components/base/markdown-blocks/button'
import MarkdownForm from '@/app/components/base/markdown-blocks/form'

// Available language https://github.com/react-syntax-highlighter/react-syntax-highlighter/blob/master/AVAILABLE_LANGUAGES_HLJS.MD
const capitalizationLanguageNameMap: Record<string, string> = {
Expand Down Expand Up @@ -241,22 +242,6 @@ const Link = ({ node, ...props }: any) => {
}
}

const MarkdownButton = ({ node }: any) => {
const { onSend } = useChatContext()
const variant = node.properties.dataVariant
const message = node.properties.dataMessage
const size = node.properties.dataSize

return <Button variant={variant}
size={size}
className={cn('!h-8 !px-3 select-none')}
onClick={() => onSend?.(message)}
>
<span className='text-[13px]'>{node.children[0]?.value || ''}</span>
</Button>
}
MarkdownButton.displayName = 'MarkdownButton'

export function Markdown(props: { content: string; className?: string }) {
const latexContent = preprocessLaTeX(props.content)
return (
Expand Down Expand Up @@ -289,6 +274,7 @@ export function Markdown(props: { content: string; className?: string }) {
a: Link,
p: Paragraph,
button: MarkdownButton,
form: MarkdownForm,
}}
linkTarget='_blank'
>
Expand Down