Skip to content

[MoneyRequestConfirmation] add hover style to fields on the money confirmation modal #18347

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
marcochavezf merged 4 commits into from
May 4, 2023
Merged

[MoneyRequestConfirmation] add hover style to fields on the money confirmation modal #18347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
612eadc
feat: add hover style to money request modal
Prince-Mendiratta May 3, 2023
6028d82
feat: add extra margins
Prince-Mendiratta May 3, 2023
74e2084
fix: use ternary operators
Prince-Mendiratta May 3, 2023
cf8fa02
fix: use prop for both scenarios
Prince-Mendiratta May 4, 2023
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
7 changes: 3 additions & 4 deletions src/components/MoneyRequestConfirmationList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ class MoneyRequestConfirmationList extends Component {
boldStyle
shouldTextInputAppearBelowOptions
shouldShowTextInput={false}
shouldUseStyleForChildren={false}
optionHoveredStyle={canModifyParticipants ? styles.hoveredComponentBG : {}}
footerContent={shouldShowSettlementButton
? (
Expand All @@ -313,19 +314,17 @@ class MoneyRequestConfirmationList extends Component {
shouldShowRightIcon
title={formattedAmount}
description={this.props.translate('iou.amount')}
interactive={false} // This is so the menu item's background doesn't change color on hover
onPress={() => this.props.navigateToStep(0)}
style={styles.moneyRequestMenuItem}
style={[styles.moneyRequestMenuItem, styles.mt2]}
titleStyle={styles.moneyRequestConfirmationAmount}
disabled={this.state.didConfirm}
/>
<MenuItemWithTopDescription
shouldShowRightIcon
title={this.props.iou.comment}
description={this.props.translate('common.description')}
interactive={false} // This is so the menu item's background doesn't change color on hover
onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_DESCRIPTION)}
style={styles.moneyRequestMenuItem}
style={[styles.moneyRequestMenuItem, styles.mb2]}
disabled={this.state.didConfirm}
/>
</OptionsSelector>
Expand Down
4 changes: 2 additions & 2 deletions src/components/OptionsSelector/BaseOptionsSelector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,14 +334,14 @@ class BaseOptionsSelector extends Component {
<View style={[styles.flexGrow0, styles.flexShrink1, styles.flexBasisAuto, styles.w100, styles.flexRow]}>
{optionsList}
</View>
<View style={[styles.ph5, styles.pv5, styles.flexGrow1, styles.flexShrink0]}>
<View style={this.props.shouldUseStyleForChildren ? [styles.ph5, styles.pv5, styles.flexGrow1, styles.flexShrink0] : []}>

@aimane-chnaif aimane-chnaif May 4, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's make sure that styles.flexGrow1, styles.flexShrink0 removal doesn't cause any regressions, though I tested and confirmed.

@Prince-Mendiratta Prince-Mendiratta May 4, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aimane-chnaif Yes, I tested again and can confirm, doesn't look prone to any regressions.

I tried resizing the window on desktop and web and the existence / lack thereof flex styles does not affect the position or behaviour.

{this.props.children}
{this.props.shouldShowTextInput && textInput}
</View>
</>
) : (
<>
<View style={[styles.ph5, styles.pb3]}>
<View style={this.props.shouldUseStyleForChildren ? [styles.ph5, styles.pb3] : []}>
{this.props.children}
{this.props.shouldShowTextInput && textInput}
</View>
Expand Down
4 changes: 4 additions & 0 deletions src/components/OptionsSelector/optionsSelectorPropTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ const propTypes = {

/** Key of the option that we should focus on when first opening the options list */
initiallyFocusedOptionKey: PropTypes.string,

/** Whether to use default padding and flex styles for children */
shouldUseStyleForChildren: PropTypes.bool,
};

const defaultProps = {
Expand Down Expand Up @@ -130,6 +133,7 @@ const defaultProps = {
maxLength: undefined,
shouldShowTextInput: true,
onChangeText: () => {},
shouldUseStyleForChildren: true,
};

export {propTypes, defaultProps};
3 changes: 2 additions & 1 deletion src/styles/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2310,7 +2310,8 @@ const styles = {
borderRadius: 0,
justifyContent: 'space-between',
width: '100%',
marginBottom: 20,
paddingHorizontal: 20,
paddingVertical: 12,
},

iouPreviewBox: {
Expand Down