Add waypoints list and add stop button #23698
There are no files selected for viewing
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
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 |
|---|---|---|
| @@ -1,40 +1,155 @@ | ||
| import React, {useEffect, useState} from 'react'; | ||
| import {ScrollView, View} from 'react-native'; | ||
| import lodashGet from 'lodash/get'; | ||
| import _ from 'underscore'; | ||
| import PropTypes from 'prop-types'; | ||
| import {withOnyx} from 'react-native-onyx'; | ||
| import ONYXKEYS from '../ONYXKEYS'; | ||
| import * as Transaction from '../libs/actions/Transaction'; | ||
| import MenuItemWithTopDescription from './MenuItemWithTopDescription'; | ||
| import withLocalize, {withLocalizePropTypes} from './withLocalize'; | ||
| import compose from '../libs/compose'; | ||
| import * as Expensicons from './Icon/Expensicons'; | ||
| import theme from '../styles/themes/default'; | ||
| import Button from './Button'; | ||
| import styles from '../styles/styles'; | ||
| import variables from '../styles/variables'; | ||
| import LinearGradient from './LinearGradient'; | ||
|
|
||
| const MAX_WAYPOINTS = 25; | ||
| const MAX_WAYPOINTS_TO_DISPLAY = 4; | ||
|
|
||
| const propTypes = { | ||
| /** The transactionID of this request */ | ||
| transactionID: PropTypes.string, | ||
|
|
||
| /** The optimistic transaction for this request */ | ||
| transaction: PropTypes.shape({ | ||
| /** The transactionID of this request */ | ||
| transactionID: PropTypes.string, | ||
|
|
||
| /** The comment object on the transaction */ | ||
| comment: PropTypes.shape({ | ||
| /** The waypoints defining the distance request */ | ||
| waypoints: PropTypes.shape({ | ||
| /** The latitude of the waypoint */ | ||
| lat: PropTypes.number, | ||
|
|
||
| /** The longitude of the waypoint */ | ||
| lng: PropTypes.number, | ||
|
|
||
| /** The address of the waypoint */ | ||
| address: PropTypes.string, | ||
| }), | ||
| }), | ||
| }), | ||
|
|
||
| ...withLocalizePropTypes, | ||
| }; | ||
|
|
||
| const defaultProps = { | ||
| transactionID: '', | ||
| transaction: {}, | ||
| }; | ||
|
|
||
| function DistanceRequest({transactionID, transaction, translate}) { | ||
| const [shouldShowGradient, setShouldShowGradient] = useState(false); | ||
| const [scrollContainerHeight, setScrollContainerHeight] = useState(0); | ||
| const [scrollContentHeight, setScrollContentHeight] = useState(0); | ||
|
|
||
| const waypoints = lodashGet(transaction, 'comment.waypoints', {}); | ||
| const numberOfWaypoints = _.size(waypoints); | ||
| const lastWaypointIndex = numberOfWaypoints - 1; | ||
|
|
||
| // Show up to the max number of waypoints plus 1/2 of one to hint at scrolling | ||
| const halfMenuItemHeight = Math.floor(variables.baseMenuItemHeight / 2); | ||
| const scrollContainerMaxHeight = variables.baseMenuItemHeight * MAX_WAYPOINTS_TO_DISPLAY + halfMenuItemHeight; | ||
|
|
||
| useEffect(() => { | ||
| if (!transaction.transactionID || !_.isEmpty(waypoints)) { | ||
| return; | ||
| } | ||
| // Create the initial start and stop waypoints | ||
| Transaction.createInitialWaypoints(transaction.transactionID); | ||
| }, [transaction.transactionID, waypoints]); | ||
|
|
||
| const updateGradientVisibility = (event = {}) => { | ||
| // If a waypoint extends past the bottom of the visible area show the gradient, else hide it. | ||
| const visibleAreaEnd = lodashGet(event, 'nativeEvent.contentOffset.y', 0) + scrollContainerHeight; | ||
| setShouldShowGradient(visibleAreaEnd < scrollContentHeight); | ||
| }; | ||
|
|
||
| useEffect(updateGradientVisibility, [scrollContainerHeight, scrollContentHeight]); | ||
|
|
||
| return ( | ||
| <> | ||
| <View | ||
| style={{maxHeight: scrollContainerMaxHeight}} | ||
| onLayout={(event = {}) => setScrollContainerHeight(lodashGet(event, 'nativeEvent.layout.height', 0))} | ||
| > | ||
| <ScrollView | ||
| onContentSizeChange={(width, height) => setScrollContentHeight(height)} | ||
| onScroll={updateGradientVisibility} | ||
| scrollEventThrottle={16} | ||
|
There was a problem hiding this comment. Should this value need to be a CONST? |
||
| > | ||
| {_.map(waypoints, (waypoint, key) => { | ||
| // key is of the form waypoint0, waypoint1, ... | ||
| const index = Number(key.replace('waypoint', '')); | ||
| let descriptionKey = 'distance.waypointDescription.'; | ||
| let waypointIcon; | ||
| if (index === 0) { | ||
| descriptionKey += 'start'; | ||
| waypointIcon = Expensicons.DotIndicatorUnfilled; | ||
| } else if (index === lastWaypointIndex) { | ||
| descriptionKey += 'finish'; | ||
| waypointIcon = Expensicons.Location; | ||
| } else { | ||
| descriptionKey += 'stop'; | ||
| waypointIcon = Expensicons.DotIndicator; | ||
| } | ||
|
|
||
| return ( | ||
| <MenuItemWithTopDescription | ||
| description={translate(descriptionKey)} | ||
| icon={Expensicons.DragHandles} | ||
| secondaryIcon={waypointIcon} | ||
| secondaryIconFill={theme.icon} | ||
| shouldShowRightIcon | ||
| key={key} | ||
| /> | ||
| ); | ||
| })} | ||
| </ScrollView> | ||
| {shouldShowGradient && ( | ||
| <LinearGradient | ||
| style={[styles.pAbsolute, styles.b0, styles.l0, styles.r0, {height: halfMenuItemHeight}]} | ||
| colors={[theme.transparent, theme.modalBackground]} | ||
| /> | ||
| )} | ||
| </View> | ||
| <View style={[styles.flexRow, styles.justifyContentCenter, styles.pt1]}> | ||
| <Button | ||
| small | ||
| icon={Expensicons.Plus} | ||
| onPress={() => Transaction.addStop(transactionID, lastWaypointIndex + 1)} | ||
| text={translate('distance.addStop')} | ||
| isDisabled={numberOfWaypoints === MAX_WAYPOINTS} | ||
| innerStyles={[styles.ph10]} | ||
| /> | ||
| </View> | ||
| </> | ||
| ); | ||
| } | ||
|
|
||
| DistanceRequest.displayName = 'DistanceRequest'; | ||
| DistanceRequest.propTypes = propTypes; | ||
| DistanceRequest.defaultProps = defaultProps; | ||
| export default compose( | ||
| withLocalize, | ||
| withOnyx({ | ||
| transaction: { | ||
| key: (props) => `${ONYXKEYS.COLLECTION.TRANSACTION}${props.transactionID}`, | ||
| selector: (transaction) => (transaction ? {transactionID: transaction.transactionID, comment: {waypoints: lodashGet(transaction, 'comment.waypoints')}} : null), | ||
| }, | ||
| }), | ||
| )(DistanceRequest); | ||
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 |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| import LinearGradient from 'react-native-web-linear-gradient'; | ||
|
|
||
| export default LinearGradient; |
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 |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| import LinearGradient from 'react-native-linear-gradient'; | ||
|
|
||
| export default LinearGradient; |
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.
Default props can be set while destructing props
https://github.com/Expensify/App/blob/main/contributingGuides/STYLE.md#destructuring
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.
I tried that but then eslint complained. Many components still use default props so I think we can keep this for now. cc @hayata-suenaga since you wrote this, what do you think is happening here?
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.
I thought we returned down that ESLint rule
@neil-marcellini what is the exact ESLint rule that is warning?