@zohodesk/components 1.0.0-temp-164 → 1.0.0-temp-166

package/es/DateTime/DateTime.js

@@ -1,6 +1,6 @@
 /* eslint css-modules/no-unused-class: [0, { markAsUsed: ['datesStr', 'dateContainer', 'dateRow', 'today', 'emptySpan', 'dropDown'] }] */
-/* eslint-disable react/forbid-component-props */
 
+/* eslint-disable react/forbid-component-props */
 import React from 'react';
 import { DateTime_propTypes } from './props/propTypes';
 import { DateTime_defaultProps } from './props/defaultProps';
@@ -17,11 +17,13 @@ import { monthNamesDefault, monthNamesShortDefault, dayNamesDefault, dayNamesSho
 import ResponsiveDropBox from '../ResponsiveDropBox/ResponsiveDropBox';
 import { Box } from '../Layout';
 import { getHourSuggestions, getMinuteSuggestions, addZeroIfNeeded } from './dateFormatUtils';
+
 function title(date, year, month) {
   let monthNames = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
   const HeadingText = `${monthNames[month] || ''} ${year}`;
   return HeadingText;
 }
+
 export default class DateTime extends React.PureComponent {
   constructor(props) {
     super(props);
@@ -44,9 +46,11 @@ 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;
+
     this.ampmSuggestions = (() => {
       const ampmSuggestions = [];
       ampmText.forEach((text, index) => {
@@ -64,24 +68,29 @@ export default class DateTime extends React.PureComponent {
       });
       return ampmSuggestions;
     })();
+
     const initalStateObj = this.getStateFromProps(props);
     this.state = Object.assign({}, initalStateObj, {
       isYearView: false,
       isMonthOpen: false
     });
   }
+
   componentDidMount() {
     this.handleExposeMethods(true);
   }
+
   componentDidUpdate(prevProps) {
     const {
       value,
       isActive,
       is24Hour
     } = this.props;
+
     if (prevProps.value !== value || is24Hour !== prevProps.is24Hour) {
       this.setState(this.getStateFromProps(this.props));
     }
+
     if (prevProps.isActive !== isActive && !isActive) {
       this.setState({
         isYearView: false,
@@ -89,9 +98,38 @@ export default class DateTime extends React.PureComponent {
       });
     }
   }
+
   componentWillUnmount() {
     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 {
@@ -102,18 +140,21 @@ export default class DateTime extends React.PureComponent {
       isDateTimeField,
       is24Hour
     } = props; //defaultTime --> 12:00:PM
+
     defaultTime = needDefaultTime ? defaultTime ? defaultTime : '12:00:PM' : '';
     let defaultHour, defaultMin, defaultAmPm;
     let todayObj = new Date();
     let todayDate = todayObj.getDate();
     let todayMonth = todayObj.getMonth();
     let todayYear = todayObj.getFullYear();
+
     if (!value) {
       [defaultHour, defaultMin, defaultAmPm] = defaultTime ? defaultTime.split(':') : [];
       defaultHour = parseInt(defaultHour);
       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();
@@ -134,8 +175,10 @@ export default class DateTime extends React.PureComponent {
       todayYear
     };
   }
+
   getHours(hoursParam, is24Hour) {
     let hours = hoursParam;
+
     if (!is24Hour) {
       if (hours === 0) {
         hours = 12;
@@ -143,9 +186,11 @@ export default class DateTime extends React.PureComponent {
         hours -= 12;
       }
     }
+
     hours = addZeroIfNeeded(hours);
     return hours;
   }
+
   handleGetSelectedDate() {
     let selectedInfo = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     const {
@@ -154,7 +199,8 @@ export default class DateTime extends React.PureComponent {
       timeZone,
       isDateTimeField,
       dateFormat,
-      is24Hour
+      is24Hour,
+      customDateFormat
     } = this.props;
     let {
       year,
@@ -164,32 +210,47 @@ export default class DateTime extends React.PureComponent {
       mins,
       amPm
     } = selectedInfo;
+
     if (!is24Hour) {
       if (parseInt(hours) === 12) {
         hours = amPm === 'AM' ? 0 : 12;
       }
+
       if (amPm === 'PM') {
         if (hours < 12) {
           hours = parseInt(hours) + 12;
         }
       }
     }
+
     let minInMillis = min ? datetime.millis(min) : null,
-      maxInMillis = max ? datetime.millis(max) : null,
-      selectedInMillis,
-      selectedValue = '',
-      formattedValue;
-    if (isDateTimeField) {
-      selectedInMillis = datetime.tz.tzToUtc(Date.UTC(year, month, date, hours, mins), timeZone);
+        maxInMillis = max ? datetime.millis(max) : null,
+        selectedInMillis,
+        selectedValue = '',
+        formattedValue;
+    let currentDate = new Date();
+    let sec = currentDate.getSeconds();
+    let milliSec = currentDate.getMilliseconds();
+
+    if (isDateTimeField || customDateFormat) {
+      const dateArgs = [year, month, date, hours, mins];
+
+      if (customDateFormat) {
+        dateArgs.push(sec, milliSec);
+      }
+
+      selectedInMillis = timeZone ? datetime.tz.tzToUtc(Date.UTC(...dateArgs), timeZone) : Date.UTC(...dateArgs);
       selectedValue = datetime.ISO(selectedInMillis);
-      formattedValue = formatDate(new Date(year, month, date, hours, mins), is24Hour ? `${dateFormat} HH:mm` : `${dateFormat} hh:mm A`);
+      formattedValue = formatDate(new Date(...dateArgs), customDateFormat == null ? is24Hour ? `${dateFormat} HH:mm:ss` : `${dateFormat} hh:mm:ss A` : `${customDateFormat}`);
     } else {
       selectedInMillis = Date.UTC(year, month, date);
       selectedValue = formatDate(new Date(year, month, date), 'YYYY-MM-DD');
       formattedValue = formatDate(new Date(year, month, date), dateFormat);
     }
+
     let isError = false;
     let errorType = '';
+
     if (minInMillis && minInMillis > selectedInMillis) {
       isError = true;
       errorType = 'MIN';
@@ -197,6 +258,7 @@ export default class DateTime extends React.PureComponent {
       isError = true;
       errorType = 'MAX';
     }
+
     return {
       isError,
       errorType,
@@ -204,6 +266,7 @@ export default class DateTime extends React.PureComponent {
       formattedValue
     };
   }
+
   handleSelect(e) {
     e && e.preventDefault();
     const {
@@ -233,6 +296,7 @@ export default class DateTime extends React.PureComponent {
       mins,
       amPm
     });
+
     if (isError) {
       if (errorType === 'MIN') {
         onError && onError(minErrorText, true);
@@ -243,6 +307,7 @@ export default class DateTime extends React.PureComponent {
       onSelect(selectedValue, formattedValue, e);
     }
   }
+
   handleChange() {
     let selectedInfo = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     const {
@@ -275,6 +340,7 @@ export default class DateTime extends React.PureComponent {
       mins: getIsEmptyValue(mins) ? oldMins : mins,
       amPm: getIsEmptyValue(amPm) ? oldAMPM : amPm
     };
+
     if (onChange) {
       const {
         isError,
@@ -282,6 +348,7 @@ export default class DateTime extends React.PureComponent {
         selectedValue,
         formattedValue
       } = this.handleGetSelectedDate(newSelectedInfo);
+
       if (isError) {
         if (errorType === 'MIN') {
           onError && onError(minErrorText, true);
@@ -296,17 +363,20 @@ export default class DateTime extends React.PureComponent {
       this.setState(newSelectedInfo);
     }
   }
+
   handleClear(e) {
     const {
       onSelect,
       onClear
     } = this.props;
+
     if (onClear) {
       onClear(e);
     } else {
       onSelect('', '', e);
     }
   }
+
   dateSelect(date, month, year, e) {
     this.handleChange({
       date,
@@ -338,6 +408,7 @@ export default class DateTime extends React.PureComponent {
       mins,
       amPm
     });
+
     if (isError) {
       if (errorType === 'MIN') {
         onError && onError(minErrorText, true);
@@ -348,26 +419,31 @@ export default class DateTime extends React.PureComponent {
       onDateSelect && onDateSelect(selectedValue, formattedValue, e);
     }
   }
+
   hoursSelect(hours) {
     this.handleChange({
       hours
     });
   }
+
   minutesSelect(mins) {
     this.handleChange({
       mins
     });
   }
+
   amPmSelect(amPm) {
     this.handleChange({
       amPm
     });
   }
-
   /*global closeGroupPopups*/
+
+
   closePopup() {
     closeGroupPopups('calender');
   }
+
   handleCalendarNavigation(type, selectedInfo) {
     const {
       year: stateYear,
@@ -377,10 +453,12 @@ export default class DateTime extends React.PureComponent {
     let date = stateDate;
     let month = stateMonth;
     const year = stateYear;
+
     const getDate = (month, year) => {
       const monthEnd = getMonthEnd(month, year);
       return monthEnd >= parseInt(date) ? date : monthEnd;
     };
+
     const modifyCalendarRecursion = recursionType => {
       if (recursionType === 'nextYear') {
         //Click next year icon
@@ -404,6 +482,7 @@ export default class DateTime extends React.PureComponent {
           month = 0;
           return modifyCalendarRecursion('nextYear');
         }
+
         const newMonth = month + 1;
         return {
           date: getDate(newMonth, year),
@@ -416,6 +495,7 @@ export default class DateTime extends React.PureComponent {
           month = 11;
           return modifyCalendarRecursion('previousYear');
         }
+
         const newMonth = month - 1;
         return {
           date: getDate(newMonth, year),
@@ -424,10 +504,12 @@ export default class DateTime extends React.PureComponent {
         };
       } else if (recursionType === 'nextDate') {
         const monthEnd = getMonthEnd(month, year);
+
         if (date === monthEnd) {
           date = 1;
           return modifyCalendarRecursion('nextMonth');
         }
+
         const newDate = parseInt(date) + 1;
         return {
           date: newDate,
@@ -439,6 +521,7 @@ export default class DateTime extends React.PureComponent {
           date = month === 0 ? getMonthEnd(11, year - 1) : getMonthEnd(month - 1, year);
           return modifyCalendarRecursion('previousMonth');
         }
+
         const newDate = parseInt(date) - 1;
         return {
           date: newDate,
@@ -447,8 +530,10 @@ export default class DateTime extends React.PureComponent {
         };
       }
     };
+
     return modifyCalendarRecursion(type);
   }
+
   modifyCalendar(type) {
     const {
       year,
@@ -461,9 +546,11 @@ export default class DateTime extends React.PureComponent {
       date
     }));
   }
+
   handleDateReset() {
     this.setState(this.getStateFromProps(this.props));
   }
+
   handleGetStateValues() {
     const {
       isActive
@@ -478,17 +565,20 @@ export default class DateTime extends React.PureComponent {
       isMonthOpen
     };
   }
+
   handleYearViewToggle(isYearOpen, isMonthOpen) {
     this.setState({
       isYearView: isYearOpen,
       isMonthOpen
     });
   }
+
   handleExposeMethods(isMount) {
     const {
       getMethods
     } = this.props;
     let methods = {};
+
     if (isMount) {
       methods = {
         resetLocalDate: this.handleDateReset,
@@ -502,8 +592,10 @@ export default class DateTime extends React.PureComponent {
         toggleYearView: null
       };
     }
+
     getMethods && getMethods(methods);
   }
+
   handleOpenYearView() {
     const {
       isYearView,
@@ -514,12 +606,14 @@ export default class DateTime extends React.PureComponent {
       isMonthOpen: !isMonthOpen
     });
   }
+
   handleSelectYear(year) {
     this.setState({
       year,
       isMonthOpen: true
     });
   }
+
   handleSelectMonth(month) {
     const {
       date,
@@ -527,14 +621,17 @@ export default class DateTime extends React.PureComponent {
     } = this.state;
     const monthEnd = getMonthEnd(month, year);
     let newDate = date;
+
     if (date > monthEnd) {
       newDate = monthEnd;
     }
+
     this.setState({
       month,
       date: newDate
     });
   }
+
   handleSelectMonthViaYearView(month) {
     this.handleSelectMonth(month);
     this.setState({
@@ -542,6 +639,7 @@ export default class DateTime extends React.PureComponent {
       isMonthOpen: false
     });
   }
+
   render() {
     const {
       date,
@@ -597,6 +695,7 @@ export default class DateTime extends React.PureComponent {
     const childEle = /*#__PURE__*/React.createElement("div", {
       className: `${style.container} ${innerClass}`,
       "data-id": `${dataId}_Calendar`,
+      "data-test-id": `${dataId}_Calendar`,
       onClick: this.closePopup
     }, /*#__PURE__*/React.createElement(DateTimePopupHeader, {
       onOpenYearView: this.handleOpenYearView,
@@ -654,7 +753,8 @@ export default class DateTime extends React.PureComponent {
     })) : null));
     return isDefaultPosition ? /*#__PURE__*/React.createElement("div", {
       className: `${style.dropBox} ${className}`,
-      "data-id": `${dataId}_dateBoxContainer`
+      "data-id": `${dataId}_dateBoxContainer`,
+      "data-test-id": `${dataId}_dateBoxContainer`
     }, childEle) : isReady ? /*#__PURE__*/React.createElement(ResponsiveDropBox, {
       size: boxSize,
       boxPosition: position,
@@ -677,6 +777,7 @@ export default class DateTime extends React.PureComponent {
       portalId: dropBoxPortalId
     }, /*#__PURE__*/React.createElement(Box, null, childEle)) : null;
   }
+
 }
 DateTime.propTypes = DateTime_propTypes;
 DateTime.defaultProps = DateTime_defaultProps;

package/es/DateTime/DateTime.module.css

@@ -3,24 +3,24 @@
 }
 
 [dir=ltr] .boxPadding {
-  padding-right: 19px;
-  padding-left: 19px;
+  padding-right: var(--zd_size19) ;
+  padding-left: var(--zd_size19) ;
 }
 
 [dir=rtl] .boxPadding {
-  padding-left: 19px;
-  padding-right: 19px;
+  padding-left: var(--zd_size19) ;
+  padding-right: var(--zd_size19) ;
 }
 
 .container {
-  font-size: 16px;
+  font-size: var(--zd_font_size16) ;
   composes: offSelection from '../common/common.module.css';
   border-radius: 3px;
   background-color: var(--zdt_datetime_default_bg);
 }
 
 .header {
-  min-height: 36px;
+  min-height: var(--zd_size36) ;
   composes: boxPadding;
   text-align: center;
   background-color: var(--zdt_datetime_header_bg);
@@ -33,18 +33,18 @@
 }
 
 .grid {
-  width: 28px;
-  height: 28px;
+  width: var(--zd_size28) ;
+  height: var(--zd_size28) ;
   line-height: var(--zd_size18);
   text-align: center;
-  padding: 4px 0;
+  padding: var(--zd_size4) 0 ;
   border-radius: 50%;
   border: 1px solid transparent;
 }
 
 .thArrow,
 .datesStr {
-  font-size: 13px;
+  font-size: var(--zd_font_size13) ;
   color: var(--zdt_datetime_datestr_text);
 }
 
@@ -62,15 +62,15 @@
 }
 
 [dir=ltr] .navigation {
-  margin-left: 2px;
+  margin-left: var(--zd_size2) ;
 }
 
 [dir=rtl] .navigation {
-  margin-right: 2px;
+  margin-right: var(--zd_size2) ;
 }
 
 .thMonYear {
-  font-size: 13px;
+  font-size: var(--zd_font_size13) ;
   line-height: var(--zd_size24);
   color: var(--zdt_datetime_datestr_text);
   composes: semibold;
@@ -78,8 +78,8 @@
 }
 
 .dateContainer {
-  margin: 0 19px 0 19px;
-  padding: 6px 0 10px 0;
+  margin: 0 var(--zd_size19) 0 var(--zd_size19) ;
+  padding: var(--zd_size6) 0 var(--zd_size10) 0 ;
 }
 
 .separator {
@@ -87,27 +87,27 @@
 }
 
 .days {
-  min-height: 36px;
+  min-height: var(--zd_size36) ;
   composes: boxPadding;
   composes: alignBetween from '../common/common.module.css';
-  padding-top: 7px;
+  padding-top: var(--zd_size7) ;
 }
 
 .daysStr {
-  font-size: 10px;
+  font-size: var(--zd_font_size10) ;
   color: var(--zdt_datetime_daystr_text);
   text-transform: uppercase;
   composes: semibold;
 }
 
 .dateRow {
-  height: 28px;
+  height: var(--zd_size28) ;
   composes: alignBetween from '../common/common.module.css';
-  margin: 1px 0 5px;
+  margin: var(--zd_size1) 0 var(--zd_size5) ;
 }
 
 .dateRow:last-child {
-  margin-bottom: 0;
+  margin-bottom: 0 ;
 }
 
 .sunday,
@@ -149,24 +149,24 @@
 
 
 .timesection {
-  padding-top: 5px;
-  padding-bottom: 10px;
+  padding-top: var(--zd_size5) ;
+  padding-bottom: var(--zd_size10) ;
 }
 
 .dropDownContainer {
-  padding: 0 5px;
+  padding: 0 var(--zd_size5) ;
 }
 
 .dropDown {
-  width: 60px;
+  width: var(--zd_size60) ;
   display: inline-block;
   position: relative;
-  margin: 0 4px;
+  margin: 0 var(--zd_size4) ;
 }
 
 .footer {
-  margin-top: 10px;
-  padding-bottom: 12px;
+  margin-top: var(--zd_size10) ;
+  padding-bottom: var(--zd_size12) ;
 }
 
 .timesection,
@@ -176,7 +176,7 @@
 
 .space {
   display: inline-block;
-  width: 15px;
+  width: var(--zd_size15) ;
 }
 
 .downArrow {
@@ -184,11 +184,11 @@
 }
 
 [dir=ltr] .downArrow {
-  margin-left: 2px;
+  margin-left: var(--zd_size2) ;
 }
 
 [dir=rtl] .downArrow {
-  margin-right: 2px;
+  margin-right: var(--zd_size2) ;
 }
 
 .dateText {
@@ -201,27 +201,27 @@
 
 .text {
   composes: boxPadding;
-  font-size: 11px;
+  font-size: var(--zd_font_size11) ;
   text-transform: uppercase;
   color: var(--zdt_datetime_text);
   composes: semibold;
   display: block;
-  margin-top: 14px;
+  margin-top: var(--zd_size14) ;
 }
 
 .yearContainer {
   position: absolute;
-  top: 0;
-  width: 100%;
-  height: 100%;
+  top: 0 ;
+  width: 100% ;
+  height: 100% ;
 }
 
 [dir=ltr] .yearContainer {
-  left: 0;
+  left: 0 ;
 }
 
 [dir=rtl] .yearContainer {
-  right: 0;
+  right: 0 ;
 }
 
 .subContainer {
@@ -229,7 +229,7 @@
 }
 
 .dropBox {
-  width: 100%;
+  width: 100% ;
   border-radius: 3px;
   box-shadow: var(--zd_bs_dropbox_bottom);
   background-color: var(--zdt_dropbox_default_bg);