add DatePickerPersistence for shared logic between dps and dpr

plotly · Sep 4, 2020 · 32852c0 · 32852c0
1 parent cc121c6
commit 32852c0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 37 deletions.
diff --git a/src/components/DatePickerRange.react.js b/src/components/DatePickerRange.react.js
@@ -1,10 +1,11 @@
 import PropTypes from 'prop-types';
 import React, {Component, lazy, Suspense} from 'react';
 import datePickerRange from '../utils/LazyLoader/datePickerRange';
-import moment from 'moment';
-import {isNil} from 'ramda';
+import transformDate from '../utils/DatePickerPersistence';
 
 const RealDatePickerRange = lazy(datePickerRange);
+const end_date = transformDate;
+const start_date = transformDate;
 
 /**
  * DatePickerRange is a tailor made component designed for selecting
@@ -266,28 +267,8 @@ DatePickerRange.propTypes = {
 };
 
 DatePickerRange.persistenceTransforms = {
-    end_date: {
-        extract: propValue => {
-            if (!isNil(propValue)) {
-                return moment(propValue)
-                    .startOf('day')
-                    .format('YYYY-MM-DD');
-            }
-            return propValue;
-        },
-        apply: storedValue => storedValue,
-    },
-    start_date: {
-        extract: propValue => {
-            if (!isNil(propValue)) {
-                return moment(propValue)
-                    .startOf('day')
-                    .format('YYYY-MM-DD');
-            }
-            return propValue;
-        },
-        apply: storedValue => storedValue,
-    },
+    end_date,
+    start_date,
 };
 
 DatePickerRange.defaultProps = {

diff --git a/src/components/DatePickerSingle.react.js b/src/components/DatePickerSingle.react.js
@@ -1,8 +1,7 @@
 import PropTypes from 'prop-types';
 import React, {Component, lazy, Suspense} from 'react';
 import datePickerSingle from '../utils/LazyLoader/datePickerSingle';
-import moment from 'moment';
-import {isNil} from 'ramda';
+import date from '../utils/DatePickerPersistence';
 
 const RealDateSingleRange = lazy(datePickerSingle);
 
@@ -223,17 +222,7 @@ DatePickerSingle.propTypes = {
 };
 
 DatePickerSingle.persistenceTransforms = {
-    date: {
-        extract: propValue => {
-            if (!isNil(propValue)) {
-                return moment(propValue)
-                    .startOf('day')
-                    .format('YYYY-MM-DD');
-            }
-            return propValue;
-        },
-        apply: storedValue => storedValue,
-    },
+    date,
 };
 
 DatePickerSingle.defaultProps = {

diff --git a/src/utils/DatePickerPersistence.js b/src/utils/DatePickerPersistence.js
@@ -0,0 +1,14 @@
+import moment from 'moment';
+import {isNil} from 'ramda';
+
+export default {
+    extract: propValue => {
+        if (!isNil(propValue)) {
+            return moment(propValue)
+                .startOf('day')
+                .format('YYYY-MM-DD');
+        }
+        return propValue;
+    },
+    apply: storedValue => storedValue,
+};