@zohodesk/components 1.0.0-alpha-250 → 1.0.0-alpha-253

package/es/DateTime/CalendarView.js

@@ -5,21 +5,19 @@ 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'] }] */
 
+/* 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,
@@ -28,7 +26,10 @@ export default class CalendarView extends React.PureComponent {
       dataId,
       needBorder,
       dayNames,
-      dayNamesShort
+      dayNamesShort,
+      todayMonth,
+      todayDate,
+      todayYear
     } = this.props;
     const userSeeDate = new Date(year, month, 1);
     const userSeeDay = userSeeDate.getDay() + 1;
@@ -36,7 +37,9 @@ 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)
@@ -48,82 +51,79 @@ export default class CalendarView extends React.PureComponent {
 
     let incremday = 1;
     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 (incremday === parseInt(date) && parseInt(month) === userSeeMonth && parseInt(year) === userSeeYear) {
+              isSelectedDay = true;
+            } else if (todayDate === incremday && todayMonth === userSeeMonth && todayYear === userSeeYear) {
               isToday = true;
             } else {
+              isSelectedDay = false;
               isToday = false;
             }
-
             output = /*#__PURE__*/React.createElement(Span, {
               i: i,
-              isActive: isToday,
+              isActive: isSelectedDay,
               tdclass: tdclass,
               handleSelect: this.handleSelect,
               incremday: incremday,
               userSeeMonth: userSeeMonth,
               userSeeYear: userSeeYear,
-              dataId: isToday ? `${dataId}_dateSelected` : `${dataId}_date`
+              dataId: isSelectedDay ? `${dataId}_dateSelected` : `${dataId}_date`,
+              isToday: isToday
             });
             incremday++;
           } 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;
-            isToday = prevDate === parseInt(date) && parseInt(month) === prevMonth && parseInt(year) === prevYear ? true : false;
+            isSelectedDay = prevDate === parseInt(date) && parseInt(month) === prevMonth && parseInt(year) === prevYear ? true : false;
             output = /*#__PURE__*/React.createElement(Span, {
               i: i,
-              isActive: isToday,
+              isActive: isSelectedDay,
               tdclass: `${tdclass} ${style.invalidDate}`,
               handleSelect: this.handleSelect,
               incremday: prevDate,
               userSeeMonth: prevMonth,
               userSeeYear: prevYear,
-              dataId: isToday ? `${dataId}_dateSelected` : `${dataId}_invalidDate`
+              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;
-            isToday = nextDate === parseInt(date) && parseInt(month) === nextMonth && parseInt(year) === nextYear ? true : false;
+            isSelectedDay = nextDate === parseInt(date) && parseInt(month) === nextMonth && parseInt(year) === nextYear ? true : false;
             output = /*#__PURE__*/React.createElement(Span, {
               i: i,
-              isActive: isToday,
+              isActive: isSelectedDay,
               tdclass: `${tdclass}  ${style.invalidDate}`,
               handleSelect: this.handleSelect,
               incremday: nextDate,
               userSeeMonth: nextMonth,
               userSeeYear: nextYear,
-              dataId: isToday ? `${dataId}_dateSelected` : `${dataId}_invalidDate`
+              dataId: isSelectedDay ? `${dataId}_dateSelected` : `${dataId}_invalidDate`,
+              isToday: isToday
             });
           } else {
             output = /*#__PURE__*/React.createElement(Box, {
@@ -131,13 +131,10 @@ 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",
@@ -146,19 +143,17 @@ 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
+      dayNamesShort: dayNamesShort,
+      ariaLabel: dayNamesShort
     }), /*#__PURE__*/React.createElement("div", {
       "data-id": `${dataId}_dateContainer`,
       className: `${style.dateContainer} ${needBorder ? style.separator : ''}`
     }, rows));
   }
-
 }
 CalendarView.propTypes = CalendarView_propTypes;
 CalendarView.defaultProps = CalendarView_defaultProps;
@@ -167,7 +162,6 @@ export class Span extends React.PureComponent {
     super(props);
     this.handleSelectChild = this.handleSelectChild.bind(this);
   }
