From c276ecf7e6e9cc40656028f2ea69e1f2555d66c9 Mon Sep 17 00:00:00 2001
From: Suvish Varghese Thoovamalayil <suvisht@thoughtworks.com>
Date: Thu, 08 Feb 2018 20:56:08 +0100
Subject: [PATCH] Allow specifying viewDate as a prop, fixes #468
---
DateTime.js | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/DateTime.js b/DateTime.js
index 1a7d6e6..1259287 100644
--- a/DateTime.js
+++ b/DateTime.js
@@ -13,6 +13,7 @@
propTypes: {
// value: TYPES.object | TYPES.string,
// defaultValue: TYPES.object | TYPES.string,
+ // viewDate: TYPES.object | TYPES.string,
onFocus: TYPES.func,
onBlur: TYPES.func,
onChange: TYPES.func,
@@ -43,24 +44,33 @@
return state;
},
+ parseDate: function (date, formats) {
+ var parsedDate;
+
+ if (date && typeof date === 'string')
+ parsedDate = this.localMoment(date, formats.datetime);
+ else if (date)
+ parsedDate = this.localMoment(date);
+
+ if (parsedDate && !parsedDate.isValid())
+ parsedDate = null;
+
+ return parsedDate;
+ },
+
getStateFromProps: function( props ) {
var formats = this.getFormats( props ),
date = props.value || props.defaultValue,
selectedDate, viewDate, updateOn, inputValue
;
- if ( date && typeof date === 'string' )
- selectedDate = this.localMoment( date, formats.datetime );
- else if ( date )
- selectedDate = this.localMoment( date );
+ selectedDate = this.parseDate(date, formats);
- if ( selectedDate && !selectedDate.isValid() )
- selectedDate = null;
+ viewDate = this.parseDate(props.viewDate, formats);
viewDate = selectedDate ?
selectedDate.clone().startOf('month') :
- this.localMoment().startOf('month')
- ;
+ viewDate ? viewDate.clone().startOf('month') : this.localMoment().startOf('month');
updateOn = this.getUpdateOn(formats);
--
Gitblit v1.9.3