diff --git a/app/components/ui/input.tsx b/app/components/ui/input.tsx index 3edc039..3a7ee75 100644 --- a/app/components/ui/input.tsx +++ b/app/components/ui/input.tsx @@ -7,6 +7,7 @@ import { type RegisterOptions, } from 'react-hook-form' import { useRemixFormContext } from 'remix-hook-form' +import { twMerge } from 'tailwind-merge' import { EyeIcon } from '~/components/icons/eye' @@ -25,7 +26,15 @@ type TInputProperties = Omit< export const Input = >( properties: TInputProperties, ) => { - const { id, label, name, rules, type = 'text', ...rest } = properties + const { + id, + label, + name, + rules, + type = 'text', + placeholder, + ...rest + } = properties const [inputType, setInputType] = useState(type) const { @@ -46,7 +55,8 @@ export const Input = >( @@ -55,22 +65,17 @@ export const Input = >( type="button" variant="icon" size="fit" - className="absolute top-9 right-3 text-gray-500" + className="absolute right-3 h-[42px] text-gray-500" onClick={() => setInputType(inputType === 'password' ? 'text' : 'password') } > - {inputType === 'password' ? ( - - ) : ( - - )} + )} diff --git a/app/layouts/news/form-login.tsx b/app/layouts/news/form-login.tsx index a9463c1..48c4039 100644 --- a/app/layouts/news/form-login.tsx +++ b/app/layouts/news/form-login.tsx @@ -98,6 +98,7 @@ export const FormLogin = (properties: TProperties) => { }} className="font-semibold text-[#2E2F7C]" variant="link" + size="fit" > Reset Kata Sandi