Skip to content

Commit 105975a

Browse files
binh-dam-ibigroupbinh-dam-ibigroup
authored
Merge branch 'dev' into bundle-visualizer
2 parents 579633e + 5fe3bba commit 105975a

24 files changed

+293
-341
lines changed

‎__tests__/components/viewers/__snapshots__/nearby-view.js.snap‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4840,7 +4840,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
48404840
>
48414841
<styled.div>
48424842
<div
4843-
className="sc-DJgqy hBRUWj"
4843+
className="sc-DJgqy hRwxkI"
48444844
>
48454845
<styled.div>
48464846
<div
@@ -5268,7 +5268,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
52685268
>
52695269
<styled.div>
52705270
<div
5271-
className="sc-DJgqy hBRUWj"
5271+
className="sc-DJgqy hRwxkI"
52725272
>
52735273
<styled.div>
52745274
<div
@@ -5696,7 +5696,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
56965696
>
56975697
<styled.div>
56985698
<div
5699-
className="sc-DJgqy hBRUWj"
5699+
className="sc-DJgqy hRwxkI"
57005700
>
57015701
<styled.div>
57025702
<div
@@ -8314,7 +8314,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
83148314
>
83158315
<styled.div>
83168316
<div
8317-
className="sc-DJgqy hBRUWj"
8317+
className="sc-DJgqy hRwxkI"
83188318
>
83198319
<Connect(StopCardHeader)
83208320
actionIcon={
@@ -16617,7 +16617,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
1661716617
>
1661816618
<styled.div>
1661916619
<div
16620-
className="sc-DJgqy hBRUWj"
16620+
className="sc-DJgqy hRwxkI"
1662116621
>
1662216622
<Connect(StopCardHeader)
1662316623
actionIcon={
@@ -21657,7 +21657,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
2165721657
>
2165821658
<styled.div>
2165921659
<div
21660-
className="sc-DJgqy hBRUWj"
21660+
className="sc-DJgqy hRwxkI"
2166121661
>
2166221662
<styled.div>
2166321663
<div
@@ -22085,7 +22085,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
2208522085
>
2208622086
<styled.div>
2208722087
<div
22088-
className="sc-DJgqy hBRUWj"
22088+
className="sc-DJgqy hRwxkI"
2208922089
>
2209022090
<styled.div>
2209122091
<div
@@ -22513,7 +22513,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
2251322513
>
2251422514
<styled.div>
2251522515
<div
22516-
className="sc-DJgqy hBRUWj"
22516+
className="sc-DJgqy hRwxkI"
2251722517
>
2251822518
<styled.div>
2251922519
<div
@@ -25439,7 +25439,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
2543925439
>
2544025440
<styled.div>
2544125441
<div
25442-
className="sc-DJgqy hBRUWj"
25442+
className="sc-DJgqy hRwxkI"
2544325443
>
2544425444
<Connect(StopCardHeader)
2544525445
actionIcon={
@@ -33293,7 +33293,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
3329333293
>
3329433294
<styled.div>
3329533295
<div
33296-
className="sc-DJgqy hBRUWj"
33296+
className="sc-DJgqy hRwxkI"
3329733297
>
3329833298
<styled.div>
3329933299
<div
@@ -33721,7 +33721,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
3372133721
>
3372233722
<styled.div>
3372333723
<div
33724-
className="sc-DJgqy hBRUWj"
33724+
className="sc-DJgqy hRwxkI"
3372533725
>
3372633726
<styled.div>
3372733727
<div
@@ -34149,7 +34149,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
3414934149
>
3415034150
<styled.div>
3415134151
<div
34152-
className="sc-DJgqy hBRUWj"
34152+
className="sc-DJgqy hRwxkI"
3415334153
>
3415434154
<styled.div>
3415534155
<div
@@ -34577,7 +34577,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
3457734577
>
3457834578
<styled.div>
3457934579
<div
34580-
className="sc-DJgqy hBRUWj"
34580+
className="sc-DJgqy hRwxkI"
3458134581
>
3458234582
<styled.div>
3458334583
<div
@@ -35005,7 +35005,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
3500535005
>
3500635006
<styled.div>
3500735007
<div
35008-
className="sc-DJgqy hBRUWj"
35008+
className="sc-DJgqy hRwxkI"
3500935009
>
3501035010
<styled.div>
3501135011
<div
@@ -36819,7 +36819,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
3681936819
>
3682036820
<styled.div>
3682136821
<div
36822-
className="sc-DJgqy hBRUWj"
36822+
className="sc-DJgqy hRwxkI"
3682336823
>
3682436824
<Connect(StopCardHeader)
3682536825
actionIcon={
@@ -41883,7 +41883,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
4188341883
>
4188441884
<styled.div>
4188541885
<div
41886-
className="sc-DJgqy hBRUWj"
41886+
className="sc-DJgqy hRwxkI"
4188741887
>
4188841888
<styled.div>
4188941889
<div
@@ -44397,7 +44397,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
4439744397
>
4439844398
<styled.div>
4439944399
<div
44400-
className="sc-DJgqy hBRUWj"
44400+
className="sc-DJgqy hRwxkI"
4440144401
>
4440244402
<Connect(StopCardHeader)
4440344403
actionIcon={
@@ -52130,7 +52130,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
5213052130
>
5213152131
<styled.div>
5213252132
<div
52133-
className="sc-DJgqy hBRUWj"
52133+
className="sc-DJgqy hRwxkI"
5213452134
>
5213552135
<Connect(StopCardHeader)
5213652136
actionIcon={
@@ -61733,7 +61733,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
6173361733
>
6173461734
<styled.div>
6173561735
<div
61736-
className="sc-DJgqy hBRUWj"
61736+
className="sc-DJgqy hRwxkI"
6173761737
>
6173861738
<styled.div>
6173961739
<div
@@ -64351,7 +64351,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
6435164351
>
6435264352
<styled.div>
6435364353
<div
64354-
className="sc-DJgqy hBRUWj"
64354+
className="sc-DJgqy hRwxkI"
6435564355
>
6435664356
<Connect(StopCardHeader)
6435764357
actionIcon={

‎__tests__/components/viewers/__snapshots__/stop-schedule-viewer.ts.snap‎

Lines changed: 0 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -175,96 +175,6 @@ exports[`components > viewers > stop viewer should render with initial stop id a
175175
<div
176176
className="stop-viewer-header"
177177
>
178-
<div
179-
className="back-button-container"
180-
>
181-
<Button
182-
active={false}
183-
block={false}
184-
bsClass="btn"
185-
bsSize="small"
186-
bsStyle="default"
187-
disabled={false}
188-
onClick={[Function]}
189-
>
190-
<button
191-
className="btn btn-sm btn-default"
192-
disabled={false}
193-
onClick={[Function]}
194-
type="button"
195-
>
196-
<IconWithText
197-
Icon={
198-
Object {
199-
"$$typeof": Symbol(react.forward_ref),
200-
"displayName": "ArrowLeft",
201-
"render": [Function],
202-
}
203-
}
204-
>
205-
<div
206-
style={
207-
Object {
208-
"display": "contents",
209-
}
210-
}
211-
>
212-
<Styled(styled.span)>
213-
<span
214-
className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
215-
>
216-
<ArrowLeft>
217-
<StyledIconBase
218-
iconAttrs={
219-
Object {
220-
"fill": "currentColor",
221-
"xmlns": "http://www.w3.org/2000/svg",
222-
}
223-
}
224-
iconVerticalAlign="middle"
225-
iconViewBox="0 0 448 512"
226-
>
227-
<ForwardRef
228-
className="StyledIconBase-sc-ea9ulj-0 fqiNOa"
229-
iconAttrs={
230-
Object {
231-
"fill": "currentColor",
232-
"xmlns": "http://www.w3.org/2000/svg",
233-
}
234-
}
235-
iconVerticalAlign="middle"
236-
iconViewBox="0 0 448 512"
237-
>
238-
<svg
239-
aria-hidden="true"
240-
className="StyledIconBase-sc-ea9ulj-0 fqiNOa"
241-
fill="currentColor"
242-
focusable="false"
243-
viewBox="0 0 448 512"
244-
xmlns="http://www.w3.org/2000/svg"
245-
>
246-
<path
247-
d="M9.4 233.4c-12.5 12.5-12.5 32.8 0 45.3l160 160c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3L109.2 288H416c17.7 0 32-14.3 32-32s-14.3-32-32-32H109.3l105.3-105.4c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0l-160 160z"
248-
fill="currentColor"
249-
/>
250-
</svg>
251-
</ForwardRef>
252-
</StyledIconBase>
253-
</ArrowLeft>
254-
</span>
255-
</Styled(styled.span)>
256-
<span>
257-
<FormattedMessage
258-
id="common.forms.back"
259-
>
260-
common.forms.back
261-
</FormattedMessage>
262-
</span>
263-
</div>
264-
</IconWithText>
265-
</button>
266-
</Button>
267-
</div>
268178
<styled.div>
269179
<div
270180
className="sc-bTRMho cgDuJk"

‎example/example-config.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -693,6 +693,8 @@ disableSingleItineraryDays: false
693693
# hideRouteShapesWithinFlexZones: true
694694
# # Setting to sort routes by the number of vehicles on each pattern
695695
# sortRoutePatternsByVehicleCount: true
696+
# # Whether to use the route color as the pattern viewer background
697+
# useRouteColorAsBackground: true
696698
# # Disable vehicle highlight if necessary (e.g. custom or inverted icons)
697699
# vehicleIconHighlight: true
698700
# # Customize vehicle icon padding (the default iconPadding is 2px in otp-ui)

‎lib/components/form/advanced-settings-panel.tsx‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ import { blue, getBaseColor } from '../util/colors'
3333
import { ComponentContext } from '../../util/contexts'
3434
import { generateModeSettingValues } from '../../util/api'
3535
import { getDependentName } from '../../util/user'
36+
import { invisibleCss } from '../util/invisible-a11y-label'
3637
import { User } from '../user/types'
38+
import BackButton from '../util/back-button'
3739

3840
import {
3941
addCustomSettingLabels,
@@ -44,7 +46,6 @@ import {
4446
setModeButton,
4547
tripPlannerValidationErrors
4648
} from './util'
47-
import { invisibleCss } from '../util/invisible-a11y-label'
4849
import { setModeButtonEnabled } from './batch-settings'
4950
import { styledCheckboxCss } from './styled'
5051
import DateTimeModal from './date-time-modal'
@@ -274,16 +275,11 @@ const AdvancedSettingsPanel = ({
274275
return (
275276
<PanelOverlay className="advanced-settings" ref={innerRef}>
276277
<HeaderContainer>
277-
<CloseButton
278-
aria-label={closeButtonText}
278+
<BackButton
279+
backButtonText={closeButtonText}
279280
id="close-advanced-settings-button"
280-
onClick={() => {
281-
closePanel()
282-
}}
283-
title={closeButtonText}
284-
>
285-
<ArrowLeft size={22} />
286-
</CloseButton>
281+
onClick={closePanel}
282+
/>
287283
<h1 className="header-text">{headerText}</h1>
288284
</HeaderContainer>
289285
<DtSelectorContainer>

‎lib/components/mobile/mobile.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@
253253
}
254254

255255
.otp.mobile .route-viewer-header {
256+
padding: 12px;
256257
margin: 0;
257258
}
258259

‎lib/components/mobile/pattern-viewer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class MobilePatternViewer extends Component {
3838
/>
3939
<main tabIndex={-1}>
4040
<div className="viewer-container">
41-
<PatternViewer hideBackButton ModeIcon={ModeIcon} />
41+
<PatternViewer ModeIcon={ModeIcon} />
4242
</div>
4343

4444
{/* The map is less important semantically, so keyboard focus and screen readers

‎lib/components/mobile/route-viewer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class MobileRouteViewer extends Component {
3838
/>
3939
<main tabIndex={-1}>
4040
<div className="viewer-container">
41-
<RouteViewer hideBackButton hideHeader ModeIcon={ModeIcon} />
41+
<RouteViewer hideHeader ModeIcon={ModeIcon} />
4242
</div>
4343

4444
{/* The map is less important semantically, so keyboard focus and screen readers

‎lib/components/mobile/stop-viewer.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const MobileStopViewer = ({ setViewedStop }: Props) => {
2424
/>
2525
<main tabIndex={-1}>
2626
<div className="viewer-container">
27-
<StopScheduleViewer hideBackButton />
27+
<StopScheduleViewer />
2828
</div>
2929

3030
{/* The map is less important semantically, so keyboard focus and screen readers

‎lib/components/mobile/trip-viewer.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const MobileTripViewer = ({ setViewedTrip }: Props) => {
2323
/>
2424
<main tabIndex={-1}>
2525
<div className="viewer-container">
26-
<TripViewer hideBackButton />
26+
<TripViewer hideHeader />
2727
</div>
2828

2929
{/* The map is less important semantically, so keyboard focus and screen readers

0 commit comments

Comments
 (0)