Skip to content

fix(line-itin/itinerary-body): Use setActiveLeg from NarrativeItineraries #186

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
merged 3 commits into from
Jul 7, 2020
Merged

fix(line-itin/itinerary-body): Use setActiveLeg from NarrativeItineraries #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d411e6
fix(line-itin/itinerary-body): Use setActiveLeg as passed by Narrativ…
binh-dam-ibigroup Jul 2, 2020
07410de
docs(narrative-itineraries): Add comment to unify dispatched method s…
binh-dam-ibigroup Jul 2, 2020
d694c3a
style(NarrativeItineraries): Fix lint.
binh-dam-ibigroup Jul 6, 2020
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
2 changes: 0 additions & 2 deletions lib/components/narrative/line-itin/connected-itinerary-body.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { connect } from 'react-redux'
import styled from 'styled-components'

import { showLegDiagram } from '../../../actions/map'
import { setActiveLeg } from '../../../actions/narrative'
import { setViewedTrip } from '../../../actions/ui'
import TransitLegSubheader from './connected-transit-leg-subheader'
import TripDetails from '../connected-trip-details'
Expand Down Expand Up @@ -82,7 +81,6 @@ const mapStateToProps = (state, ownProps) => {
}

const mapDispatchToProps = {
setActiveLeg,
setViewedTrip,
showLegDiagram
}
Expand Down
10 changes: 9 additions & 1 deletion lib/components/narrative/line-itin/line-itinerary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export default class LineItinerary extends NarrativeItinerary {
itinerary,
itineraryFooter,
LegIcon,
setActiveLeg,
showRealtimeAnnotation,
onClick,
timeFormat
Expand All @@ -75,7 +76,14 @@ export default class LineItinerary extends NarrativeItinerary {
/>
{showRealtimeAnnotation && <SimpleRealtimeAnnotation />}
{active || expanded
? <ItineraryBody itinerary={itinerary} LegIcon={LegIcon} />
? <ItineraryBody
itinerary={itinerary}
LegIcon={LegIcon}
// Don't use setActiveLeg as an import
// (will cause error when clicking on itinerary suymmary).
// Use the one passed by NarrativeItineraries instead.
setActiveLeg={setActiveLeg}
/>
: null}
{itineraryFooter}
</LineItineraryContainer>
Expand Down
3 changes: 3 additions & 0 deletions lib/components/narrative/narrative-itineraries.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ const mapStateToProps = (state, ownProps) => {
}

const mapDispatchToProps = (dispatch, ownProps) => {
// FIXME: update signature of these methods,
// so that only one argument is passed,
// e.g. setActiveLeg({ index, leg })
return {
setActiveItinerary: index => {
dispatch(setActiveItinerary({index}))
Expand Down