Skip to content

Issue 375 #407

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 6 commits into from
Aug 30, 2017
Merged

Issue 375 #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3944c15
Fix issue 375
Aug 29, 2017
eca158a
Change the daterangepicker test case, change the numberOfMonths to 1
Aug 29, 2017
86e914e
support scroll
Aug 29, 2017
7de2c98
support scroll from scss
Aug 29, 2017
da8077f
datepicker show 1 month when mobile and 2 month when desktop
Aug 30, 2017
6bccb97
resolve conflict of package-lock.json
Aug 30, 2017
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
38 changes: 36 additions & 2 deletions __tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ exports[`Matches shallow shapshot 1`] = `
/>
</div>
<div
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter___1-QUz src-shared-components-challenge-listing-Filters-FiltersPanel-___style__dates___3kH3c"
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"
>
<label
htmlFor="date-range-picker"
Expand All @@ -123,6 +123,23 @@ exports[`Matches shallow shapshot 1`] = `
<DateRangePicker
endDate={undefined}
id="date-range-picker"
numberOfMonths="1"
onDatesChange={[Function]}
startDate={undefined}
/>
</div>
<div
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"
>
<label
htmlFor="date-range-picker"
>
Date range
</label>
<DateRangePicker
endDate={undefined}
id="date-range-picker"
numberOfMonths="2"
onDatesChange={[Function]}
startDate={undefined}
/>
Expand Down Expand Up @@ -239,7 +256,23 @@ exports[`Matches shallow shapshot 2`] = `
/>
</div>
<div
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter___1-QUz src-shared-components-challenge-listing-Filters-FiltersPanel-___style__dates___3kH3c"
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"
>
<label
htmlFor="date-range-picker"
>
Date range
</label>
<DateRangePicker
endDate={undefined}
id="date-range-picker"
numberOfMonths="1"
onDatesChange={[Function]}
startDate={undefined}
/>
</div>
<div
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"
>
<label
htmlFor="date-range-picker"
Expand All @@ -249,6 +282,7 @@ exports[`Matches shallow shapshot 2`] = `
<DateRangePicker
endDate={undefined}
id="date-range-picker"
numberOfMonths="2"
onDatesChange={[Function]}
startDate={undefined}
/>
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/challenge-listing/Filters/DateRangePicker.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class DateRangePicker extends React.Component {
render() {
return (
<WrappedDateRangePicker
numberOfMonths={this.props.numberOfMonths}
focusedInput={this.state.focusedInput}
isOutsideRange={() => false}
onDatesChange={this.props.onDatesChange}
Expand Down
21 changes: 20 additions & 1 deletion src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,28 @@ export default function FiltersPanel({
}
/>
</div>
<div styleName="filter dates">
<div styleName="filter dates hidetwomonthdatepicker">
<label htmlFor="date-range-picker">Date range</label>
<DateRangePicker
numberOfMonths="1"
endDate={filterState.endDate && moment(filterState.endDate)}
id="date-range-picker"
onDatesChange={(dates) => {
let d = dates.endDate ? dates.endDate.toISOString() : null;
let state = Filter.setEndDate(filterState, d);
d = dates.startDate ? dates.startDate.toISOString() : null;
state = Filter.setStartDate(state, d);
setFilterState(state);
}}
startDate={
filterState.startDate && moment(filterState.startDate)
}
/>
</div>
<div styleName="filter dates hideonemonthdatepicker">
<label htmlFor="date-range-picker">Date range</label>
<DateRangePicker
numberOfMonths="2"
endDate={filterState.endDate && moment(filterState.endDate)}
id="date-range-picker"
onDatesChange={(dates) => {
Expand Down
14 changes: 14 additions & 0 deletions src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ $panel-radius-4: $corner-radius * 2;
right: 0;
background: $tc-white;
padding: 15px;
overflow-y: scroll;
}

&.hidden {
Expand Down Expand Up @@ -85,6 +86,7 @@ $panel-radius-4: $corner-radius * 2;
width: 100%;
padding-left: 0;
border-left: none;
margin-bottom: $panel-space-100;
}

button {
Expand Down Expand Up @@ -197,6 +199,18 @@ $panel-radius-4: $corner-radius * 2;
@include xxs-to-sm {
margin-top: 20px;
}

&.hidetwomonthdatepicker {
@media screen and (min-width: $screen-md) {
display: none;
}
}

&.hideonemonthdatepicker {
@media screen and (max-width: $screen-md - 1px) {
display: none;
}
}
}
}
}
Expand Down