[Wave 8] Ideal nav #33280
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains 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 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 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 |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ | |
| * */ | ||
| export default { | ||
| CENTRAL_PANE_NAVIGATOR: 'CentralPaneNavigator', | ||
| BOTTOM_TAB_NAVIGATOR: 'BottomTabNavigator', | ||
| LEFT_MODAL_NAVIGATOR: 'LeftModalNavigator', | ||
| RIGHT_MODAL_NAVIGATOR: 'RightModalNavigator', | ||
| FULL_SCREEN_NAVIGATOR: 'FullScreenNavigator', | ||
|
|
||
This file contains 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 |
|---|---|---|
|
|
@@ -14,6 +14,8 @@ function getUrlWithBackToParam<TUrl extends string>(url: TUrl, backTo?: string): | |
| const ROUTES = { | ||
| HOME: '', | ||
|
|
||
| ALL_SETTINGS: 'all-settings', | ||
|
|
||
| // This is a utility route used to go to the user's concierge chat, or the sign-in page if the user's not authenticated | ||
| CONCIERGE: 'concierge', | ||
| FLAG_COMMENT: { | ||
|
|
@@ -438,13 +440,17 @@ const ROUTES = { | |
| route: 'workspace/:policyID/invite-message', | ||
| getRoute: (policyID: string) => `workspace/${policyID}/invite-message` as const, | ||
| }, | ||
| WORKSPACE_OVERVIEW: { | ||
| route: 'workspace/:policyID/overview', | ||
| getRoute: (policyID: string) => `workspace/${policyID}/overview` as const, | ||
| }, | ||
| WORKSPACE_OVERVIEW_CURRENCY: { | ||
| route: 'workspace/:policyID/overview/currency', | ||
| getRoute: (policyID: string) => `workspace/${policyID}/overview/currency` as const, | ||
| }, | ||
| WORKSPACE_OVERVIEW_NAME: { | ||
| route: 'workspace/:policyID/overview/name', | ||
| getRoute: (policyID: string) => `workspace/${policyID}/overview/name` as const, | ||
| }, | ||
| WORKSPACE_CARD: { | ||
| route: 'workspace/:policyID/card', | ||
|
|
||
This file contains 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 |
|---|---|---|
|
|
@@ -12,11 +12,13 @@ const PROTECTED_SCREENS = { | |
|
|
||
| const SCREENS = { | ||
| ...PROTECTED_SCREENS, | ||
| ALL_SETTINGS: 'AllSettings', | ||
| REPORT: 'Report', | ||
| NOT_FOUND: 'not-found', | ||
| TRANSITION_BETWEEN_APPS: 'TransitionBetweenApps', | ||
| VALIDATE_LOGIN: 'ValidateLogin', | ||
| UNLINK_LOGIN: 'UnlinkLogin', | ||
| SETTINGS_CENTRAL_PANE: 'SettingsCentralPane', | ||
| SETTINGS: { | ||
| ROOT: 'Settings_Root', | ||
| SHARE_CODE: 'Settings_Share_Code', | ||
|
|
@@ -191,7 +193,7 @@ const SCREENS = { | |
|
|
||
| WORKSPACE: { | ||
| INITIAL: 'Workspace_Initial', | ||
| OVERVIEW: 'Workspace_Overview', | ||
| CARD: 'Workspace_Card', | ||
| REIMBURSE: 'Workspace_Reimburse', | ||
| RATE_AND_UNIT: 'Workspace_RateAndUnit', | ||
|
|
@@ -201,7 +203,8 @@ const SCREENS = { | |
| MEMBERS: 'Workspace_Members', | ||
| INVITE: 'Workspace_Invite', | ||
| INVITE_MESSAGE: 'Workspace_Invite_Message', | ||
| CURRENCY: 'Workspace_Overview_Currency', | ||
| NAME: 'Workspace_Overview_Name', | ||
| }, | ||
|
|
||
| EDIT_REQUEST: { | ||
|
|
||
This file contains 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 |
|---|---|---|
|
|
@@ -95,6 +95,9 @@ const propTypes = { | |
| horizontal: PropTypes.oneOf(_.values(CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL)), | ||
| vertical: PropTypes.oneOf(_.values(CONST.MODAL.ANCHOR_ORIGIN_VERTICAL)), | ||
| }), | ||
|
|
||
| /** Style applied to the avatar */ | ||
| avatarStyle: stylePropTypes.isRequired, | ||
| }; | ||
|
|
||
| const defaultProps = { | ||
|
|
@@ -142,6 +145,7 @@ function AvatarWithImagePicker({ | |
| anchorAlignment, | ||
| onImageSelected, | ||
| editorMaskImage, | ||
| avatarStyle, | ||
| }) { | ||
| const theme = useTheme(); | ||
| const styles = useThemeStyles(); | ||
|
|
@@ -288,7 +292,7 @@ function AvatarWithImagePicker({ | |
|
|
||
| return ( | ||
| <View style={StyleSheet.flatten([styles.alignItemsCenter, style])}> | ||
| <View style={[styles.pRelative, avatarStyle]}> | ||
| <OfflineWithFeedback | ||
| pendingAction={pendingAction} | ||
| errors={errors} | ||
|
|
@@ -306,8 +310,8 @@ function AvatarWithImagePicker({ | |
| <View> | ||
| {source ? ( | ||
| <Avatar | ||
| containerStyles={avatarStyle} | ||
| imageStyles={[avatarStyle, styles.alignSelfCenter]} | ||
| source={source} | ||
| fallbackIcon={fallbackIcon} | ||
| size={size} | ||
|
|
@@ -319,7 +323,7 @@ function AvatarWithImagePicker({ | |
| </View> | ||
| <View style={[styles.smallEditIcon, styles.smallAvatarEditIcon]}> | ||
| <Icon | ||
| src={Expensicons.Pencil} | ||
| width={variables.iconSizeSmall} | ||
| height={variables.iconSizeSmall} | ||
| fill={theme.icon} | ||
|
|
||
This file contains 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 |
|---|---|---|
|
|
@@ -40,6 +40,9 @@ const propTypes = { | |
|
|
||
| /** Forwarded ref to ContextMenuItem */ | ||
| innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]), | ||
|
|
||
| /** Should limit width. */ | ||
| shouldLimitWidth: PropTypes.bool, | ||
| }; | ||
|
|
||
| const defaultProps = { | ||
|
|
@@ -50,9 +53,10 @@ const defaultProps = { | |
| isAnonymousAction: false, | ||
| isFocused: false, | ||
| innerRef: null, | ||
| shouldLimitWidth: true, | ||
| }; | ||
|
|
||
| function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, description, isAnonymousAction, isFocused, innerRef, shouldLimitWidth}) { | ||
| const styles = useThemeStyles(); | ||
| const StyleUtils = useStyleUtils(); | ||
| const {windowWidth} = useWindowDimensions(); | ||
|
|
@@ -99,7 +103,7 @@ function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, | |
| success={!isThrottledButtonActive} | ||
| description={description} | ||
| descriptionTextStyle={styles.breakWord} | ||
| style={shouldLimitWidth && StyleUtils.getContextMenuItemStyles(windowWidth)} | ||
| isAnonymousAction={isAnonymousAction} | ||
| focused={isFocused} | ||
| interactive={isThrottledButtonActive} | ||
|
|
||
This file contains 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 |
|---|---|---|
|
|
@@ -7,7 +7,9 @@ import useLocalize from '@hooks/useLocalize'; | |
| import useTheme from '@hooks/useTheme'; | ||
| import useThemeStyles from '@hooks/useThemeStyles'; | ||
| import variables from '@styles/variables'; | ||
| import CONST from '@src/CONST'; | ||
| import PressableWithFeedback from './Pressable/PressableWithFeedback'; | ||
| import PressableWithoutFeedback from './Pressable/PressableWithoutFeedback'; | ||
| import Tooltip from './Tooltip/PopoverAnchorTooltip'; | ||
|
|
||
| const AnimatedPath = Animated.createAnimatedComponent(Path); | ||
|
|
@@ -88,38 +90,46 @@ const FloatingActionButton = React.forwardRef(({onPress, isActive, accessibility | |
| Platform.OS === 'web' ? undefined : adapter, | ||
| ); | ||
|
|
||
| const toggleFabAction = () => { | ||
| // Drop focus to avoid blue focus ring. | ||
| fabPressable.current.blur(); | ||
| onPress(); | ||
| }; | ||
|
|
||
| return ( | ||
| <Tooltip text={translate('common.new')}> | ||
| <PressableWithoutFeedback | ||
| role={CONST.ROLE.BUTTON} | ||
| style={[styles.h100]} | ||
| onPress={toggleFabAction} | ||
| > | ||
| <View style={styles.bottomTabBarItem}> | ||
| <AnimatedPressable | ||
| ref={(el) => { | ||
| fabPressable.current = el; | ||
| if (buttonRef) { | ||
| buttonRef.current = el; | ||
| } | ||
| }} | ||
| accessibilityLabel={accessibilityLabel} | ||
| role={role} | ||
| pressDimmingValue={1} | ||
| onPress={toggleFabAction} | ||
| onLongPress={() => {}} | ||
| style={[styles.floatingActionButton, animatedStyle]} | ||
| > | ||
| <Svg | ||
| width={variables.iconSizeNormal} | ||
| height={variables.iconSizeNormal} | ||
| > | ||
| <AnimatedPath | ||
| d="M12,3c0-1.1-0.9-2-2-2C8.9,1,8,1.9,8,3v5H3c-1.1,0-2,0.9-2,2c0,1.1,0.9,2,2,2h5v5c0,1.1,0.9,2,2,2c1.1,0,2-0.9,2-2v-5h5c1.1,0,2-0.9,2-2c0-1.1-0.9-2-2-2h-5V3z" | ||
| animatedProps={animatedProps} | ||
| /> | ||
| </Svg> | ||
| </AnimatedPressable> | ||
| </View> | ||
| </PressableWithoutFeedback> | ||
| </Tooltip> | ||
| ); | ||
| }); | ||
|
|
||
This file contains 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 |
|---|---|---|
|
|
@@ -70,7 +70,7 @@ function HeaderWithBackButton({ | |
| // Hover on some part of close icons will not work on Electron if dragArea is true | ||
| // https://github.com/Expensify/App/issues/29598 | ||
| dataSet={{dragArea: false}} | ||
| style={[styles.headerBar, shouldShowBorderBottom && styles.borderBottom, shouldShowBackButton ? styles.pl2 : styles.pl5]} | ||
| > | ||
| <View style={[styles.dFlex, styles.flexRow, styles.alignItemsCenter, styles.flexGrow1, styles.justifyContentBetween, styles.overflowHidden]}> | ||
| {shouldShowBackButton && ( | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a reason that we need to check for
Settings_Root? Shouldn't we check forFullScreenNavigatorinstead?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have to keep the
Settings_Rootscreen unmounted, so the full-screen account settings work properly. This is the LHN presentingInitialSettingsPage. It has to be mounted all the time the account settings are opened.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would be nice to add comment explaining this in more detail and also rename the variable name to match the behaviour more closely