@zohodesk/components 1.0.0-alpha-270 → 1.0.0-alpha-272

package/es/DateTime/CalendarView.js

@@ -5,19 +5,21 @@ import { Container, Box } from '../Layout';
 import style from './DateTime.module.css';
 import { getMonthEnd } from '../utils/datetime/common';
 import DaysRow from './DaysRow';
-
 /* eslint css-modules/no-unused-class: [0, { markAsUsed: ['container', 'header', 'thArrowConatainer', 'thArrow', 'thMonYear', 'days', 'daysStr', 'timesection', 'timeStr', 'dropDownContainer', 'dropDown', 'footer', 'space'] }] */
+
 export default class CalendarView extends React.PureComponent {
   constructor(props) {
     super(props);
     this.handleSelect = this.handleSelect.bind(this);
   }
+
   handleSelect(day, month, year, e) {
     const {
       onSelect
     } = this.props;
     onSelect(day, month, year, e);
   }
+
   render() {
     const {
       date,
@@ -37,9 +39,7 @@ export default class CalendarView extends React.PureComponent {
     const userSeeMonth = userSeeDate.getMonth();
     const monthEnd = getMonthEnd(month, year);
     const lastMonth = 11;
-    const firstMonth = 0;
-
-    // let noOfRow = 5;
+    const firstMonth = 0; // let noOfRow = 5;
     // if (
     //   (monthEnd === 31 && userSeeDay >= 6) ||
     //   (monthEnd === 30 && userSeeDay === 7)
@@ -53,16 +53,21 @@ export default class CalendarView extends React.PureComponent {
     let incremleti = 1;
     let isSelectedDay = false;
     let isToday = false;
+
     const rows = (() => {
       const rowArr = [];
+
       for (let j = 1; j <= 6; j++) {
         const dayArr = [];
         let output = null;
+
         for (let i = 1; i < 8; i++) {
           let tdclass = `${style.datesStr} ${style.grid}`;
+
           if (i === 1) {
             tdclass += ` ${style.sunday}`;
           }
+
           if (incremleti >= userSeeDay && incremday <= monthEnd) {
             if (parseInt(date) === incremday && parseInt(month) === userSeeMonth && parseInt(year) === userSeeYear) {
               isSelectedDay = true;
@@ -73,6 +78,7 @@ export default class CalendarView extends React.PureComponent {
               isSelectedDay = false;
               isToday = false;
             }
+
             output = /*#__PURE__*/React.createElement(Span, {
               i: i,
               isActive: isSelectedDay,
@@ -88,54 +94,51 @@ export default class CalendarView extends React.PureComponent {
           } else if (incremleti < userSeeDay) {
             let prevMonth = userSeeMonth - 1;
             let prevYear = userSeeYear;
+
             if (userSeeMonth === firstMonth) {
               prevMonth = lastMonth;
               prevYear = userSeeYear - 1;
             }
+
             const prevMonthEnd = getMonthEnd(prevMonth, prevYear);
-            const prevDate = prevMonthEnd - (userSeeDay - 1) + incremleti;
+            const prevDate = prevMonthEnd - (userSeeDay - 1) + incremleti; // isSelectedDay =
 
-            // isSelectedDay =
-            prevDate === parseInt(date) && parseInt(month) === prevMonth && parseInt(year) === prevYear ? true : false;
-            // isToday = prevDate === incremday && todayMonth === userSeeMonth && todayYear === userSeeYear ? true : false;
+            prevDate === parseInt(date) && parseInt(month) === prevMonth && parseInt(year) === prevYear ? true : false; // isToday = prevDate === incremday && todayMonth === userSeeMonth && todayYear === userSeeYear ? true : false;
 
             output = /*#__PURE__*/React.createElement(Span, {
-              i: i
-              //isActive={isSelectedDay}
+              i: i //isActive={isSelectedDay}
               ,
               tdclass: `${tdclass} ${style.invalidDate}`,
               handleSelect: this.handleSelect,
               incremday: prevDate,
               userSeeMonth: prevMonth,
               userSeeYear: prevYear,
-              dataId: isSelectedDay ? `${dataId}_dateSelected` : `${dataId}_invalidDate`
-              // isToday={isToday}
+              dataId: isSelectedDay ? `${dataId}_dateSelected` : `${dataId}_invalidDate` // isToday={isToday}
+
             });
           } else if (incremleti > monthEnd) {
             let nextMonth = userSeeMonth + 1;
             let nextYear = userSeeYear;
+
             if (userSeeMonth === lastMonth) {
               nextMonth = firstMonth;
               nextYear = userSeeYear + 1;
             }
-            const nextDate = incremleti - (userSeeDay - 1) - monthEnd;
 
-            // isSelectedDay =
-            nextDate === parseInt(date) && parseInt(month) === nextMonth && parseInt(year) === nextYear ? true : false;
+            const nextDate = incremleti - (userSeeDay - 1) - monthEnd; // isSelectedDay =
 
-            // isToday = nextDate === incremday && todayMonth === userSeeMonth && todayYear === userSeeYear ? true : false;
+            nextDate === parseInt(date) && parseInt(month) === nextMonth && parseInt(year) === nextYear ? true : false; // isToday = nextDate === incremday && todayMonth === userSeeMonth && todayYear === userSeeYear ? true : false;
 
             output = /*#__PURE__*/React.createElement(Span, {
-              i: i
-              // isActive={isSelectedDay}
+              i: i // isActive={isSelectedDay}
               ,
               tdclass: `${tdclass}  ${style.invalidDate}`,
               handleSelect: this.handleSelect,
               incremday: nextDate,
               userSeeMonth: nextMonth,
               userSeeYear: nextYear,
-              dataId: isSelectedDay ? `${dataId}_dateSelected` : `${dataId}_invalidDate`
-              //isToday={isToday}
+              dataId: isSelectedDay ? `${dataId}_dateSelected` : `${dataId}_invalidDate` //isToday={isToday}
+
             });
           } else {
             output = /*#__PURE__*/React.createElement(Box, {
@@ -143,10 +146,13 @@ export default class CalendarView extends React.PureComponent {
               className: `${style.grid}`
             });
           }
+
           incremleti++;
           dayArr.push(output);
         }
         /* eslint-disable react/forbid-component-props */
+
+
         rowArr.push( /*#__PURE__*/React.createElement(Container, {
           key: j,
           alignBox: "row",
@@ -155,8 +161,10 @@ export default class CalendarView extends React.PureComponent {
           className: style.dateRow
         }, dayArr));
       }
+
       return rowArr;
     })();
+
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DaysRow, {
       dayNames: dayNames,
       dayNamesShort: dayNamesShort,
@@ -166,6 +174,7 @@ export default class CalendarView extends React.PureComponent {
       className: `${style.dateContainer} ${needBorder ? style.separator : ''}`
     }, rows));
   }
+
 }
 CalendarView.propTypes = CalendarView_propTypes;
 CalendarView.defaultProps = CalendarView_defaultProps;
@@ -174,6 +183,7 @@ export class Span extends React.PureComponent {
     super(props);
     this.handleSelectChild = this.handleSelectChild.bind(this);
   }
+
   handleSelectChild(e) {
     const {
       handleSelect,
@@ -183,6 +193,7 @@ export class Span extends React.PureComponent {
     } = this.props;
     handleSelect(incremday, userSeeMonth, userSeeYear, e);
   }
+
   render() {
     const {
       tdclass,
@@ -200,6 +211,7 @@ export class Span extends React.PureComponent {
       "aria-label": incremday
     }, incremday);
   }
+
 }
 Span.propTypes = Span_propTypes;
 Span.defaultProps = Span_defaultProps;

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);
@@ -47,6 +49,7 @@ export default class DateTime extends React.PureComponent {
     const {
       ampmText = ampmTextDefault
     } = props.i18nKeys;
+
     this.ampmSuggestions = (() => {
       const ampmSuggestions = [];
       ampmText.forEach((text, index) => {
@@ -64,24 +67,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 +97,11 @@ export default class DateTime extends React.PureComponent {
       });
     }
   }
+
   componentWillUnmount() {
     this.handleExposeMethods(false);
   }
+
   getStateFromProps(props) {
     let date, month, year, hours, mins, amPm;
     let {
@@ -102,17 +112,20 @@ 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;
     date = dateObj.getDate();
     month = dateObj.getMonth();
@@ -134,8 +147,10 @@ export default class DateTime extends React.PureComponent {
       todayYear
     };
   }
+
   getHours(hoursParam, is24Hour) {
     let hours = hoursParam;
+
     if (!is24Hour) {
       if (hours === 0) {
         hours = 12;
@@ -143,9 +158,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 +171,8 @@ export default class DateTime extends React.PureComponent {
       timeZone,
       isDateTimeField,
       dateFormat,
-      is24Hour
+      is24Hour,
+      customDateFormat
     } = this.props;
     let {
       year,
@@ -164,32 +182,41 @@ 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) {
+      selectedInMillis = datetime.tz.tzToUtc(Date.UTC(year, month, date, hours, mins, sec, milliSec), timeZone);
       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(year, month, date, hours, mins, sec, milliSec), 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 +224,7 @@ export default class DateTime extends React.PureComponent {
       isError = true;
       errorType = 'MAX';
     }
+
     return {
       isError,
       errorType,
@@ -204,6 +232,7 @@ export default class DateTime extends React.PureComponent {
       formattedValue
     };
   }
+
   handleSelect(e) {
     e && e.preventDefault();
     const {
@@ -233,6 +262,7 @@ export default class DateTime extends React.PureComponent {
       mins,
       amPm
     });
+
     if (isError) {
       if (errorType === 'MIN') {
         onError && onError(minErrorText, true);
@@ -243,6 +273,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 +306,7 @@ export default class DateTime extends React.PureComponent {
       mins: getIsEmptyValue(mins) ? oldMins : mins,
       amPm: getIsEmptyValue(amPm) ? oldAMPM : amPm
     };
+
     if (onChange) {
       const {
         isError,
@@ -282,6 +314,7 @@ export default class DateTime extends React.PureComponent {
         selectedValue,
         formattedValue
       } = this.handleGetSelectedDate(newSelectedInfo);
+
       if (isError) {
         if (errorType === 'MIN') {
           onError && onError(minErrorText, true);
@@ -296,17 +329,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 +374,7 @@ export default class DateTime extends React.PureComponent {
       mins,
       amPm
     });
+
     if (isError) {
       if (errorType === 'MIN') {
         onError && onError(minErrorText, true);
@@ -348,26 +385,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 +419,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 +448,7 @@ export default class DateTime extends React.PureComponent {
           month = 0;
           return modifyCalendarRecursion('nextYear');
         }
+
         const newMonth = month + 1;
         return {
           date: getDate(newMonth, year),
@@ -416,6 +461,7 @@ export default class DateTime extends React.PureComponent {
           month = 11;
           return modifyCalendarRecursion('previousYear');
         }
+
         const newMonth = month - 1;
         return {
           date: getDate(newMonth, year),
@@ -424,10 +470,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 +487,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 +496,10 @@ export default class DateTime extends React.PureComponent {
         };
       }
     };
+
     return modifyCalendarRecursion(type);
   }
+
   modifyCalendar(type) {
     const {
       year,
@@ -461,9 +512,11 @@ export default class DateTime extends React.PureComponent {
       date
     }));
   }
+
   handleDateReset() {
     this.setState(this.getStateFromProps(this.props));
   }
+
   handleGetStateValues() {
     const {
       isActive
@@ -478,17 +531,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 +558,10 @@ export default class DateTime extends React.PureComponent {
         toggleYearView: null
       };
     }
+
     getMethods && getMethods(methods);
   }
+
   handleOpenYearView() {
     const {
       isYearView,
@@ -514,12 +572,14 @@ export default class DateTime extends React.PureComponent {
       isMonthOpen: !isMonthOpen
     });
   }
+
   handleSelectYear(year) {
     this.setState({
       year,
       isMonthOpen: true
     });
   }
+
   handleSelectMonth(month) {
     const {
       date,
@@ -527,14 +587,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 +605,7 @@ export default class DateTime extends React.PureComponent {
       isMonthOpen: false
     });
   }
+
   render() {
     const {
       date,
@@ -677,6 +741,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/DateTimePopupFooter.js

@@ -1,12 +1,13 @@
 /* eslint-disable react/forbid-component-props */
+
 /** ** Libraries *** */
 import React, { PureComponent } from 'react';
-
 /** ** Components *** */
+
 import { Container } from '../Layout';
 import Button from '../Button/Button';
-
 /** ** CSS *** */
+
 import style from './DateTime.module.css';
 export default class DateTimePopupFooter extends PureComponent {
   render() {
@@ -38,4 +39,5 @@ export default class DateTimePopupFooter extends PureComponent {
       dataId: `${dataId}_clearBtn`
     }));
   }
+
 }

package/es/DateTime/DateTimePopupHeader.js

@@ -2,19 +2,21 @@
 
 /** ** Libraries *** */
 import React, { PureComponent } from 'react';
-
 /** ** Components *** */
+
 import { Container, Box } from '../Layout';
 import { Icon } from '@zohodesk/icons';
 import Heading from '../Heading/Heading';
-
 /** ** CSS *** */
+
 import style from './DateTime.module.css';
+
 class Span extends React.PureComponent {
   constructor(props) {
     super(props);
     this.modifyCalendarChild = this.modifyCalendarChild.bind(this);
   }
+
   modifyCalendarChild() {
     const {
       modifyCalendar,
@@ -22,6 +24,7 @@ class Span extends React.PureComponent {
     } = this.props;
     modifyCalendar(type);
   }
+
   render() {
     const {
       dataTitle,
@@ -39,7 +42,9 @@ class Span extends React.PureComponent {
       tabindex: "0"
     }, children);
   }
+
 }
+
 export default class DateTimePopupHeader extends PureComponent {
   render() {
     const {
@@ -94,4 +99,5 @@ export default class DateTimePopupHeader extends PureComponent {
       isBold: true
     }))) : null);
   }
+
 }