Merge pull request #61 from binarapps/chore/clean-up-form-inputs

Chore/clean up form inputs

Author: MateuszRostkowski

src/components/screens/profile/ProfileControlledInput.tsx

@@ -0,0 +1,44 @@
+import { ControlledField } from '@baca/components'
+import { isWeb } from '@baca/constants'
+import { Text, Box } from '@baca/design-system'
+import { useWeb } from '@baca/hooks'
+import { ProfileControlledInputProps } from '@baca/types/ProfileInputProps'
+
+export const ProfileControlledInput = ({
+  label,
+  name,
+  placeholder,
+  control,
+  errors,
+  isDisabled = false,
+  onFocus,
+  onSubmitEditing,
+}: ProfileControlledInputProps) => {
+  const { shouldApplyMobileStyles } = useWeb()
+
+  return (
+    <Box
+      justifyContent="space-between"
+      flexDirection={isWeb && !shouldApplyMobileStyles ? 'row' : 'column'}
+      mb={isWeb ? 10 : 0}
+      maxW={800}
+    >
+      <Text.SmBold flex={1}>{label}</Text.SmBold>
+      <Box flex={isWeb ? 2 : 0}>
+        <ControlledField.Input
+          control={control}
+          errors={errors}
+          autoCapitalize="none"
+          inputMode={name === 'email' ? 'email' : 'text'}
+          name={name}
+          placeholder={placeholder}
+          testID={`${name}Input`}
+          isDisabled={isDisabled}
+          onFocus={onFocus}
+          onSubmitEditing={onSubmitEditing}
+          {...(!isWeb && { label })}
+        />
+      </Box>
+    </Box>
+  )
+}

src/components/screens/profile/ProfileDetailsForm.tsx

@@ -1,12 +1,13 @@
-import { ControlledField } from '@baca/components'
-import { isWeb } from '@baca/constants'
-import { Text, Box, Button, Spacer, Row } from '@baca/design-system'
-import { useCallback, useTranslation, useUpdateProfileForm, useWeb } from '@baca/hooks'
+import { Box, Button, Spacer, Row } from '@baca/design-system'
+import { useUpdateProfileForm } from '@baca/hooks'
 import { useRouter } from 'expo-router'
+import { useCallback } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { ProfileControlledInput } from './ProfileControlledInput'
 
 export const ProfileDetailsForm = () => {
   const { t } = useTranslation()
-  const { shouldApplyMobileStyles } = useWeb()
   const { control, errors, setFocus, submit, isSubmitting } = useUpdateProfileForm()
   const { back } = useRouter()
 
@@ -15,72 +16,30 @@ export const ProfileDetailsForm = () => {
   return (
     <Box>
       <Box borderColor="border.secondary" borderTopWidth={1} py={6}>
-        <Box
-          justifyContent="space-between"
-          flexDirection={isWeb && !shouldApplyMobileStyles ? 'row' : 'column'}
-          mb={isWeb ? 10 : 0}
-          maxW={800}
-        >
-          <Text.SmBold flex={1}>{t('form.labels.first_name')}</Text.SmBold>
-          <Box flex={isWeb ? 2 : 0}>
-            <ControlledField.Input
-              {...{ control, errors }}
-              autoCapitalize="none"
-              inputMode="text"
-              name="firstName"
-              onFocus={focusLastNameInput}
-              placeholder={t('form.placeholders.first_name')}
-              testID="firstNameInput"
-              {...(!isWeb && {
-                label: t('form.labels.first_name'),
-              })}
-            />
-          </Box>
-        </Box>
-        <Box
-          justifyContent="space-between"
-          flexDirection={isWeb && !shouldApplyMobileStyles ? 'row' : 'column'}
-          mb={isWeb ? 10 : 0}
-          maxW={800}
-        >
-          <Text.SmBold flex={1}>{t('form.labels.last_name')}</Text.SmBold>
-          <Box flex={isWeb ? 2 : 0}>
-            <ControlledField.Input
-              {...{ control, errors }}
-              autoCapitalize="none"
-              inputMode="text"
-              name="lastName"
-              placeholder={t('form.placeholders.last_name')}
-              testID="lastNameInput"
-              {...(!isWeb && {
-                label: t('form.labels.last_name'),
-              })}
-            />
-          </Box>
-        </Box>
-        <Box
-          justifyContent="space-between"
-          flexDirection={isWeb && !shouldApplyMobileStyles ? 'row' : 'column'}
-          mb={isWeb ? 10 : 0}
-          maxW={800}
-        >
-          <Text.SmBold flex={1}>{t('form.labels.email')}</Text.SmBold>
-          <Box flex={isWeb ? 2 : 0}>
-            <ControlledField.Input
-              {...{ control, errors }}
-              autoCapitalize="none"
-              inputMode="email"
-              isDisabled
-              name="email"
-              onSubmitEditing={submit}
-              placeholder={t('form.placeholders.email')}
-              testID="emailInput"
-              {...(!isWeb && {
-                label: t('form.labels.email'),
-              })}
-            />
-          </Box>
-        </Box>
+        <ProfileControlledInput
+          label={t('form.labels.first_name')}
+          name="firstName"
+          placeholder={t('form.placeholders.first_name')}
+          control={control}
+          errors={errors}
+          onFocus={focusLastNameInput}
+        />
+        <ProfileControlledInput
+          label={t('form.labels.last_name')}
+          name="lastName"
+          placeholder={t('form.placeholders.last_name')}
+          control={control}
+          errors={errors}
+        />
+        <ProfileControlledInput
+          label={t('form.labels.email')}
+          name="email"
+          placeholder={t('form.placeholders.email')}
+          control={control}
+          errors={errors}
+          isDisabled
+          onSubmitEditing={submit}
+        />
         <Row maxW={800} justifyContent="flex-end">
           <Button.SecondaryColor
             disabled={isSubmitting}

src/types/ProfileInputProps.ts

@@ -0,0 +1,12 @@
+import { Control, FieldErrors } from 'react-hook-form'
+
+export type ProfileControlledInputProps = {
+  label: string
+  name: string
+  placeholder: string
+  control: Control
+  errors: FieldErrors
+  isDisabled?: boolean
+  onFocus?: () => void
+  onSubmitEditing?: () => void
+}