Standardize form error styles #12098
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,16 +3,14 @@ import {View} from 'react-native'; | |
| import PropTypes from 'prop-types'; | ||
| import React from 'react'; | ||
| import {withNetwork} from './OnyxProvider'; | ||
| import RenderHTML from './RenderHTML'; | ||
| import Text from './Text'; | ||
| import TextLink from './TextLink'; | ||
| import compose from '../libs/compose'; | ||
| import networkPropTypes from './networkPropTypes'; | ||
| import styles from '../styles/styles'; | ||
| import withLocalize, {withLocalizePropTypes} from './withLocalize'; | ||
| import FormHelpMessage from './FormHelpMessage'; | ||
|
|
||
| const propTypes = { | ||
| /** Wrapped child components */ | ||
|
|
@@ -52,38 +50,35 @@ const defaultProps = { | |
| // | ||
| // This component takes other components as a child prop. It will then render any wrapped components as a function using "render props", | ||
| // and passes it a (bool) isOffline parameter. Child components can then use the isOffline variable to determine offline behavior. | ||
| const FormAlertWrapper = (props) => { | ||
| let children; | ||
| if (_.isEmpty(props.message)) { | ||
| children = ( | ||
| <Text style={[styles.formError, styles.mb0]}> | ||
| {`${props.translate('common.please')} `} | ||
| <TextLink | ||
| style={styles.label} | ||
| onPress={props.onFixTheErrorsLinkPressed} | ||
| > | ||
| {props.translate('common.fixTheErrors')} | ||
| </TextLink> | ||
| {` ${props.translate('common.inTheFormBeforeContinuing')}.`} | ||
| </Text> | ||
| ); | ||
| } else if (props.isMessageHtml) { | ||
| children = <RenderHTML html={`<muted-text>${props.message}</muted-text>`} />; | ||
|
There was a problem hiding this comment. You will have to modify the style for Also, please add a new story that usage There was a problem hiding this comment. @parasharrajat this is done |
||
| } | ||
| return ( | ||
| <View style={props.containerStyles}> | ||
| {props.isAlertVisible && ( | ||
| <FormHelpMessage message={props.message} style={[styles.mb3]}> | ||
| {children} | ||
| </FormHelpMessage> | ||
| )} | ||
| {props.children(props.network.isOffline)} | ||
|
There was a problem hiding this comment. I'm lost. Why did we need this? Can't we just subscribe to the Onyx |
||
| </View> | ||
| ); | ||
| }; | ||
|
|
||
| FormAlertWrapper.propTypes = propTypes; | ||
| FormAlertWrapper.defaultProps = defaultProps; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,56 @@ | ||||||
| import React from 'react'; | ||||||
| import _ from 'underscore'; | ||||||
| import PropTypes from 'prop-types'; | ||||||
| import {View} from 'react-native'; | ||||||
| import Icon from './Icon'; | ||||||
| import * as Expensicons from './Icon/Expensicons'; | ||||||
| import Text from './Text'; | ||||||
| import colors from '../styles/colors'; | ||||||
| import styles from '../styles/styles'; | ||||||
| import stylePropTypes from '../styles/stylePropTypes'; | ||||||
|
|
||||||
| const propTypes = { | ||||||
| /** Error or hint text. Ignored when children is not empty */ | ||||||
| message: PropTypes.string, | ||||||
|
|
||||||
| /** Children to render next to dot indicator */ | ||||||
| children: PropTypes.node, | ||||||
|
|
||||||
| /** Indicates whether to show error or hint */ | ||||||
| isError: PropTypes.bool, | ||||||
|
|
||||||
| /** Container style props */ | ||||||
| style: stylePropTypes, | ||||||
| }; | ||||||
|
|
||||||
| const defaultProps = { | ||||||
| message: '', | ||||||
| children: null, | ||||||
| isError: true, | ||||||
| style: [], | ||||||
| }; | ||||||
|
|
||||||
| const FormHelpMessage = (props) => { | ||||||
| if (_.isEmpty(props.message) && _.isEmpty(props.children)) { | ||||||
| return null; | ||||||
| } | ||||||
|
|
||||||
| return ( | ||||||
| <View style={[styles.flexRow, styles.alignItemsCenter, styles.mt2, styles.mb1, ...props.style]}> | ||||||
| {props.isError && <Icon src={Expensicons.DotIndicator} fill={colors.red} />} | ||||||
| <View style={[styles.flex1, styles.ml2]}> | ||||||
| {props.children || ( | ||||||
| <Text style={[props.isError ? styles.formError : styles.formHelp, styles.mb0]}> | ||||||
|
There was a problem hiding this comment.
Suggested change
Do we need mb0 here? There was a problem hiding this comment. yes because both |
||||||
| {props.message} | ||||||
| </Text> | ||||||
| )} | ||||||
| </View> | ||||||
| </View> | ||||||
| ); | ||||||
| }; | ||||||
|
|
||||||
| FormHelpMessage.propTypes = propTypes; | ||||||
| FormHelpMessage.defaultProps = defaultProps; | ||||||
| FormHelpMessage.displayName = 'FormHelpMessage'; | ||||||
|
|
||||||
| export default FormHelpMessage; | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@marcaaron that was already existing code before this PR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok thanks, let's see maybe it was me who added it lol