@zohodesk/components 1.0.0-alpha-275 → 1.0.0-alpha-276

package/README.md

@@ -32,6 +32,11 @@ In this Package, we Provide Some Basic Components to Build Web App
 - TextBoxIcon
 - Tooltip
 
+# 1.0.0-alpha-276
+
+- **DateTime** - TimeZone null Case Handled
+
+
 # 1.0.0-alpha-275
 
 - **DateTime** - millisecond and second should work only when customDateFormat is given issue fixed. this fix related to *1.0.0-alpha-272*

package/es/DateTime/DateTime.js

@@ -46,6 +46,7 @@ export default class DateTime extends React.PureComponent {
     this.handleSelectMonthViaYearView = this.handleSelectMonthViaYearView.bind(this);
     this.handleGetStateValues = this.handleGetStateValues.bind(this);
     this.handleYearViewToggle = this.handleYearViewToggle.bind(this);
+    this.getInitialDate = this.getInitialDate.bind(this);
     const {
       ampmText = ampmTextDefault
     } = props.i18nKeys;
@@ -102,6 +103,33 @@ export default class DateTime extends React.PureComponent {
     this.handleExposeMethods(false);
   }
 
+  getInitialDate(value) {
+    let timeZone = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
+    let isDateTime = arguments.length > 2 ? arguments[2] : undefined;
+    let result = null;
+
+    if (isDateTime) {
+      if (timeZone && value) {
+        result = datetime.toDate(datetime.tz.utcToTz(value, timeZone));
+      } else {
+        value = value.replace('Z', '');
+        result = new Date(value);
+      }
+    } else {
+      if (value) {
+        if (timeZone) {
+          result = datetime.toDate(value);
+        } else {
+          result = new Date(value);
+        }
+      } else {
+        result = new Date();
+      }
+    }
+
+    return result;
+  }
+
   getStateFromProps(props) {
     let date, month, year, hours, mins, amPm;
     let {
@@ -126,7 +154,7 @@ export default class DateTime extends React.PureComponent {
       defaultMin = parseInt(defaultMin);
     }
 
-    const dateObj = isDateTimeField ? datetime.toDate(datetime.tz.utcToTz(value, timeZone)) : value ? datetime.toDate(value) : todayObj;
+    const dateObj = this.getInitialDate(value, timeZone, isDateTimeField);
     date = dateObj.getDate();
     month = dateObj.getMonth();
     year = dateObj.getFullYear();
@@ -211,7 +239,7 @@ export default class DateTime extends React.PureComponent {
         dateArgs.push(sec, milliSec);
       }
 
-      selectedInMillis = datetime.tz.tzToUtc(Date.UTC(...dateArgs), timeZone);
+      selectedInMillis = timeZone ? datetime.tz.tzToUtc(Date.UTC(...dateArgs), timeZone) : Date.UTC(...dateArgs);
       selectedValue = datetime.ISO(selectedInMillis);
       formattedValue = formatDate(new Date(...dateArgs), customDateFormat == null ? is24Hour ? `${dateFormat} HH:mm:ss` : `${dateFormat} hh:mm:ss A` : `${customDateFormat}`);
     } else {

package/lib/DateTime/DateTime.js

@@ -111,6 +111,7 @@ var DateTime = /*#__PURE__*/function (_React$PureComponent) {
     _this.handleSelectMonthViaYearView = _this.handleSelectMonthViaYearView.bind(_assertThisInitialized(_this));
     _this.handleGetStateValues = _this.handleGetStateValues.bind(_assertThisInitialized(_this));
     _this.handleYearViewToggle = _this.handleYearViewToggle.bind(_assertThisInitialized(_this));
+    _this.getInitialDate = _this.getInitialDate.bind(_assertThisInitialized(_this));
     var _props$i18nKeys$ampmT = props.i18nKeys.ampmText,
         ampmText = _props$i18nKeys$ampmT === void 0 ? _constants.ampmTextDefault : _props$i18nKeys$ampmT;
 
@@ -170,6 +171,34 @@ var DateTime = /*#__PURE__*/function (_React$PureComponent) {
     value: function componentWillUnmount() {
       this.handleExposeMethods(false);
     }
+  }, {
+    key: "getInitialDate",
+    value: function getInitialDate(value) {
+      var timeZone = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
+      var isDateTime = arguments.length > 2 ? arguments[2] : undefined;
+      var result = null;
+
+      if (isDateTime) {
+        if (timeZone && value) {
+          result = _datetimejs["default"].toDate(_datetimejs["default"].tz.utcToTz(value, timeZone));
+        } else {
+          value = value.replace('Z', '');
+          result = new Date(value);
+        }
+      } else {
+        if (value) {
+          if (timeZone) {
+            result = _datetimejs["default"].toDate(value);
+          } else {
+            result = new Date(value);
+          }
+        } else {
+          result = new Date();
+        }
+      }
+
+      return result;
+    }
   }, {
     key: "getStateFromProps",
     value: function getStateFromProps(props) {
@@ -200,7 +229,7 @@ var DateTime = /*#__PURE__*/function (_React$PureComponent) {
         defaultMin = parseInt(defaultMin);
       }
 
-      var dateObj = isDateTimeField ? _datetimejs["default"].toDate(_datetimejs["default"].tz.utcToTz(value, timeZone)) : value ? _datetimejs["default"].toDate(value) : todayObj;
+      var dateObj = this.getInitialDate(value, timeZone, isDateTimeField);
       date = dateObj.getDate();
       month = dateObj.getMonth();
       year = dateObj.getFullYear();
@@ -284,7 +313,7 @@ var DateTime = /*#__PURE__*/function (_React$PureComponent) {
           dateArgs.push(sec, milliSec);
         }
 
-        selectedInMillis = _datetimejs["default"].tz.tzToUtc(Date.UTC.apply(Date, dateArgs), timeZone);
+        selectedInMillis = timeZone ? _datetimejs["default"].tz.tzToUtc(Date.UTC.apply(Date, dateArgs), timeZone) : Date.UTC.apply(Date, dateArgs);
         selectedValue = _datetimejs["default"].ISO(selectedInMillis);
         formattedValue = (0, _common.formatDate)(_construct(Date, dateArgs), customDateFormat == null ? is24Hour ? "".concat(dateFormat, " HH:mm:ss") : "".concat(dateFormat, " hh:mm:ss A") : "".concat(customDateFormat));
       } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/components",
-  "version": "1.0.0-alpha-275",
+  "version": "1.0.0-alpha-276",
   "main": "es/index.js",
   "module": "es/index.js",
   "private": false,