Skip to content
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.

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

refactor navigation modal card styles #12366

Merged
merged 3 commits into from
Nov 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 8 additions & 3 deletions src/libs/Navigation/AppNavigator/modalCardStyleInterpolator.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,15 @@ export default (
cardStyle.transform = [{translateX}];
}

return ({
containerStyle: {
let containerStyle;
if (!isSmallScreenWidth) {
containerStyle = {
overflow: 'hidden',
},
};
}

return ({
containerStyle,
cardStyle,
overlayStyle: {
opacity: progress.interpolate({
Expand Down
1 change: 1 addition & 0 deletions src/pages/SearchPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ class SearchPage extends Component {
hideAdditionalOptionStates
showTitleTooltip
shouldShowOptions={didScreenTransitionEnd}
shouldDelayFocus
/>
</View>
</>
Expand Down
1 change: 1 addition & 0 deletions src/pages/iou/IOUCurrencySelection.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ class IOUCurrencySelection extends Component {
onChangeText={this.changeSearchValue}
placeholderText={this.props.translate('common.search')}
headerMessage={headerMessage}
shouldDelayFocus
/>
</ScreenWrapper>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ class IOUParticipantsRequest extends Component {
headerMessage={headerMessage}
hideAdditionalOptionStates
forceTextUnreadStyle
shouldDelayFocus
/>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ class IOUParticipantsSplit extends Component {
shouldShowConfirmButton
confirmButtonText={this.props.translate('common.next')}
onConfirmSelection={this.finalizeParticipants}
shouldDelayFocus
/>
</View>
</>
Expand Down
4 changes: 1 addition & 3 deletions src/styles/cardStyles/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ import variables from '../variables';
*/
export default function getCardStyles(isSmallScreenWidth, screenWidth) {
return {
position: 'fixed',
width: isSmallScreenWidth ? screenWidth : variables.sideBarWidth,
right: 0,
height: '100%',
alignSelf: 'flex-end',
Copy link
Collaborator

Choose a reason for hiding this comment

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

here too height?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes, I explained that in proposal.
height

};
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import variables from '../variables';

export default isSmallScreenWidth => ({
position: 'absolute',
top: 0,
right: 0,
width: isSmallScreenWidth ? '100%' : variables.sideBarWidth,
backgroundColor: 'transparent',
height: '100%',
alignSelf: 'flex-end',
});
1 change: 0 additions & 1 deletion src/styles/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -2074,7 +2074,6 @@ const styles = {

navigationScreenCardStyle: {
backgroundColor: themeColors.appBG,
height: '100%',
},

navigationSceneFullScreenWrapper: {
Expand Down