Merge branch 'dev' into chatImg
This commit is contained in:
commit
b426148a67
2 changed files with 7 additions and 2 deletions
|
|
@ -59,6 +59,7 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
|
||||||
variant,
|
variant,
|
||||||
size,
|
size,
|
||||||
loading,
|
loading,
|
||||||
|
type,
|
||||||
disabled,
|
disabled,
|
||||||
asChild = false,
|
asChild = false,
|
||||||
children,
|
children,
|
||||||
|
|
@ -76,6 +77,7 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
|
||||||
<Comp
|
<Comp
|
||||||
className={cn(buttonVariants({ variant, size, className }))}
|
className={cn(buttonVariants({ variant, size, className }))}
|
||||||
disabled={loading || disabled}
|
disabled={loading || disabled}
|
||||||
|
{...(asChild ? {} : { type: type || "button" })}
|
||||||
ref={ref}
|
ref={ref}
|
||||||
{...props}
|
{...props}
|
||||||
>
|
>
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@ import { classNames } from "../../../../utils/utils";
|
||||||
import ChatInput from "./chatInput";
|
import ChatInput from "./chatInput";
|
||||||
import useDragAndDrop from "./chatInput/hooks/use-drag-and-drop";
|
import useDragAndDrop from "./chatInput/hooks/use-drag-and-drop";
|
||||||
import ChatMessage from "./chatMessage";
|
import ChatMessage from "./chatMessage";
|
||||||
|
import { Button } from "../../../../components/ui/button";
|
||||||
|
|
||||||
export default function ChatView({
|
export default function ChatView({
|
||||||
sendMessage,
|
sendMessage,
|
||||||
|
|
@ -172,8 +173,10 @@ export default function ChatView({
|
||||||
>
|
>
|
||||||
<div className="eraser-size">
|
<div className="eraser-size">
|
||||||
<div className="eraser-position">
|
<div className="eraser-position">
|
||||||
<button
|
<Button
|
||||||
className="flex gap-1"
|
className="flex gap-1"
|
||||||
|
size="none"
|
||||||
|
variant="none"
|
||||||
onClick={() => handleSelectChange("builds")}
|
onClick={() => handleSelectChange("builds")}
|
||||||
>
|
>
|
||||||
<IconComponent
|
<IconComponent
|
||||||
|
|
@ -186,7 +189,7 @@ export default function ChatView({
|
||||||
)}
|
)}
|
||||||
aria-hidden="true"
|
aria-hidden="true"
|
||||||
/>
|
/>
|
||||||
</button>
|
</Button>
|
||||||
{/* <Select
|
{/* <Select
|
||||||
onValueChange={handleSelectChange}
|
onValueChange={handleSelectChange}
|
||||||
value=""
|
value=""
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue