From f1ddd0aa1c3fb9490a5965a6883ed61fccc817b6 Mon Sep 17 00:00:00 2001 From: Charleen Chen Date: Mon, 21 Oct 2024 19:00:02 -0700 Subject: [PATCH 1/4] Created Textarea from shadcn --- package-lock.json | 23 ++++++++++++++++++++ package.json | 1 + src/components/global/inputs/textarea.tsx | 14 ++++++------ src/components/ui/label.tsx | 26 +++++++++++++++++++++++ src/components/ui/textarea.tsx | 24 +++++++++++++++++++++ 5 files changed, 82 insertions(+), 6 deletions(-) create mode 100644 src/components/ui/label.tsx create mode 100644 src/components/ui/textarea.tsx diff --git a/package-lock.json b/package-lock.json index 7633c23..5f31482 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "0.1.0", "dependencies": { "@radix-ui/react-alert-dialog": "^1.1.2", + "@radix-ui/react-label": "^2.1.0", "@radix-ui/react-slot": "^1.1.0", "@tanstack/react-query": "^5.53.3", "class-variance-authority": "^0.7.0", @@ -727,6 +728,28 @@ } } }, + "node_modules/@radix-ui/react-label": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.0.tgz", + "integrity": "sha512-peLblDlFw/ngk3UWq0VnYaOLy6agTZZ+MUO/WhVfm14vJGML+xH4FAl2XQGLqdefjNb7ApRg6Yn7U42ZhmYXdw==", + "dependencies": { + "@radix-ui/react-primitive": "2.0.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, "node_modules/@radix-ui/react-portal": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.2.tgz", diff --git a/package.json b/package.json index 4224942..f6150af 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ }, "dependencies": { "@radix-ui/react-alert-dialog": "^1.1.2", + "@radix-ui/react-label": "^2.1.0", "@radix-ui/react-slot": "^1.1.0", "@tanstack/react-query": "^5.53.3", "class-variance-authority": "^0.7.0", diff --git a/src/components/global/inputs/textarea.tsx b/src/components/global/inputs/textarea.tsx index 3500537..afc5f38 100644 --- a/src/components/global/inputs/textarea.tsx +++ b/src/components/global/inputs/textarea.tsx @@ -1,13 +1,15 @@ import { TextareaInput } from "@/types/questions"; +import { Label } from "@/components/ui/label" +import { Textarea as TextareShadCN} from "@/components/ui/textarea" const Textarea = ({ meta }: { meta: TextareaInput }) => { const { title, placeholder } = meta; - return ( -
- {title} {placeholder} +
+ +
- ); -}; + ) +} -export default Textarea; +export default Textarea; \ No newline at end of file diff --git a/src/components/ui/label.tsx b/src/components/ui/label.tsx new file mode 100644 index 0000000..5341821 --- /dev/null +++ b/src/components/ui/label.tsx @@ -0,0 +1,26 @@ +"use client" + +import * as React from "react" +import * as LabelPrimitive from "@radix-ui/react-label" +import { cva, type VariantProps } from "class-variance-authority" + +import { cn } from "@/lib/utils" + +const labelVariants = cva( + "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70" +) + +const Label = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef & + VariantProps +>(({ className, ...props }, ref) => ( + +)) +Label.displayName = LabelPrimitive.Root.displayName + +export { Label } diff --git a/src/components/ui/textarea.tsx b/src/components/ui/textarea.tsx new file mode 100644 index 0000000..9f9a6dc --- /dev/null +++ b/src/components/ui/textarea.tsx @@ -0,0 +1,24 @@ +import * as React from "react" + +import { cn } from "@/lib/utils" + +export interface TextareaProps + extends React.TextareaHTMLAttributes {} + +const Textarea = React.forwardRef( + ({ className, ...props }, ref) => { + return ( +