-
   handleSelectChild(e) {
     const {
       handleSelect,
@@ -177,23 +171,23 @@ export class Span extends React.PureComponent {
     } = this.props;
     handleSelect(incremday, userSeeMonth, userSeeYear, e);
   }
-
   render() {
     const {
       tdclass,
       incremday,
       i,
       dataId,
-      isActive
+      isActive,
+      isToday
     } = this.props;
     return /*#__PURE__*/React.createElement(Box, {
       dataId: dataId,
-      className: `${tdclass} ${isActive ? style.today : ''}`,
+      className: `${tdclass} ${isActive ? style.active : ''} ${isToday ? style.today : ''}`,
       key: i,
-      onClick: this.handleSelectChild
+      onClick: this.handleSelectChild,
+      "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 */
+
 import React from 'react';
 import { DateTime_propTypes } from './props/propTypes';
 import { DateTime_defaultProps } from './props/defaultProps';
@@ -18,13 +18,11 @@ import ResponsiveDropBox from '../ResponsiveDropBox/ResponsiveDropBox';
 import { ResponsiveReceiver } from '../Responsive/CustomResponsive';
 import { Box } from '../Layout';
 import { getHourDetails } 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);
@@ -54,29 +52,22 @@ export default class DateTime extends React.PureComponent {
       startPoint: hourStart,
       endPoint: hourEnd
     } = getHourDetails(props.is24Hour);
-
     this.hourSuggestions = (() => {
       const hourArr = [];
-
       for (let hour = hourStart; hour <= hourEnd; hour++) {
         const htxt = hour < 10 ? `0${hour}` : `${hour}`;
         hourArr.push(htxt);
       }
-
       return hourArr;
     })();
-
     this.minSuggestions = (() => {
       const minArr = [];
-
       for (let minute = 0; minute <= 59; minute++) {
         const mtxt = minute < 10 ? `0${minute}` : `${minute}`;
         minArr.push(mtxt);
       }
-
       return minArr;
     })();
-
     this.ampmSuggestions = (() => {
       const ampmSuggestions = [];
       ampmText.forEach((text, index) => {
@@ -94,29 +85,24 @@ 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,
@@ -124,11 +110,9 @@ export default class DateTime extends React.PureComponent {
       });
     }
   }
-
   componentWillUnmount() {
     this.handleExposeMethods(false);
   }
-
   getStateFromProps(props) {
     let date, month, year, hours, mins, amPm;
     let {
@@ -139,16 +123,17 @@ 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) : new Date();
     date = dateObj.getDate();
     month = dateObj.getMonth();
@@ -164,13 +149,14 @@ export default class DateTime extends React.PureComponent {
       year,
       mins,
       hours,
-      amPm
+      amPm,
+      todayDate,
+      todayMonth,
+      todayYear
     };
   }
-
   getHours(hoursParam, is24Hour) {
     let hours = hoursParam;
-
     if (!is24Hour) {
       if (hours === 0) {
         hours = 12;
@@ -178,11 +164,9 @@ export default class DateTime extends React.PureComponent {
         hours -= 12;
       }
     }
-
     hours = hours < 10 ? `0${hours}` : hours;
     return hours;
   }
-
   handleGetSelectedDate() {
     let selectedInfo = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     const {
@@ -201,25 +185,21 @@ 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;
-
+      maxInMillis = max ? datetime.millis(max) : null,
+      selectedInMillis,
+      selectedValue = '',
+      formattedValue;
     if (isDateTimeField) {
       selectedInMillis = datetime.tz.tzToUtc(Date.UTC(year, month, date, hours, mins), timeZone);
       selectedValue = datetime.ISO(selectedInMillis);
@@ -229,10 +209,8 @@ export default class DateTime extends React.PureComponent {
       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';
@@ -240,7 +218,6 @@ export default class DateTime extends React.PureComponent {
       isError = true;
       errorType = 'MAX';
     }
-
     return {
       isError,
       errorType,
@@ -248,7 +225,6 @@ export default class DateTime extends React.PureComponent {
       formattedValue
     };
   }
-
   handleSelect(e) {
     e && e.preventDefault();
     const {
@@ -278,7 +254,6 @@ export default class DateTime extends React.PureComponent {
       mins,
       amPm
     });
-
     if (isError) {
       if (errorType === 'MIN') {
         onError && onError(minErrorText, true);
@@ -289,7 +264,6 @@ export default class DateTime extends React.PureComponent {
       onSelect(selectedValue, formattedValue, e);
     }
   }
-
   handleChange() {
     let selectedInfo = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     const {
@@ -322,7 +296,6 @@ export default class DateTime extends React.PureComponent {
       mins: getIsEmptyValue(mins) ? oldMins : mins,
       amPm: getIsEmptyValue(amPm) ? oldAMPM : amPm
     };
-
     if (onChange) {
       const {
         isError,
@@ -330,7 +303,6 @@ export default class DateTime extends React.PureComponent {
         selectedValue,
         formattedValue
       } = this.handleGetSelectedDate(newSelectedInfo);
-
       if (isError) {
         if (errorType === 'MIN') {
           onError && onError(minErrorText, true);
@@ -345,20 +317,17 @@ 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,
@@ -390,7 +359,6 @@ export default class DateTime extends React.PureComponent {
       mins,
       amPm
     });
-
     if (isError) {
       if (errorType === 'MIN') {
         onError && onError(minErrorText, true);
@@ -401,31 +369,26 @@ 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*/
-
 
+  /*global closeGroupPopups*/
   closePopup() {
     closeGroupPopups('calender');
   }
-
   handleCalendarNavigation(type, selectedInfo) {
     const {
       year: stateYear,
@@ -435,12 +398,10 @@ 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
@@ -464,7 +425,6 @@ export default class DateTime extends React.PureComponent {
           month = 0;
           return modifyCalendarRecursion('nextYear');
         }
-
         const newMonth = month + 1;
         return {
           date: getDate(newMonth, year),
@@ -477,7 +437,6 @@ export default class DateTime extends React.PureComponent {
           month = 11;
           return modifyCalendarRecursion('previousYear');
         }
-
         const newMonth = month - 1;
         return {
           date: getDate(newMonth, year),
@@ -486,12 +445,10 @@ 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,
@@ -503,7 +460,6 @@ 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,
@@ -512,10 +468,8 @@ export default class DateTime extends React.PureComponent {
         };
       }
     };
-
     return modifyCalendarRecursion(type);
   }
-
   modifyCalendar(type) {
     const {
       year,
@@ -528,11 +482,9 @@ export default class DateTime extends React.PureComponent {
       date
     }));
   }
-
   handleDateReset() {
     this.setState(this.getStateFromProps(this.props));
   }
-
   handleGetStateValues() {
     const {
       isActive
@@ -547,20 +499,17 @@ 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,
@@ -574,10 +523,8 @@ export default class DateTime extends React.PureComponent {
         toggleYearView: null
       };
     }
-
     getMethods && getMethods(methods);
   }
-
   handleOpenYearView() {
     const {
       isYearView,
@@ -588,14 +535,12 @@ export default class DateTime extends React.PureComponent {
       isMonthOpen: !isMonthOpen
     });
   }
-
   handleSelectYear(year) {
     this.setState({
       year,
       isMonthOpen: true
     });
   }
-
   handleSelectMonth(month) {
     const {
       date,
@@ -603,17 +548,14 @@ 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({
@@ -621,7 +563,6 @@ export default class DateTime extends React.PureComponent {
       isMonthOpen: false
     });
   }
-
   responsiveFunc(_ref) {
     let {
       mediaQueryOR
@@ -632,7 +573,6 @@ export default class DateTime extends React.PureComponent {
       }])
     };
   }
-
   render() {
     const {
       date,
@@ -642,7 +582,10 @@ export default class DateTime extends React.PureComponent {
       mins,
       amPm,
       isYearView,
-      isMonthOpen
+      isMonthOpen,
+      todayDate,
+      todayMonth,
+      todayYear
     } = this.state;
     const {
       isDateTimeField,
@@ -703,7 +646,10 @@ export default class DateTime extends React.PureComponent {
       month: month,
       onSelect: this.dateSelect,
       dayNames: dayNames,
-      dayNamesShort: dayNamesShort
+      dayNamesShort: dayNamesShort,
+      todayDate: todayDate,
+      todayMonth: todayMonth,
+      todayYear: todayYear
     }), isDateTimeField ? /*#__PURE__*/React.createElement(Time, {
       timeText: timeText,
       dataId: dataId,
@@ -770,7 +716,6 @@ export default class DateTime extends React.PureComponent {
       }, /*#__PURE__*/React.createElement(Box, null, childEle));
     }) : null;
   }
-
 }
 DateTime.propTypes = DateTime_propTypes;
 DateTime.defaultProps = DateTime_defaultProps;