@zohodesk/components 1.2.16 → 1.2.17

package/README.md

@@ -32,6 +32,10 @@ In this Package, we Provide Some Basic Components to Build Web App
 - TextBoxIcon
 - Tooltip
 
+ # 1.2.17
+
+ - DateWidget TimeZone Exception Supported
+
 # 1.2.15, # 1.2.16
 
 - color-variable-preprocessor version issue solved

package/es/DateTime/DateTime.js

@@ -17,6 +17,7 @@ import { monthNamesDefault, monthNamesShortDefault, dayNamesDefault, dayNamesSho
 import ResponsiveDropBox from '../ResponsiveDropBox/ResponsiveDropBox';
 import { Box } from '../Layout';
 import { getHourSuggestions, getMinuteSuggestions, addZeroIfNeeded } from './dateFormatUtils';
+import { getDateText } from './dateFormatUtils/dateFormat';
 
 function title(date, year, month) {
   let monthNames = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
@@ -46,7 +47,6 @@ 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;
@@ -103,33 +103,6 @@ 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 ? value.replace('Z', '') : null;
-        result = value ? new Date(value) : new Date();
-      }
-    } 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 {
@@ -154,7 +127,7 @@ export default class DateTime extends React.PureComponent {
       defaultMin = parseInt(defaultMin);
     }
 
-    const dateObj = this.getInitialDate(value, timeZone, isDateTimeField);
+    const dateObj = getDateText(value, isDateTimeField, timeZone);
     date = dateObj.getDate();
     month = dateObj.getMonth();
     year = dateObj.getFullYear();

package/es/DateTime/DateWidget.js

@@ -2,7 +2,6 @@
 import React from 'react';
 import { DateWidget_propTypes } from './props/propTypes';
 import { DateWidget_defaultProps } from './props/defaultProps';
-import datetime from '@zohodesk/datetimejs';
 /**** Components ****/
 
 import DateTime from './DateTime';
@@ -18,7 +17,7 @@ import style from './DateWidget.module.css';
 import validator from './validator';
 import { formatDate } from '../utils/datetime/common';
 import { getIsSupportedKey, arrayIsNotEqual } from './dateFormatUtils';
-import { getDateFormatDetails, getDateFormatSelection, getDateTimeString, getDateDetails, getIsValidDate, getSelectedDate } from './dateFormatUtils/dateFormat';
+import { getDateFormatDetails, getDateFormatSelection, getDateTimeString, getDateDetails, getIsValidDate, getSelectedDate, getDateText } from './dateFormatUtils/dateFormat';
 import { getChangedDay } from './dateFormatUtils/dayChange';
 import { getChangedMonth } from './dateFormatUtils/monthChange';
 import { getChangedYear } from './dateFormatUtils/yearChange';
@@ -315,13 +314,10 @@ class DateWidgetComponent extends React.Component {
 
     if (selected) {
       let format = newDateFormat,
-          convertedValue;
+          convertedValue = getDateText(value, isDateTime, timeZone);
 
       if (isDateTime) {
-        convertedValue = datetime.toDate(datetime.tz.utcToTz(value, timeZone));
         format = `${newDateFormat} ${is24Hour ? 'HH:mm' : 'hh:mm A'}`;
-      } else {
-        convertedValue = datetime.toDate(value);
       }
 
       displayText = formatDate(convertedValue, format);

package/es/DateTime/dateFormatUtils/dateFormat.js

@@ -213,6 +213,13 @@ export function getDateTimeString() {
 
   return `${dateString}${timeString}`;
 }
+export function getDateText(value, isDateTime, timeZone) {
+  if (value && !timeZone) {
+    value = value.replace('Z', '');
+  }
+
+  return value ? isDateTime ? timeZone ? datetime.toDate(datetime.tz.utcToTz(value, timeZone)) : new Date(value) : timeZone ? datetime.toDate(value) : new Date(value) : new Date();
+}
 export function getDateDetails(value, localValues, isDateTime, timeZone, _ref) {
   let {
     is24Hour
@@ -227,7 +234,7 @@ export function getDateDetails(value, localValues, isDateTime, timeZone, _ref) {
   } = localValues;
 
   if (value) {
-    const dateObj = isDateTime ? datetime.toDate(datetime.tz.utcToTz(value, timeZone)) : value ? datetime.toDate(value) : new Date();
+    const dateObj = getDateText(value, isDateTime, timeZone);
     const selectedDay = dateObj.getDate();
     const selectedMonth = dateObj.getMonth();
     const selectedYear = dateObj.getFullYear();

package/es/DateTime/dateFormatUtils/index.js

@@ -1,13 +1,11 @@
 /* eslint-disable no-param-reassign */
 
-/** * Libraries ** */
-import datetime from '@zohodesk/datetimejs';
 /** * Methods ** */
-
 import { getMonthEnd } from '../../utils/datetime/common';
 /** * Constants ** */
 
 import { flags, INVALID_DATE } from '../constants';
+import { getDateText } from './dateFormat';
 export function convertYearToTwoDigit(year) {
   return parseInt(year.toString().slice(-2));
 }
@@ -235,7 +233,7 @@ export function getIsCurrentYear(_ref) {
   let isCurrentYear = false;
 
   if (value && value !== INVALID_DATE) {
-    const dateObj = isDateTime ? datetime.toDate(datetime.tz.utcToTz(value, timeZone)) : datetime.toDate(value);
+    const dateObj = getDateText(value, isDateTime, timeZone);
     const currentDateObj = new Date();
     const currentYear = currentDateObj.getFullYear();
     const selectedYear = dateObj.getFullYear();

package/es/v1/DateTime/DateTime.js

@@ -17,6 +17,7 @@ import { monthNamesDefault, monthNamesShortDefault, dayNamesDefault, dayNamesSho
 import ResponsiveDropBox from '../ResponsiveDropBox/ResponsiveDropBox';
 import { Box } from '../Layout';
 import { getHourSuggestions, getMinuteSuggestions, addZeroIfNeeded } from '../../DateTime/dateFormatUtils';
+import { getDateText } from './../../DateTime/dateFormatUtils/dateFormat';
 
 function title(date, year, month) {
   let monthNames = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
@@ -46,7 +47,6 @@ 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;
@@ -103,33 +103,6 @@ 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 ? value.replace('Z', '') : null;
-        result = value ? new Date(value) : new Date();
-      }
-    } 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 {
@@ -154,7 +127,7 @@ export default class DateTime extends React.PureComponent {
       defaultMin = parseInt(defaultMin);
     }
 
-    const dateObj = this.getInitialDate(value, timeZone, isDateTimeField);
+    const dateObj = getDateText(value, timeZone, isDateTimeField);
     date = dateObj.getDate();
     month = dateObj.getMonth();
     year = dateObj.getFullYear();

package/es/v1/DateTime/DateWidget.js

@@ -2,7 +2,6 @@
 import React from 'react';
 import { DateWidget_propTypes } from './props/propTypes';
 import { DateWidget_defaultProps } from './props/defaultProps';
-import datetime from '@zohodesk/datetimejs';
 /**** Components ****/
 
 import DateTime from './DateTime';
@@ -18,7 +17,7 @@ import style from '../../DateTime/DateWidget.module.css';
 import validator from '../../DateTime/validator';
 import { formatDate } from '../../utils/datetime/common';
 import { getIsSupportedKey, arrayIsNotEqual } from '../../DateTime/dateFormatUtils';
-import { getDateFormatDetails, getDateFormatSelection, getDateTimeString, getDateDetails, getIsValidDate, getSelectedDate } from '../../DateTime/dateFormatUtils/dateFormat';
+import { getDateFormatDetails, getDateFormatSelection, getDateTimeString, getDateDetails, getIsValidDate, getSelectedDate, getDateText } from '../../DateTime/dateFormatUtils/dateFormat';
 import { getChangedDay } from '../../DateTime/dateFormatUtils/dayChange';
 import { getChangedMonth } from '../../DateTime/dateFormatUtils/monthChange';
 import { getChangedYear } from '../../DateTime/dateFormatUtils/yearChange';
@@ -315,13 +314,10 @@ class DateWidgetComponent extends React.Component {
 
     if (selected) {
       let format = newDateFormat,
-          convertedValue;
+          convertedValue = getDateText(value, isDateTime, timeZone);
 
       if (isDateTime) {
-        convertedValue = datetime.toDate(datetime.tz.utcToTz(value, timeZone));
         format = `${newDateFormat} ${is24Hour ? 'HH:mm' : 'hh:mm A'}`;
-      } else {
-        convertedValue = datetime.toDate(value);
       }
 
       displayText = formatDate(convertedValue, format);

package/lib/DateTime/DateTime.js

@@ -39,6 +39,8 @@ var _Layout = require("../Layout");
 
 var _dateFormatUtils = require("./dateFormatUtils");
 
+var _dateFormat = require("./dateFormatUtils/dateFormat");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _construct(Parent, args, Class) { if (_isNativeReflectConstruct()) { _construct = Reflect.construct.bind(); } else { _construct = function _construct(Parent, args, Class) { var a = [null]; a.push.apply(a, args); var Constructor = Function.bind.apply(Parent, a); var instance = new Constructor(); if (Class) _setPrototypeOf(instance, Class.prototype); return instance; }; } return _construct.apply(null, arguments); }
@@ -111,7 +113,6 @@ 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;
 
@@ -171,34 +172,6 @@ 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 ? value.replace('Z', '') : null;
-          result = value ? new Date(value) : new Date();
-        }
-      } 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) {
@@ -229,7 +202,7 @@ var DateTime = /*#__PURE__*/function (_React$PureComponent) {
         defaultMin = parseInt(defaultMin);
       }
 
-      var dateObj = this.getInitialDate(value, timeZone, isDateTimeField);
+      var dateObj = (0, _dateFormat.getDateText)(value, isDateTimeField, timeZone);
       date = dateObj.getDate();
       month = dateObj.getMonth();
       year = dateObj.getFullYear();

package/lib/DateTime/DateWidget.js

@@ -13,8 +13,6 @@ var _propTypes = require("./props/propTypes");
 
 var _defaultProps = require("./props/defaultProps");
 
-var _datetimejs = _interopRequireDefault(require("@zohodesk/datetimejs"));
-
 var _DateTime = _interopRequireDefault(require("./DateTime"));
 
 var _Popup = _interopRequireDefault(require("../Popup/Popup"));
@@ -358,13 +356,10 @@ var DateWidgetComponent = /*#__PURE__*/function (_React$Component) {
 
       if (selected) {
         var format = newDateFormat,
-            convertedValue;
+            convertedValue = (0, _dateFormat.getDateText)(value, isDateTime, timeZone);
 
         if (isDateTime) {
-          convertedValue = _datetimejs["default"].toDate(_datetimejs["default"].tz.utcToTz(value, timeZone));
           format = "".concat(newDateFormat, " ").concat(is24Hour ? 'HH:mm' : 'hh:mm A');
-        } else {
-          convertedValue = _datetimejs["default"].toDate(value);
         }
 
         displayText = (0, _common.formatDate)(convertedValue, format);

package/lib/DateTime/dateFormatUtils/dateFormat.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getDateDetails = getDateDetails;
 exports.getDateFormatDetails = getDateFormatDetails;
 exports.getDateFormatSelection = getDateFormatSelection;
+exports.getDateText = getDateText;
 exports.getDateTimeString = getDateTimeString;
 exports.getIsValidDate = getIsValidDate;
 exports.getSelectedDate = getSelectedDate;
@@ -234,6 +235,14 @@ function getDateTimeString() {
   return "".concat(dateString).concat(timeString);
 }
 
+function getDateText(value, isDateTime, timeZone) {
+  if (value && !timeZone) {
+    value = value.replace('Z', '');
+  }
+
+  return value ? isDateTime ? timeZone ? _datetimejs["default"].toDate(_datetimejs["default"].tz.utcToTz(value, timeZone)) : new Date(value) : timeZone ? _datetimejs["default"].toDate(value) : new Date(value) : new Date();
+}
+
 function getDateDetails(value, localValues, isDateTime, timeZone, _ref7) {
   var is24Hour = _ref7.is24Hour;
   var day = localValues.day,
@@ -244,7 +253,7 @@ function getDateDetails(value, localValues, isDateTime, timeZone, _ref7) {
       noon = localValues.noon;
 
   if (value) {
-    var dateObj = isDateTime ? _datetimejs["default"].toDate(_datetimejs["default"].tz.utcToTz(value, timeZone)) : value ? _datetimejs["default"].toDate(value) : new Date();
+    var dateObj = getDateText(value, isDateTime, timeZone);
     var selectedDay = dateObj.getDate();
     var selectedMonth = dateObj.getMonth();
     var selectedYear = dateObj.getFullYear();

package/lib/DateTime/dateFormatUtils/index.js

@@ -27,18 +27,14 @@ exports.getNoonDetails = getNoonDetails;
 exports.getYearDetails = getYearDetails;
 exports.removeYearPattern = removeYearPattern;
 
-var _datetimejs = _interopRequireDefault(require("@zohodesk/datetimejs"));
-
 var _common = require("../../utils/datetime/common");
 
 var _constants = require("../constants");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var _dateFormat = require("./dateFormat");
 
 /* eslint-disable no-param-reassign */
 
-/** * Libraries ** */
-
 /** * Methods ** */
 
 /** * Constants ** */
@@ -278,7 +274,7 @@ function getIsCurrentYear(_ref) {
   var isCurrentYear = false;
 
   if (value && value !== _constants.INVALID_DATE) {
-    var dateObj = isDateTime ? _datetimejs["default"].toDate(_datetimejs["default"].tz.utcToTz(value, timeZone)) : _datetimejs["default"].toDate(value);
+    var dateObj = (0, _dateFormat.getDateText)(value, isDateTime, timeZone);
     var currentDateObj = new Date();
     var currentYear = currentDateObj.getFullYear();
     var selectedYear = dateObj.getFullYear();

package/lib/v1/DateTime/DateTime.js

@@ -39,6 +39,8 @@ var _Layout = require("../Layout");
 
 var _dateFormatUtils = require("../../DateTime/dateFormatUtils");
 
+var _dateFormat = require("./../../DateTime/dateFormatUtils/dateFormat");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _construct(Parent, args, Class) { if (_isNativeReflectConstruct()) { _construct = Reflect.construct.bind(); } else { _construct = function _construct(Parent, args, Class) { var a = [null]; a.push.apply(a, args); var Constructor = Function.bind.apply(Parent, a); var instance = new Constructor(); if (Class) _setPrototypeOf(instance, Class.prototype); return instance; }; } return _construct.apply(null, arguments); }
@@ -111,7 +113,6 @@ 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;
 
@@ -171,34 +172,6 @@ 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 ? value.replace('Z', '') : null;
-          result = value ? new Date(value) : new Date();
-        }
-      } 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) {
@@ -229,7 +202,7 @@ var DateTime = /*#__PURE__*/function (_React$PureComponent) {
         defaultMin = parseInt(defaultMin);
       }
 
-      var dateObj = this.getInitialDate(value, timeZone, isDateTimeField);
+      var dateObj = (0, _dateFormat.getDateText)(value, timeZone, isDateTimeField);
       date = dateObj.getDate();
       month = dateObj.getMonth();
       year = dateObj.getFullYear();

package/lib/v1/DateTime/DateWidget.js

@@ -13,8 +13,6 @@ var _propTypes = require("./props/propTypes");
 
 var _defaultProps = require("./props/defaultProps");
 
-var _datetimejs = _interopRequireDefault(require("@zohodesk/datetimejs"));
-
 var _DateTime = _interopRequireDefault(require("./DateTime"));
 
 var _Popup = _interopRequireDefault(require("../Popup/Popup"));
@@ -358,13 +356,10 @@ var DateWidgetComponent = /*#__PURE__*/function (_React$Component) {
 
       if (selected) {
         var format = newDateFormat,
-            convertedValue;
+            convertedValue = (0, _dateFormat.getDateText)(value, isDateTime, timeZone);
 
         if (isDateTime) {
-          convertedValue = _datetimejs["default"].toDate(_datetimejs["default"].tz.utcToTz(value, timeZone));
           format = "".concat(newDateFormat, " ").concat(is24Hour ? 'HH:mm' : 'hh:mm A');
-        } else {
-          convertedValue = _datetimejs["default"].toDate(value);
         }
 
         displayText = (0, _common.formatDate)(convertedValue, format);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/components",
-  "version": "1.2.16",
+  "version": "1.2.17",
   "main": "es/index.js",
   "module": "es/index.js",
   "private": false,