Skip to content

Fix pressing enter in workspace invite page will submit and proceed to invite message page #21935

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

Merged
puneetlath merged 1 commit into from
Jul 3, 2023
Merged

Fix pressing enter in workspace invite page will submit and proceed to invite message page #21935

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
86 changes: 40 additions & 46 deletions src/pages/workspace/WorkspaceInvitePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import compose from '../../libs/compose';
import ONYXKEYS from '../../ONYXKEYS';
import * as Policy from '../../libs/actions/Policy';
import FormAlertWithSubmitButton from '../../components/FormAlertWithSubmitButton';
import FormSubmit from '../../components/FormSubmit';
import OptionsSelector from '../../components/OptionsSelector';
import * as OptionsListUtils from '../../libs/OptionsListUtils';
import CONST from '../../CONST';
Expand Down Expand Up @@ -267,52 +266,47 @@ class WorkspaceInvitePage extends React.Component {
shouldShow={_.isEmpty(this.props.policy)}
onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)}
>
<FormSubmit
style={[styles.flex1]}
onSubmit={this.inviteUser}
>
<HeaderWithBackButton
title={this.props.translate('workspace.invite.invitePeople')}
subtitle={policyName}
shouldShowGetAssistanceButton
guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_MEMBERS}
onBackButtonPress={() => {
this.clearErrors();
Navigation.goBack(ROUTES.getWorkspaceMembersRoute(this.props.route.params.policyID));
}}
<HeaderWithBackButton
title={this.props.translate('workspace.invite.invitePeople')}
subtitle={policyName}
shouldShowGetAssistanceButton
guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_MEMBERS}
onBackButtonPress={() => {
this.clearErrors();
Navigation.goBack(ROUTES.getWorkspaceMembersRoute(this.props.route.params.policyID));
}}
/>
<View style={[styles.flexGrow1, styles.flexShrink0, styles.flexBasisAuto]}>
<OptionsSelector
contentContainerStyles={[styles.flexGrow1, styles.flexShrink0, styles.flexBasisAuto]}
listContainerStyles={[styles.flexGrow1, styles.flexShrink1, styles.flexBasis0]}
canSelectMultipleOptions
sections={sections}
selectedOptions={this.state.selectedOptions}
value={this.state.searchTerm}
shouldShowOptions={OptionsListUtils.isPersonalDetailsReady(this.props.personalDetails)}
onSelectRow={this.toggleOption}
onChangeText={this.updateOptionsWithSearchTerm}
onConfirmSelection={this.inviteUser}
headerMessage={headerMessage}
hideSectionHeaders
boldStyle
shouldFocusOnSelectRow={!Browser.isMobile()}
textInputLabel={this.props.translate('optionsSelector.nameEmailOrPhoneNumber')}
/>
<View style={[styles.flexGrow1, styles.flexShrink0, styles.flexBasisAuto]}>
<OptionsSelector
contentContainerStyles={[styles.flexGrow1, styles.flexShrink0, styles.flexBasisAuto]}
listContainerStyles={[styles.flexGrow1, styles.flexShrink1, styles.flexBasis0]}
canSelectMultipleOptions
sections={sections}
selectedOptions={this.state.selectedOptions}
value={this.state.searchTerm}
shouldShowOptions={OptionsListUtils.isPersonalDetailsReady(this.props.personalDetails)}
onSelectRow={this.toggleOption}
onChangeText={this.updateOptionsWithSearchTerm}
onConfirmSelection={this.inviteUser}
headerMessage={headerMessage}
hideSectionHeaders
boldStyle
shouldFocusOnSelectRow={!Browser.isMobile()}
textInputLabel={this.props.translate('optionsSelector.nameEmailOrPhoneNumber')}
/>
</View>
<View style={[styles.flexShrink0]}>
<FormAlertWithSubmitButton
isDisabled={!this.state.selectedOptions.length}
isAlertVisible={this.getShouldShowAlertPrompt()}
buttonText={this.props.translate('common.next')}
onSubmit={this.inviteUser}
message={this.props.policy.alertMessage}
containerStyles={[styles.flexReset, styles.flexGrow0, styles.flexShrink0, styles.flexBasisAuto, styles.mb5]}
enabledWhenOffline
disablePressOnEnter
/>
</View>
</FormSubmit>
</View>
<View style={[styles.flexShrink0]}>
<FormAlertWithSubmitButton
isDisabled={!this.state.selectedOptions.length}
isAlertVisible={this.getShouldShowAlertPrompt()}
buttonText={this.props.translate('common.next')}
onSubmit={this.inviteUser}
message={this.props.policy.alertMessage}
containerStyles={[styles.flexReset, styles.flexGrow0, styles.flexShrink0, styles.flexBasisAuto, styles.mb5]}
enabledWhenOffline
disablePressOnEnter
/>
</View>
</FullPageNotFoundView>
</ScreenWrapper>
);
Expand Down