Solved closing of keyboard on changing text field on profile page #9441
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ import lodashGet from 'lodash/get'; | |
| import React, {Component} from 'react'; | ||
| import {withOnyx} from 'react-native-onyx'; | ||
| import PropTypes from 'prop-types'; | ||
| import {View} from 'react-native'; | ||
| import Str from 'expensify-common/lib/str'; | ||
| import moment from 'moment-timezone'; | ||
| import _ from 'underscore'; | ||
|
|
@@ -17,16 +17,16 @@ import styles from '../../../styles/styles'; | |
| import Text from '../../../components/Text'; | ||
| import LoginField from './LoginField'; | ||
| import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize'; | ||
| import * as Localize from '../../../libs/Localize'; | ||
| import compose from '../../../libs/compose'; | ||
| import TextInput from '../../../components/TextInput'; | ||
| import Picker from '../../../components/Picker'; | ||
| import CheckboxWithLabel from '../../../components/CheckboxWithLabel'; | ||
| import AvatarWithImagePicker from '../../../components/AvatarWithImagePicker'; | ||
| import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes, withCurrentUserPersonalDetailsDefaultProps} from '../../../components/withCurrentUserPersonalDetails'; | ||
| import * as ValidationUtils from '../../../libs/ValidationUtils'; | ||
| import * as ReportUtils from '../../../libs/ReportUtils'; | ||
| import Form from '../../../components/Form'; | ||
| import OfflineWithFeedback from '../../../components/OfflineWithFeedback'; | ||
|
|
||
| const propTypes = { | ||
|
|
@@ -65,24 +65,19 @@ class ProfilePage extends Component { | |
| constructor(props) { | ||
| super(props); | ||
|
|
||
| this.defaultAvatar = ReportUtils.getDefaultAvatar(this.props.currentUserPersonalDetails.login); | ||
| this.avatar = {uri: lodashGet(this.props.currentUserPersonalDetails, 'avatar') || this.defaultAvatar}; | ||
| this.pronouns = props.currentUserPersonalDetails.pronouns; | ||
| this.state = { | ||
liyamahendra marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| logins: this.getLogins(props.loginList), | ||
| selectedTimezone: lodashGet(props.currentUserPersonalDetails.timezone, 'selected', CONST.DEFAULT_TIME_ZONE.selected), | ||
| isAutomaticTimezone: lodashGet(props.currentUserPersonalDetails.timezone, 'automatic', CONST.DEFAULT_TIME_ZONE.automatic), | ||
| hasSelfSelectedPronouns: !_.isEmpty(props.currentUserPersonalDetails.pronouns) && !props.currentUserPersonalDetails.pronouns.startsWith(CONST.PRONOUNS.PREFIX), | ||
| }; | ||
|
|
||
| this.getLogins = this.getLogins.bind(this); | ||
| this.validate = this.validate.bind(this); | ||
| this.updatePersonalDetails = this.updatePersonalDetails.bind(this); | ||
| } | ||
|
|
||
| componentDidUpdate(prevProps) { | ||
|
|
@@ -101,18 +96,6 @@ class ProfilePage extends Component { | |
| this.setState(stateToUpdate); | ||
| } | ||
|
|
||
luacmartins marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| /** | ||
| * Get the most validated login of each type | ||
| * | ||
|
|
@@ -145,51 +128,74 @@ class ProfilePage extends Component { | |
|
|
||
| /** | ||
| * Submit form to update personal details | ||
| * @param {Object} values | ||
liyamahendra marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| * @param {String} values.firstName | ||
| * @param {String} values.lastName | ||
| * @param {String} values.pronouns | ||
| * @param {Boolean} values.isAutomaticTimezone | ||
| * @param {String} values.timezone | ||
| * @param {String} values.selfSelectedPronoun | ||
| */ | ||
liyamahendra marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| updatePersonalDetails(values) { | ||
| PersonalDetails.updateProfile( | ||
| values.firstName.trim(), | ||
| values.lastName.trim(), | ||
| (this.state.hasSelfSelectedPronouns) ? values.selfSelectedPronoun.trim() : values.pronouns.trim(), | ||
| { | ||
| automatic: values.isAutomaticTimezone, | ||
| selected: values.timezone, | ||
liyamahendra marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }, | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * @param {Object} values - An object containing the value of each inputID | ||
liyamahendra marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| * @param {String} values.firstName | ||
| * @param {String} values.lastName | ||
| * @param {String} values.pronouns | ||
| * @param {Boolean} values.isAutomaticTimezone | ||
| * @param {String} values.timezone | ||
| * @param {String} values.selfSelectedPronoun | ||
| * @returns {Object} - An object containing the errors for each inputID | ||
| */ | ||
| validate(values) { | ||
liyamahendra marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| const errors = {}; | ||
|
|
||
| const [hasFirstNameError, hasLastNameError, hasPronounError] = ValidationUtils.doesFailCharacterLimitAfterTrim( | ||
| CONST.FORM_CHARACTER_LIMIT, | ||
| [values.firstName, values.lastName, values.pronouns], | ||
| ); | ||
|
|
||
| const hasSelfSelectedPronouns = values.pronouns === CONST.PRONOUNS.SELF_SELECT; | ||
| this.pronouns = hasSelfSelectedPronouns ? '' : values.pronouns; | ||
| this.setState({ | ||
| hasSelfSelectedPronouns, | ||
luacmartins marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| isAutomaticTimezone: values.isAutomaticTimezone, | ||
| selectedTimezone: values.isAutomaticTimezone ? moment.tz.guess() : values.timezone, | ||
| }); | ||
|
|
||
| if (hasFirstNameError) { | ||
| errors.firstName = Localize.translateLocal('personalDetails.error.characterLimit', {limit: CONST.FORM_CHARACTER_LIMIT}); | ||
| } | ||
|
|
||
| if (hasLastNameError) { | ||
| errors.lastName = Localize.translateLocal('personalDetails.error.characterLimit', {limit: CONST.FORM_CHARACTER_LIMIT}); | ||
| } | ||
|
|
||
| if (hasPronounError) { | ||
| errors.pronouns = Localize.translateLocal('personalDetails.error.characterLimit', {limit: CONST.FORM_CHARACTER_LIMIT}); | ||
| } | ||
|
|
||
| return errors; | ||
| } | ||
|
|
||
| render() { | ||
| const pronounsList = _.map(this.props.translate('pronouns'), (value, key) => ({ | ||
| label: value, | ||
| value: `${CONST.PRONOUNS.PREFIX}${key}`, | ||
| })); | ||
| const currentUserDetails = this.props.currentUserPersonalDetails || {}; | ||
| const pronounsPickerValue = this.state.hasSelfSelectedPronouns ? CONST.PRONOUNS.SELF_SELECT : this.pronouns; | ||
|
|
||
| return ( | ||
| <ScreenWrapper> | ||
|
|
@@ -199,10 +205,16 @@ class ProfilePage extends Component { | |
| onBackButtonPress={() => Navigation.navigate(ROUTES.SETTINGS)} | ||
| onCloseButtonPress={() => Navigation.dismissModal(true)} | ||
| /> | ||
| <Form | ||
| style={[styles.flexGrow1, styles.ph5]} | ||
| formID={CONST.PROFILE_SETTINGS_FORM} | ||
|
Contributor
There was a problem hiding this comment. FYI now'days we put the form IDs here: Lines 171 to 176 in ff5affd |
||
| validate={this.validate} | ||
| onSubmit={this.updatePersonalDetails} | ||
| submitButtonText={this.props.translate('common.save')} | ||
| > | ||
| <OfflineWithFeedback | ||
| pendingAction={lodashGet(this.props.currentUserPersonalDetails, 'pendingFields.avatar', null)} | ||
| errors={lodashGet(this.props.currentUserPersonalDetails, 'errorFields.avatar', null)} | ||
| errorRowStyles={[styles.mt6]} | ||
| onClose={PersonalDetails.clearAvatarErrors} | ||
| > | ||
|
|
@@ -213,45 +225,49 @@ class ProfilePage extends Component { | |
| onImageRemoved={PersonalDetails.deleteAvatar} | ||
| anchorPosition={styles.createMenuPositionProfile} | ||
| size={CONST.AVATAR_SIZE.LARGE} | ||
liyamahendra marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| /> | ||
| </OfflineWithFeedback> | ||
| <Text style={[styles.mt6, styles.mb6]}> | ||
| {this.props.translate('profilePage.tellUsAboutYourself')} | ||
| </Text> | ||
|
|
||
liyamahendra marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <View style={[styles.flexRow, styles.mt4, styles.mb4]}> | ||
| <View style={styles.flex1}> | ||
| <TextInput | ||
| inputID="firstName" | ||
| name="fname" | ||
| label={this.props.translate('common.firstName')} | ||
| defaultValue={lodashGet(currentUserDetails, 'firstName', '')} | ||
| placeholder={this.props.translate('profilePage.john')} | ||
| /> | ||
| </View> | ||
| <View style={[styles.flex1, styles.ml2]}> | ||
| <TextInput | ||
| inputID="lastName" | ||
| name="lname" | ||
| label={this.props.translate('common.lastName')} | ||
| defaultValue={lodashGet(currentUserDetails, 'lastName', '')} | ||
| placeholder={this.props.translate('profilePage.doe')} | ||
| /> | ||
| </View> | ||
| </View> | ||
| <View style={styles.mb6}> | ||
| <Picker | ||
| inputID="pronouns" | ||
| label={this.props.translate('profilePage.preferredPronouns')} | ||
| items={pronounsList} | ||
| placeholder={{ | ||
| value: '', | ||
| label: this.props.translate('profilePage.selectYourPronouns'), | ||
| }} | ||
| defaultValue={pronounsPickerValue} | ||
| /> | ||
| {this.state.hasSelfSelectedPronouns && ( | ||
| <View style={styles.mt2}> | ||
| <TextInput | ||
| inputID="selfSelectedPronoun" | ||
| defaultValue={this.pronouns} | ||
| placeholder={this.props.translate('profilePage.selfSelectYourPronoun')} | ||
| /> | ||
| </View> | ||
| )} | ||
|
|
@@ -260,37 +276,30 @@ class ProfilePage extends Component { | |
| label={this.props.translate('profilePage.emailAddress')} | ||
| type="email" | ||
| login={this.state.logins.email} | ||
| defaultValue={this.state.logins.email} | ||
| /> | ||
| <LoginField | ||
| label={this.props.translate('common.phoneNumber')} | ||
| type="phone" | ||
| login={this.state.logins.phone} | ||
| defaultValue={this.state.logins.phone} | ||
| /> | ||
| <View style={styles.mb3}> | ||
| <Picker | ||
| inputID="timezone" | ||
| label={this.props.translate('profilePage.timezone')} | ||
| items={timezones} | ||
| isDisabled={this.state.isAutomaticTimezone} | ||
| defaultValue={this.state.selectedTimezone} | ||
| value={this.state.selectedTimezone} | ||
| /> | ||
| </View> | ||
| <CheckboxWithLabel | ||
| inputID="isAutomaticTimezone" | ||
| label={this.props.translate('profilePage.setMyTimezoneAutomatically')} | ||
| defaultValue={this.state.isAutomaticTimezone} | ||
| /> | ||
| </Form> | ||
| </ScreenWrapper> | ||
| ); | ||
| } | ||
|
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.