Skip to content
This repository was archived by the owner on Jun 3, 2024. It is now read-only.

Commit 32852c0

Browse files
committed
add DatePickerPersistence for shared logic between dps and dpr
1 parent cc121c6 commit 32852c0

File tree

3 files changed

+21
-37
lines changed

3 files changed

+21
-37
lines changed

Diff for: src/components/DatePickerRange.react.js

+5-24
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import PropTypes from 'prop-types';
22
import React, {Component, lazy, Suspense} from 'react';
33
import datePickerRange from '../utils/LazyLoader/datePickerRange';
4-
import moment from 'moment';
5-
import {isNil} from 'ramda';
4+
import transformDate from '../utils/DatePickerPersistence';
65

76
const RealDatePickerRange = lazy(datePickerRange);
7+
const end_date = transformDate;
8+
const start_date = transformDate;
89

910
/**
1011
* DatePickerRange is a tailor made component designed for selecting
@@ -266,28 +267,8 @@ DatePickerRange.propTypes = {
266267
};
267268

268269
DatePickerRange.persistenceTransforms = {
269-
end_date: {
270-
extract: propValue => {
271-
if (!isNil(propValue)) {
272-
return moment(propValue)
273-
.startOf('day')
274-
.format('YYYY-MM-DD');
275-
}
276-
return propValue;
277-
},
278-
apply: storedValue => storedValue,
279-
},
280-
start_date: {
281-
extract: propValue => {
282-
if (!isNil(propValue)) {
283-
return moment(propValue)
284-
.startOf('day')
285-
.format('YYYY-MM-DD');
286-
}
287-
return propValue;
288-
},
289-
apply: storedValue => storedValue,
290-
},
270+
end_date,
271+
start_date,
291272
};
292273

293274
DatePickerRange.defaultProps = {

Diff for: src/components/DatePickerSingle.react.js

+2-13
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import PropTypes from 'prop-types';
22
import React, {Component, lazy, Suspense} from 'react';
33
import datePickerSingle from '../utils/LazyLoader/datePickerSingle';
4-
import moment from 'moment';
5-
import {isNil} from 'ramda';
4+
import date from '../utils/DatePickerPersistence';
65

76
const RealDateSingleRange = lazy(datePickerSingle);
87

@@ -223,17 +222,7 @@ DatePickerSingle.propTypes = {
223222
};
224223

225224
DatePickerSingle.persistenceTransforms = {
226-
date: {
227-
extract: propValue => {
228-
if (!isNil(propValue)) {
229-
return moment(propValue)
230-
.startOf('day')
231-
.format('YYYY-MM-DD');
232-
}
233-
return propValue;
234-
},
235-
apply: storedValue => storedValue,
236-
},
225+
date,
237226
};
238227

239228
DatePickerSingle.defaultProps = {

Diff for: src/utils/DatePickerPersistence.js

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import moment from 'moment';
2+
import {isNil} from 'ramda';
3+
4+
export default {
5+
extract: propValue => {
6+
if (!isNil(propValue)) {
7+
return moment(propValue)
8+
.startOf('day')
9+
.format('YYYY-MM-DD');
10+
}
11+
return propValue;
12+
},
13+
apply: storedValue => storedValue,
14+
};

0 commit comments

Comments
 (0)