Merge pull request #50 from abusix/pla-727-network-management-typo-an…

…d-ui-fixes feat(textarea): add minimum height
abusix · Oct 17, 2023 · 657f9a8 · 657f9a8
2 parents 8380fa2 + bcedb37
commit 657f9a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/components/form-field/textarea/textarea.tsx b/src/components/form-field/textarea/textarea.tsx
@@ -11,6 +11,7 @@ export interface TextareaProps {
     disabled?: boolean;
     rows?: number;
     cols?: number;
+    className?: string;
 }
 
 export const Textarea = ({
@@ -23,6 +24,7 @@ export const Textarea = ({
     disabled,
     rows,
     cols,
+    className,
 }: TextareaProps) => {
     return (
         <textarea
@@ -33,12 +35,13 @@ export const Textarea = ({
             placeholder={placeholder}
             aria-describedby={ariaDescribedBy}
             className={classNames(
-                "paragraph-100 block w-full rounded border border-neutral-400 py-2 pl-3 pr-2 text-neutral-800 placeholder:text-neutral-600 focus:outline-none",
+                "paragraph-100 block min-h-[2rem] w-full rounded border border-neutral-400 py-2 pl-3 pr-2 text-neutral-800 placeholder:text-neutral-600 focus:outline-none",
                 disabled && "cursor-not-allowed bg-neutral-100 text-neutral-600",
                 !error &&
                     !disabled &&
                     "hover:border-neutral-600 focus:border-primary-400 focus:ring-2 focus:ring-primary-200",
-                error && !disabled && "border-danger-500"
+                error && !disabled && "border-danger-500",
+                className
             )}
             disabled={disabled}
             rows={rows}

diff --git a/src/components/skeleton/skeleton.tsx b/src/components/skeleton/skeleton.tsx
@@ -10,7 +10,7 @@ export const Skeleton = ({ className, isAnimated = false }: SkeletonProps) => {
     return (
         <span
             className={classNames(
-                "block bg-neutral-100 rounded-sm",
+                "block rounded-sm bg-neutral-100",
                 isAnimated && "animate-pulse",
                 className
             )}