From 6b8b57abb7bf38d5142739ec4946f7e770b00e22 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 24 Nov 2022 12:45:55 -0700 Subject: [PATCH] Revert "refactor navigation modal card styles" --- .../AppNavigator/modalCardStyleInterpolator.js | 11 +++-------- src/pages/SearchPage.js | 1 - src/pages/iou/IOUCurrencySelection.js | 1 - .../IOUParticipantsPage/IOUParticipantsRequest.js | 1 - .../steps/IOUParticipantsPage/IOUParticipantsSplit.js | 1 - src/styles/cardStyles/index.js | 4 +++- .../getBaseNavigationModalCardStyles.js | 5 ++++- src/styles/styles.js | 1 + 8 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/libs/Navigation/AppNavigator/modalCardStyleInterpolator.js b/src/libs/Navigation/AppNavigator/modalCardStyleInterpolator.js index cf16d687d555..433620deecb9 100644 --- a/src/libs/Navigation/AppNavigator/modalCardStyleInterpolator.js +++ b/src/libs/Navigation/AppNavigator/modalCardStyleInterpolator.js @@ -28,15 +28,10 @@ export default ( cardStyle.transform = [{translateX}]; } - let containerStyle; - if (!isSmallScreenWidth) { - containerStyle = { - overflow: 'hidden', - }; - } - return ({ - containerStyle, + containerStyle: { + overflow: 'hidden', + }, cardStyle, overlayStyle: { opacity: progress.interpolate({ diff --git a/src/pages/SearchPage.js b/src/pages/SearchPage.js index 15b01aed72cd..6ec57cd0c991 100755 --- a/src/pages/SearchPage.js +++ b/src/pages/SearchPage.js @@ -184,7 +184,6 @@ class SearchPage extends Component { hideAdditionalOptionStates showTitleTooltip shouldShowOptions={didScreenTransitionEnd} - shouldDelayFocus /> diff --git a/src/pages/iou/IOUCurrencySelection.js b/src/pages/iou/IOUCurrencySelection.js index d5b555f40338..2621b19ce81f 100644 --- a/src/pages/iou/IOUCurrencySelection.js +++ b/src/pages/iou/IOUCurrencySelection.js @@ -126,7 +126,6 @@ class IOUCurrencySelection extends Component { onChangeText={this.changeSearchValue} placeholderText={this.props.translate('common.search')} headerMessage={headerMessage} - shouldDelayFocus /> ); diff --git a/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsRequest.js b/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsRequest.js index 815c9f5c7551..fb68f8571fa1 100755 --- a/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsRequest.js +++ b/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsRequest.js @@ -139,7 +139,6 @@ class IOUParticipantsRequest extends Component { headerMessage={headerMessage} hideAdditionalOptionStates forceTextUnreadStyle - shouldDelayFocus /> ); } diff --git a/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsSplit.js b/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsSplit.js index ede766410457..76a694b664ae 100755 --- a/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsSplit.js +++ b/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsSplit.js @@ -226,7 +226,6 @@ class IOUParticipantsSplit extends Component { shouldShowConfirmButton confirmButtonText={this.props.translate('common.next')} onConfirmSelection={this.finalizeParticipants} - shouldDelayFocus /> diff --git a/src/styles/cardStyles/index.js b/src/styles/cardStyles/index.js index 662beb6390cd..4759700c6f92 100644 --- a/src/styles/cardStyles/index.js +++ b/src/styles/cardStyles/index.js @@ -8,7 +8,9 @@ import variables from '../variables'; */ export default function getCardStyles(isSmallScreenWidth, screenWidth) { return { + position: 'fixed', width: isSmallScreenWidth ? screenWidth : variables.sideBarWidth, - alignSelf: 'flex-end', + right: 0, + height: '100%', }; } diff --git a/src/styles/getNavigationModalCardStyles/getBaseNavigationModalCardStyles.js b/src/styles/getNavigationModalCardStyles/getBaseNavigationModalCardStyles.js index cb66f8052281..1e3634cff83a 100644 --- a/src/styles/getNavigationModalCardStyles/getBaseNavigationModalCardStyles.js +++ b/src/styles/getNavigationModalCardStyles/getBaseNavigationModalCardStyles.js @@ -1,7 +1,10 @@ import variables from '../variables'; export default isSmallScreenWidth => ({ + position: 'absolute', + top: 0, + right: 0, width: isSmallScreenWidth ? '100%' : variables.sideBarWidth, backgroundColor: 'transparent', - alignSelf: 'flex-end', + height: '100%', }); diff --git a/src/styles/styles.js b/src/styles/styles.js index 081333327875..a7642d64adf2 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -2073,6 +2073,7 @@ const styles = { navigationScreenCardStyle: { backgroundColor: themeColors.appBG, + height: '100%', }, navigationSceneFullScreenWrapper: {