Skip to content

Commit 70dab78

Browse files
committed
Merge branch 'issue-375' into develop
2 parents b93fe6a + 25ad60d commit 70dab78

File tree

4 files changed

+70
-3
lines changed

4 files changed

+70
-3
lines changed

__tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ exports[`Matches shallow shapshot 1`] = `
115115
/>
116116
</div>
117117
<div
118-
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter___1-QUz src-shared-components-challenge-listing-Filters-FiltersPanel-___style__dates___3kH3c"
118+
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter___1-QUz src-shared-components-challenge-listing-Filters-FiltersPanel-___style__dates___3kH3c src-shared-components-challenge-listing-Filters-FiltersPanel-___style__hidetwomonthdatepicker___OurWT"
119119
>
120120
<label
121121
htmlFor="date-range-picker"
@@ -125,6 +125,23 @@ exports[`Matches shallow shapshot 1`] = `
125125
<DateRangePicker
126126
endDate={undefined}
127127
id="date-range-picker"
128+
numberOfMonths="1"
129+
onDatesChange={[Function]}
130+
startDate={undefined}
131+
/>
132+
</div>
133+
<div
134+
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter___1-QUz src-shared-components-challenge-listing-Filters-FiltersPanel-___style__dates___3kH3c src-shared-components-challenge-listing-Filters-FiltersPanel-___style__hideonemonthdatepicker___2zdTb"
135+
>
136+
<label
137+
htmlFor="date-range-picker"
138+
>
139+
Date range
140+
</label>
141+
<DateRangePicker
142+
endDate={undefined}
143+
id="date-range-picker"
144+
numberOfMonths="2"
128145
onDatesChange={[Function]}
129146
startDate={undefined}
130147
/>
@@ -245,7 +262,23 @@ exports[`Matches shallow shapshot 2`] = `
245262
/>
246263
</div>
247264
<div
248-
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter___1-QUz src-shared-components-challenge-listing-Filters-FiltersPanel-___style__dates___3kH3c"
265+
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter___1-QUz src-shared-components-challenge-listing-Filters-FiltersPanel-___style__dates___3kH3c src-shared-components-challenge-listing-Filters-FiltersPanel-___style__hidetwomonthdatepicker___OurWT"
266+
>
267+
<label
268+
htmlFor="date-range-picker"
269+
>
270+
Date range
271+
</label>
272+
<DateRangePicker
273+
endDate={undefined}
274+
id="date-range-picker"
275+
numberOfMonths="1"
276+
onDatesChange={[Function]}
277+
startDate={undefined}
278+
/>
279+
</div>
280+
<div
281+
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter___1-QUz src-shared-components-challenge-listing-Filters-FiltersPanel-___style__dates___3kH3c src-shared-components-challenge-listing-Filters-FiltersPanel-___style__hideonemonthdatepicker___2zdTb"
249282
>
250283
<label
251284
htmlFor="date-range-picker"
@@ -255,6 +288,7 @@ exports[`Matches shallow shapshot 2`] = `
255288
<DateRangePicker
256289
endDate={undefined}
257290
id="date-range-picker"
291+
numberOfMonths="2"
258292
onDatesChange={[Function]}
259293
startDate={undefined}
260294
/>

src/shared/components/challenge-listing/Filters/DateRangePicker.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class DateRangePicker extends React.Component {
2828
render() {
2929
return (
3030
<WrappedDateRangePicker
31+
numberOfMonths={this.props.numberOfMonths}
3132
focusedInput={this.state.focusedInput}
3233
isOutsideRange={() => false}
3334
onDatesChange={this.props.onDatesChange}

src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,28 @@ export default function FiltersPanel({
107107
}
108108
/>
109109
</div>
110-
<div styleName="filter dates">
110+
<div styleName="filter dates hidetwomonthdatepicker">
111111
<label htmlFor="date-range-picker">Date range</label>
112112
<DateRangePicker
113+
numberOfMonths={1}
114+
endDate={filterState.endDate && moment(filterState.endDate)}
115+
id="date-range-picker"
116+
onDatesChange={(dates) => {
117+
let d = dates.endDate ? dates.endDate.toISOString() : null;
118+
let state = Filter.setEndDate(filterState, d);
119+
d = dates.startDate ? dates.startDate.toISOString() : null;
120+
state = Filter.setStartDate(state, d);
121+
setFilterState(state);
122+
}}
123+
startDate={
124+
filterState.startDate && moment(filterState.startDate)
125+
}
126+
/>
127+
</div>
128+
<div styleName="filter dates hideonemonthdatepicker">
129+
<label htmlFor="date-range-picker">Date range</label>
130+
<DateRangePicker
131+
numberOfMonths={2}
113132
endDate={filterState.endDate && moment(filterState.endDate)}
114133
id="date-range-picker"
115134
onDatesChange={(dates) => {

src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ $panel-radius-4: $corner-radius * 2;
8787
padding-left: 0;
8888
margin-bottom: $panel-space-100;
8989
border-left: none;
90+
margin-bottom: $panel-space-100;
9091
}
9192

9293
button {
@@ -199,6 +200,18 @@ $panel-radius-4: $corner-radius * 2;
199200
@include xxs-to-sm {
200201
margin-top: 20px;
201202
}
203+
204+
&.hidetwomonthdatepicker {
205+
@media screen and (min-width: $screen-md) {
206+
display: none;
207+
}
208+
}
209+
210+
&.hideonemonthdatepicker {
211+
@media screen and (max-width: $screen-md - 1px) {
212+
display: none;
213+
}
214+
}
202215
}
203216
}
204217
}

0 commit comments

Comments
 (0)