diff --git a/components/FormikFields/PaperInputPicker/index.js b/components/FormikFields/PaperInputPicker/index.js index 141a16335..25b112bdc 100644 --- a/components/FormikFields/PaperInputPicker/index.js +++ b/components/FormikFields/PaperInputPicker/index.js @@ -1,6 +1,6 @@ import * as React from 'react'; import { - View, Text, StyleSheet + View, Text } from 'react-native'; import { TextInput, Button, Headline @@ -13,9 +13,10 @@ import getLocation from '../../../modules/geolocation'; import PaperButton from '../../Button'; import { theme, layout } from '../../../modules/theme'; -import styles from './index.style'; +import { stylesDefault, stylesPaper, styleX } from './index.style'; import I18n from '../../../modules/i18n'; +import styles from '../../ResidentIdSearchbar/index.styles'; const PaperInputPicker = ({ data, formikProps, scrollViewScroll, setScrollViewScroll, surveyingOrganization, @@ -53,14 +54,18 @@ const PaperInputPicker = ({ return ( <> {fieldType === 'input' && ( - + + {translatedLabel.length > 20 && + {translatedLabel} + } 20 ? "" : translatedLabel} onChangeText={handleChange(formikKey)} onBlur={handleBlur(formikKey)} {...rest} //eslint-disable-line mode="outlined" - theme={{ colors: { placeholder: theme.colors.primary }, text: 'black' }} + theme={stylesPaper} + style={stylesDefault.label} /> {errors[formikKey]} @@ -68,15 +73,19 @@ const PaperInputPicker = ({ )} {fieldType === 'numberInput' && ( - + + {translatedLabel.length > 20 && + {translatedLabel} + } 20 ? "" : translatedLabel} onChangeText={handleChange(formikKey)} onBlur={handleBlur(formikKey)} {...rest} //eslint-disable-line mode="outlined" keyboardType="numeric" - theme={{ colors: { placeholder: theme.colors.primary }, text: 'black' }} + theme={stylesPaper} + style={stylesDefault.label} /> {errors[formikKey]} @@ -84,7 +93,7 @@ const PaperInputPicker = ({ )} {fieldType === 'inputSideLabel' && ( - + )} {fieldType === 'inputSideLabelNum' && ( - + {translatedLabelSide} @@ -123,8 +132,8 @@ const PaperInputPicker = ({ )} {fieldType === 'inputSideLabelTextQuestNumber' && ( - - {translatedLabel} + + {translatedLabel} )} {fieldType === 'inputSideBySideLabel' && ( - + )} {fieldType === 'select' && ( - - {translatedLabel} + + {translatedLabel} {data.options.map((result) => ( @@ -191,7 +200,7 @@ const PaperInputPicker = ({ )} {/* non-selected value */} {result.value !== values[formikKey] && ( - +