From 05a7ed215b27cf5c4f77d5115037febff4b141fc Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Thu, 10 Aug 2023 14:13:34 +0300
Subject: [PATCH] Improve input customization

---
 .../src/components/Common/TextArea.tsx        | 33 +++++++------------
 .../src/components/Common/TextInput.tsx       |  9 +++--
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/rsconcept/frontend/src/components/Common/TextArea.tsx b/rsconcept/frontend/src/components/Common/TextArea.tsx
index fc84493c..ec8ceed8 100644
--- a/rsconcept/frontend/src/components/Common/TextArea.tsx
+++ b/rsconcept/frontend/src/components/Common/TextArea.tsx
@@ -1,24 +1,20 @@
+import { TextareaHTMLAttributes } from 'react';
+
 import Label from './Label';
 
-interface TextAreaProps {
-  id: string
+interface TextAreaProps 
+extends Omit<TextareaHTMLAttributes<HTMLTextAreaElement>, 'className'> {
   label: string
-  required?: boolean
-  disabled?: boolean
-  spellCheck?: boolean
-  placeholder?: string
   widthClass?: string
-  rows?: number
-  value?: string | ReadonlyArray<string> | number | undefined;
-  onChange?: (event: React.ChangeEvent<HTMLTextAreaElement>) => void
-  onFocus?: () => void
+  colorClass?: string
 }
 
 function TextArea({
-  id, label, placeholder,
-  required, spellCheck, disabled,
-  widthClass = 'w-full', rows = 4, value,
-  onChange, onFocus
+  id, label, required,
+  widthClass = 'w-full',
+  colorClass = 'colorClass',
+  rows = 4,
+  ...props
 }: TextAreaProps) {
   return (
     <div className='flex flex-col items-start [&:not(:first-child)]:mt-3'>
@@ -28,15 +24,10 @@ function TextArea({
         htmlFor={id}
       />
       <textarea id={id}
-          className={`px-3 py-2 mt-2 leading-tight border shadow clr-input ${widthClass}`}
+          className={`px-3 py-2 mt-2 leading-tight border shadow ${colorClass} ${widthClass}`}
           rows={rows}
-          placeholder={placeholder}
           required={required}
-          value={value}
-          onChange={onChange}
-          onFocus={onFocus}
-          disabled={disabled}
-          spellCheck={spellCheck}
+          {...props}
       />
     </div>
   );
diff --git a/rsconcept/frontend/src/components/Common/TextInput.tsx b/rsconcept/frontend/src/components/Common/TextInput.tsx
index 82ba75c7..5e1ddbe1 100644
--- a/rsconcept/frontend/src/components/Common/TextInput.tsx
+++ b/rsconcept/frontend/src/components/Common/TextInput.tsx
@@ -3,14 +3,17 @@ import { type InputHTMLAttributes } from 'react';
 import Label from './Label';
 
 interface TextInputProps
-  extends Omit<InputHTMLAttributes<HTMLInputElement>, 'className'> {
+extends Omit<InputHTMLAttributes<HTMLInputElement>, 'className'> {
   id: string
   label: string
   widthClass?: string
+  colorClass?: string
 }
 
 function TextInput({
-  id, required, label, widthClass = 'w-full',
+  id, required, label,
+  widthClass = 'w-full',
+  colorClass = 'clr-input',
   ...props
 }: TextInputProps) {
   return (
@@ -21,7 +24,7 @@ function TextInput({
         htmlFor={id}
       />
       <input id={id}
-        className={`px-3 py-2 mt-2 leading-tight border shadow truncate hover:text-clip clr-input ${widthClass}`}
+        className={`px-3 py-2 mt-2 leading-tight border shadow truncate hover:text-clip ${colorClass} ${widthClass}`}
         required={required}
         {...props}
       />