fix

sopt-makers · Dec 5, 2024 · 8db8de3 · 8db8de3
1 parent 3deaaad
commit 8db8de3
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/packages/ui/Input/TextArea.tsx b/packages/ui/Input/TextArea.tsx
@@ -45,11 +45,7 @@ const TextArea = forwardRef<HTMLTextAreaElement, TextAreaProps>((props, forwarde
   const { onChange, ...restInputProps } = inputProps;
   const { disabled, readOnly, required } = restInputProps;
 
-<<<<<<< Updated upstream
   const isValid = validationFn ? validationFn(value ?? '') : true;
-=======
-  const isValid = validationFn ? validationFn(value) : true;
->>>>>>> Stashed changes
   const isEmpty = value && value.length === 0;
 
   const submitButtonRef = useRef<HTMLButtonElement | null>(null);
@@ -175,13 +171,8 @@ const TextArea = forwardRef<HTMLTextAreaElement, TextAreaProps>((props, forwarde
           )}
 
           {maxLength ? (
-<<<<<<< Updated upstream
             <p className={`${S.count} ${!isEmpty && value && value.length > maxLength ? S.maxCount : ''}`}>
               {value?.length}/{maxLength}
-=======
-            <p className={`${S.count} ${!isEmpty && value.length > maxLength ? S.maxCount : ''}`}>
-              {value.length}/{maxLength}
->>>>>>> Stashed changes
             </p>
           ) : null}
         </div>