7535 refactor picker compatible form #7807
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
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 |
|---|---|---|
| @@ -1,30 +1,49 @@ | ||
| import React from 'react'; | ||
| import RNPickerSelect from 'react-native-picker-select'; | ||
| import _ from 'underscore'; | ||
|
|
||
| import styles from '../../../styles/styles'; | ||
| import * as basePickerPropTypes from './basePickerPropTypes'; | ||
| import basePickerStyles from './basePickerStyles'; | ||
|
|
||
| class BasePicker extends React.Component { | ||
luacmartins marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| constructor(props) { | ||
| super(props); | ||
|
|
||
| this.state = { | ||
| selectedValue: this.props.value || this.props.defaultValue, | ||
| }; | ||
| } | ||
|
|
||
| handleChange = (value) => { | ||
|
There was a problem hiding this comment.
Reference: https://github.com/Expensify/App/blob/main/STYLE.md#functions-1 There was a problem hiding this comment. Also I found I can not use |
||
| this.props.onChange(value); | ||
| this.setState({selectedValue: value}); | ||
| } | ||
|
|
||
| render() { | ||
| const hasError = !_.isEmpty(this.props.errorText); | ||
| return ( | ||
| <RNPickerSelect | ||
| onValueChange={this.handleChange} | ||
| items={this.props.items} | ||
| style={this.props.size === 'normal' ? basePickerStyles(this.props.disabled, hasError, this.props.focused) : styles.pickerSmall} | ||
| useNativeAndroidPickerStyle={false} | ||
| placeholder={this.props.placeholder} | ||
| value={this.state.selectedValue} | ||
| Icon={() => this.props.icon(this.props.size)} | ||
| disabled={this.props.disabled} | ||
| fixAndroidTouchableBug | ||
| onOpen={this.props.onOpen} | ||
| onClose={this.props.onClose} | ||
| pickerProps={{ | ||
| onFocus: this.props.onOpen, | ||
| onBlur: this.props.onBlur, | ||
| ref: this.props.innerRef, | ||
| }} | ||
| /> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| BasePicker.propTypes = basePickerPropTypes.propTypes; | ||
| BasePicker.defaultProps = basePickerPropTypes.defaultProps; | ||
luacmartins marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
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 |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| import React from 'react'; | ||
| import {View} from 'react-native'; | ||
| import TextInput from '../components/TextInput'; | ||
| import Picker from '../components/Picker'; | ||
| import AddressSearch from '../components/AddressSearch'; | ||
| import Form from '../components/Form'; | ||
| import * as FormActions from '../libs/actions/FormActions'; | ||
|
|
@@ -14,7 +15,7 @@ import styles from '../styles/styles'; | |
| const story = { | ||
| title: 'Components/Form', | ||
| component: Form, | ||
| subcomponents: {TextInput, AddressSearch, Picker}, | ||
| }; | ||
|
|
||
| const Template = (args) => { | ||
|
|
@@ -46,6 +47,49 @@ const Template = (args) => { | |
| containerStyles={[styles.mt4]} | ||
| isFormInput | ||
| /> | ||
| <View> | ||
| <Picker | ||
| label="Fruit" | ||
| inputID="pickFruit" | ||
| containerStyles={[styles.mt4]} | ||
| shouldSaveDraft | ||
| items={[ | ||
| { | ||
| label: 'Select a Fruit', | ||
| value: '', | ||
| }, | ||
| { | ||
| label: 'Orange', | ||
| value: 'orange', | ||
| }, | ||
| { | ||
| label: 'Apple', | ||
| value: 'apple', | ||
| }, | ||
| ]} | ||
| isFormInput | ||
| /> | ||
| </View> | ||
| <Picker | ||
| label="Another Fruit" | ||
| inputID="pickAnotherFruit" | ||
| containerStyles={[styles.mt4]} | ||
| items={[ | ||
| { | ||
| label: 'Select a Fruit', | ||
| value: '', | ||
| }, | ||
| { | ||
| label: 'Orange', | ||
| value: 'orange', | ||
| }, | ||
| { | ||
| label: 'Apple', | ||
| value: 'apple', | ||
| }, | ||
| ]} | ||
| isFormInput | ||
| /> | ||
| </Form> | ||
| ); | ||
| }; | ||
|
|
@@ -68,6 +112,12 @@ const defaultArgs = { | |
| if (!values.accountNumber) { | ||
| errors.accountNumber = 'Please enter an account number'; | ||
| } | ||
| if (!values.pickFruit) { | ||
| errors.pickFruit = 'Please select a fruit'; | ||
| } | ||
| if (!values.pickAnotherFruit) { | ||
| errors.pickAnotherFruit = 'Please select a fruit'; | ||
| } | ||
| return errors; | ||
| }, | ||
| onSubmit: (values) => { | ||
|
|
@@ -83,13 +133,20 @@ const defaultArgs = { | |
| draftValues: { | ||
| routingNumber: '00001', | ||
| accountNumber: '1111222233331111', | ||
| pickFruit: 'orange', | ||
| pickAnotherFruit: 'apple', | ||
| }, | ||
| }; | ||
|
|
||
| Default.args = defaultArgs; | ||
| Loading.args = {...defaultArgs, formState: {isSubmitting: true}}; | ||
| ServerError.args = {...defaultArgs, formState: {isSubmitting: false, serverErrorMessage: 'There was an unexpected error. Please try again later.'}}; | ||
| InputError.args = { | ||
| ...defaultArgs, | ||
| draftValues: { | ||
| routingNumber: '', accountNumber: '', pickFruit: '', pickAnotherFruit: '', | ||
| }, | ||
| }; | ||
|
|
||
| export default story; | ||
| export { | ||
|
|
||
Oops, something went wrong.
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.
Please add comment