Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert remove hint #8232

Merged
merged 8 commits into from
Mar 28, 2022
Merged

Revert remove hint #8232

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
13a45c0
revert remove hint
rushatgabhane Mar 18, 2022
1962e12
remove extra parentheses
rushatgabhane Mar 19, 2022
a410436
Merge branch 'Expensify:main' into revert-remove-hint
rushatgabhane Mar 22, 2022
90088fb
Merge branch 'Expensify:main' into revert-remove-hint
rushatgabhane Mar 24, 2022
970e9c2
add comment explaining why value is in state
rushatgabhane Mar 25, 2022
65c1dc7
Merge branch 'Expensify:main' into revert-remove-hint
rushatgabhane Mar 25, 2022
fe37758
cleanup - use _.isUndefined
rushatgabhane Mar 25, 2022
16b4eac
Merge branch 'revert-remove-hint' of github.com:rushatgabhane/Expensi…
rushatgabhane Mar 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/components/TextInput/BaseTextInput.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import themeColors from '../../styles/themes/default';
import styles from '../../styles/styles';
import Icon from '../Icon';
import * as Expensicons from '../Icon/Expensicons';
import InlineErrorText from '../InlineErrorText';
import Text from '../Text';
import * as styleConst from './styleConst';
import * as StyleUtils from '../../styles/StyleUtils';
Expand Down Expand Up @@ -188,6 +187,8 @@ class BaseTextInput extends Component {
// eslint-disable-next-line react/forbid-foreign-prop-types
const inputProps = _.omit(this.props, _.keys(baseTextInputPropTypes.propTypes));
const hasLabel = Boolean(this.props.label.length);
const inputHelpText = this.props.errorText || this.props.hint;
const formHelpStyles = this.props.errorText ? styles.formError : styles.formHelp;
const placeholder = (this.props.prefixCharacter || this.state.isFocused || !hasLabel || (hasLabel && this.props.forceActiveLabel)) ? this.props.placeholder : null;
const textInputContainerStyles = _.reduce([
styles.textInputContainer,
Expand Down Expand Up @@ -286,9 +287,11 @@ class BaseTextInput extends Component {
</View>
</TouchableWithoutFeedback>
</View>
<InlineErrorText styles={[styles.ph3]}>
{this.props.errorText}
</InlineErrorText>
{!_.isEmpty(inputHelpText) && (
<Text style={[formHelpStyles, styles.mt1, styles.ph3]}>
{inputHelpText}
</Text>
)}
</View>
{/*
Text input component doesn't support auto grow by default.
Expand Down