@zohodesk/i18n 1.0.0-beta.4 → 1.0.0-beta.41-murphy

package/es/components/DateTimeDiffFormat.js

@@ -1,222 +1,197 @@
-import _typeof from 'babel-runtime/helpers/typeof';
-import _Object$getPrototypeOf from 'babel-runtime/core-js/object/get-prototype-of';
-import _classCallCheck from 'babel-runtime/helpers/classCallCheck';
-import _createClass from 'babel-runtime/helpers/createClass';
-import _possibleConstructorReturn from 'babel-runtime/helpers/possibleConstructorReturn';
-import _inherits from 'babel-runtime/helpers/inherits';
 import React from 'react';
 import PropTypes from 'prop-types';
-import { pad, getValues, getDiffObj, formatDate, getLyears, convertUtcToUserTz } from '../utils';
-import FormatText from './FormatText';
-
-var DateTimeDiffFormat = function (_React$Component) {
-  _inherits(DateTimeDiffFormat, _React$Component);
-
-  function DateTimeDiffFormat(props) {
-    _classCallCheck(this, DateTimeDiffFormat);
-
-    var _this = _possibleConstructorReturn(this, (DateTimeDiffFormat.__proto__ || _Object$getPrototypeOf(DateTimeDiffFormat)).call(this, props));
-
-    _this.getSuffix = _this.getSuffix.bind(_this);
-    return _this;
+import { pad, getValues, getDiffObj, formatDate, getLyears, getDatePatternWithoutYear } from "../utils";
+import FormatText from "./FormatText";
+import datetime from '@zohodesk/datetimejs';
+export default class DateTimeDiffFormat extends React.Component {
+  constructor(props) {
+    super(props);
+    this.getSuffix = this.getSuffix.bind(this);
   }
-
-  _createClass(DateTimeDiffFormat, [{
-    key: 'getSuffix',
-    value: function getSuffix(min) {
-      var suffix = void 0;
-      if (this.props.ago && min < 0) {
-        suffix = this.props.ago || '';
-      } else if (this.props.later || min > 0) {
-        suffix = this.props.later || '';
-      } else {
-        suffix = '';
-      }
-      return suffix;
+  getSuffix(min) {
+    let suffix;
+    if (this.props.ago && min < 0) {
+      suffix = this.props.ago || '';
+    } else if (this.props.later || min > 0) {
+      suffix = this.props.later || '';
+    } else {
+      suffix = '';
     }
-  }, {
-    key: 'render',
-    value: function render() {
-      var _props = this.props,
-          type = _props.type,
-          page = _props.page,
-          from = _props.from,
-          fromTzData = _props.fromTzData,
-          to = _props.to,
-          toTzData = _props.toTzData,
-          today = _props.today,
-          yesterday = _props.yesterday,
-          tomorrow = _props.tomorrow,
-          others = _props.others,
-          format = _props.format,
-          dataId = _props.dataId,
-          _props$className = _props.className,
-          className = _props$className === undefined ? null : _props$className,
-          _props$title = _props.title,
-          title = _props$title === undefined ? null : _props$title,
-          isOverdue = _props.isOverdue;
-
-
-      var fromDateObj = convertUtcToUserTz(from, fromTzData).getTime();
-      var toDateObj = convertUtcToUserTz(to, toTzData).getTime();
-
-      var diffMin = new Date(to).getTime() - new Date(from).getTime();
-      var suffix = this.getSuffix(diffMin);
-      var diff = getDiffObj(diffMin);
-      var withInAWeak = diff.y === 0 && diff.yd <= 7;
-
-      var diffObj = {
-        h: diff.h,
-        m: diff.m,
-        s: diff.s,
-        y: diff.y,
-        hh: pad(diff.h, 2),
-        mm: pad(diff.m, 2),
-        ss: pad(diff.s, 2),
-        yy: pad(diff.y, 2),
-        days: diff.yd,
-        yDays: pad(diff.yd, 2),
-        isWithInAWeek: withInAWeak,
-        suffix: suffix
-      };
-      var diffObj1 = {
-        type: type,
-        page: page,
-        hours: diff.h,
-        minutes: diff.m,
-        seconds: diff.s,
-        years: diff.y,
-        yDays: diff.yd,
-        yMonth: diff.m,
-        isWithInAWeek: withInAWeak,
-        suffix: suffix,
-        crntDate: new Date(from).getDate(),
-        crntMonth: new Date(from).getMonth(),
-        crntYear: new Date(from).getFullYear(),
-        crntHours: new Date(from).getHours(),
-        crntMinutes: new Date(from).getMinutes(),
-        crntSeconds: new Date(from).getSeconds(),
-        tDate: new Date(to).getDate(),
-        tMonth: new Date(to).getMonth(),
-        tYear: new Date(to).getFullYear(),
-        tHours: new Date(to).getHours(),
-        tMinutes: new Date(to).getMinutes(),
-        tSeconds: new Date(to).getSeconds(),
-        betweenleepYears: getLyears(from, to),
-        isOverdue: isOverdue
-      };
-
-      var key = '';
-      var values = [];
-      var text = null;
-      var isSuffixEnable = false;
-      if (format) {
-        var years = void 0,
-            months = void 0,
-            days = void 0,
-            hours = void 0,
-            minutes = void 0,
-            seconds = void 0;
-        years = diffObj1.years > 1 ? '2' : diffObj1.years;
-
-        days = diff.yd > 1 ? '2' : diff.yd;
-        hours = diffObj1.hours > 1 ? '2' : diffObj1.hours;
-        minutes = diffObj1.minutes > 1 ? '2' : diffObj1.minutes;
-
-        var count = 0;
-        var pattern = [years, days, hours, minutes].reduce(function (res, next) {
-          if (count === 2) {
-            res = res + '0';
-          } else if (next !== 0) {
-            count++;
-            res = res + next;
-          } else {
-            res = res + next;
-          }
-          return res;
-        }, '');
-
-        var _value = format(diffObj1, pattern);
-        if (_value && (typeof _value === 'undefined' ? 'undefined' : _typeof(_value)) === 'object') {
-          key = _value.key;
-          values = getValues(_value.params, diffObj);
-          if (pattern.indexOf('00000') === 0) {
-            //suffix ignore for second hook
-            isSuffixEnable = false;
-          } else {
-            isSuffixEnable = true;
-          }
-        } else if (typeof _value === 'string') {
-          text = formatDate(toDateObj, _value, diffObj1);
+    return suffix;
+  }
+  render() {
+    const {
+      type,
+      page,
+      isNeedTime,
+      from,
+      fromTzData,
+      to,
+      toTzData,
+      today,
+      yesterday,
+      tomorrow,
+      others,
+      format,
+      dataId,
+      className = null,
+      title = null,
+      isOverdue,
+      timeFormat,
+      datePattern,
+      isEnabledCurrentYear,
+      isDateField
+    } = this.props;
+    let fromDateObj = datetime.toDate(datetime.tz.utcToTz(from, fromTzData)).getTime();
+    let toDateObj = datetime.toDate(isDateField ? to : datetime.tz.utcToTz(to, toTzData)).getTime();
+    let diffMin = new Date(to).getTime() - new Date(from).getTime();
+    let suffix = this.getSuffix(diffMin);
+    let diff = getDiffObj(diffMin);
+    let withInAWeak = diff.y === 0 && diff.yd <= 7;
+    let diffObj = {
+      h: diff.h,
+      m: diff.m,
+      s: diff.s,
+      y: diff.y,
+      hh: pad(diff.h, 2),
+      mm: pad(diff.m, 2),
+      ss: pad(diff.s, 2),
+      yy: pad(diff.y, 2),
+      days: diff.yd,
+      yDays: pad(diff.yd, 2),
+      isWithInAWeek: withInAWeak,
+      suffix: suffix
+    };
+    let diffObj1 = {
+      to: to,
+      type: type,
+      page: page,
+      isNeedTime: isNeedTime,
+      hours: diff.h,
+      minutes: diff.m,
+      seconds: diff.s,
+      years: diff.y,
+      yDays: diff.yd,
+      isWithInAWeek: withInAWeak,
+      suffix: suffix,
+      crntDate: new Date(from).getDate(),
+      crntMonth: new Date(from).getMonth(),
+      crntYear: new Date(from).getFullYear(),
+      crntHours: new Date(from).getHours(),
+      crntMinutes: new Date(from).getMinutes(),
+      crntSeconds: new Date(from).getSeconds(),
+      tDate: new Date(to).getDate(),
+      tMonth: new Date(to).getMonth(),
+      tYear: new Date(to).getFullYear(),
+      tHours: new Date(to).getHours(),
+      tMinutes: new Date(to).getMinutes(),
+      tSeconds: new Date(to).getSeconds(),
+      betweenleepYears: getLyears(from, to),
+      isOverdue: isOverdue,
+      timeFormat: timeFormat,
+      datePattern: datePattern,
+      dateTimePattern: `${datePattern} ${timeFormat}`
+    };
+
+    //In if condition we'll remove year and set date format  if the current year is not required
+    //In else part we'll set the date format as it is
+    if (isEnabledCurrentYear === true && diffObj1.years === 0 && diffObj1.tYear === diffObj1.crntYear) {
+      let dateFormat = getDatePatternWithoutYear(datePattern);
+      diffObj1.dateFormat = dateFormat;
+      diffObj1.dateTimeFormat = `${dateFormat} ${timeFormat}`;
+    } else {
+      diffObj1.dateFormat = datePattern;
+      diffObj1.dateTimeFormat = `${datePattern} ${timeFormat}`;
+    }
+    let key = '';
+    let values = [];
+    let text = null;
+    let isSuffixEnable = false;
+    if (format) {
+      let years, months, days, hours, minutes, seconds;
+      years = diffObj1.years > 1 ? '2' : diffObj1.years;
+      days = diff.yd > 1 ? '2' : diff.yd;
+      hours = diffObj1.hours > 1 ? '2' : diffObj1.hours;
+      minutes = diffObj1.minutes > 1 ? '2' : diffObj1.minutes;
+      let count = 0;
+      let pattern = [years, days, hours, minutes].reduce((res, next) => {
+        if (count === 2) {
+          res = `${res}0`;
+        } else if (next !== 0) {
+          count++;
+          res = res + next;
+        } else {
+          res = res + next;
         }
-      } else {
-        if (diff.y === 0 && (diff.yd === 0 || diff.yd === 1)) {
-          var dateObj = new Date(toDateObj);
-          var curDateObj = new Date(fromDateObj);
-          if (dateObj.getDate() === curDateObj.getDate()) {
-            if (typeof today === 'function') {
-              var value = today(diffObj1);
-              key = value.key;
-              values = getValues(value.params, diffObj);
-            } else if ((typeof today === 'undefined' ? 'undefined' : _typeof(today)) === 'object') {
-              key = today.key;
-              values = getValues(today.params, diffObj);
-              isSuffixEnable = true;
-            } else if (typeof today === 'string') {
-              text = formatDate(toDateObj, today);
-            }
-          } else if (dateObj.getDate() < curDateObj.getDate()) {
-            if (typeof yesterday === 'function') {
-              var value = yesterday(diffObj1);
-              key = value.key;
-              values = getValues(value.params, diffObj);
-            } else if ((typeof yesterday === 'undefined' ? 'undefined' : _typeof(yesterday)) === 'object') {
-              key = yesterday.key;
-              values = getValues(yesterday.params, diffObj);
-            } else if (typeof yesterday === 'string') {
-              text = formatDate(toDateObj, yesterday);
-            }
-          } else if (dateObj.getDate() > curDateObj.getDate()) {
-            if (typeof tomorrow === 'function') {
-              var value = tomorrow(diffObj1);
-              key = value.key;
-              text = getValues(value.params, diffObj);
-            } else if ((typeof tomorrow === 'undefined' ? 'undefined' : _typeof(tomorrow)) === 'object') {
-              key = tomorrow.key;
-              values = getValues(tomorrow.params, diffObj);
-            } else if (typeof tomorrow === 'string') {
-              text = formatDate(toDateObj, tomorrow);
-            }
-          }
+        return res;
+      }, '');
+      let value = format(diffObj1, pattern);
+      if (value && typeof value === 'object') {
+        key = value.key;
+        values = getValues(value.params, diffObj);
+        if (pattern.indexOf('00000') === 0) {
+          //suffix ignore for second hook
+          isSuffixEnable = false;
         } else {
-          var value = others(diffObj1);
-          if ((typeof value === 'undefined' ? 'undefined' : _typeof(value)) === 'object') {
-            key = value.key;
-            values = getValues(value.params, diffObj);
-            isSuffixEnable = true;
-          } else if (typeof value === 'string') {
-            text = formatDate(toDateObj, value);
+          isSuffixEnable = true;
+        }
+      } else if (typeof value === 'string') {
+        text = formatDate(toDateObj, value, diffObj1);
+      }
+    } else {
+      let dateObj = new Date(toDateObj);
+      let curDateObj = new Date(fromDateObj);
+      let diffDayType = diffObj1.yDays;
+
+      //In this condition, to calculate different days we have copied it from live --> diffDayType
+      if (isOverdue && dateObj.getDate() < curDateObj.getDate() && diffObj1.yDays == 0) {
+        diffDayType = -1;
+      }
+      if (!isOverdue) {
+        let diffHr = dateObj.getHours() - curDateObj.getHours();
+        if (diffHr < 0) {
+          diffDayType += 1;
+        } else if (diffHr == 0) {
+          let diffMins = dateObj.getMinutes() - curDateObj.getMinutes();
+          if (diffMins < 0) {
+            diffDayType += 1;
+          } else if (diffMins == 0) {
+            let diffSec = dateObj.getSeconds() - curDateObj.getSeconds();
+            if (diffSec < 0) {
+              diffDayType += 1;
+            }
           }
         }
       }
-      return text ? React.createElement(
-        'span',
-        { className: className, 'data-title': title, 'data-id': dataId },
-        text
-      ) : React.createElement(FormatText, {
-        i18NKey: isSuffixEnable && suffix !== '' ? key + '.' + suffix : key,
-        values: values,
-        className: className,
-        'data-title': title
-      });
+      if (diff.y === 0 && (diffDayType === 0 || diffDayType === 1)) {
+        if (dateObj.getDate() === curDateObj.getDate()) {
+          var value = today && today(diffObj1) || others(diffObj1);
+          text = formatDate(toDateObj, value);
+        } else if (dateObj.getMonth() === curDateObj.getMonth() && dateObj.getDate() < curDateObj.getDate() || dateObj.getMonth() < curDateObj.getMonth()) {
+          var value = yesterday && yesterday(diffObj1) || others(diffObj1);
+          text = formatDate(toDateObj, value);
+        } else if (!isOverdue && diff.y === 0 && diffDayType === 1) {
+          var value = tomorrow && tomorrow(diffObj1) || others(diffObj1);
+          text = formatDate(toDateObj, value);
+        }
+      } else {
+        var value = others(diffObj1);
+        text = formatDate(toDateObj, value);
+      }
     }
-  }]);
-
-  return DateTimeDiffFormat;
-}(React.Component);
-
-export default DateTimeDiffFormat;
-
+    return text ? /*#__PURE__*/React.createElement("span", {
+      className: className,
+      "data-title": title,
+      "data-id": dataId,
+      "data-test-id": dataId
+    }, text) : /*#__PURE__*/React.createElement(FormatText, {
+      i18NKey: isSuffixEnable && suffix !== '' ? `${key}.${suffix}` : key,
+      values: values,
+      className: className,
+      "data-title": title
+    });
+  }
+}
 DateTimeDiffFormat.propTypes = {
   ago: PropTypes.string,
   className: PropTypes.string,
@@ -224,6 +199,7 @@ DateTimeDiffFormat.propTypes = {
   format: PropTypes.func,
   from: PropTypes.string,
   fromTzData: PropTypes.object,
+  isDateField: PropTypes.bool,
   later: PropTypes.string,
   others: PropTypes.func,
   title: PropTypes.string,

package/es/components/FormatText.js

@@ -1,33 +1,13 @@
-import _Object$getPrototypeOf from 'babel-runtime/core-js/object/get-prototype-of';
-import _classCallCheck from 'babel-runtime/helpers/classCallCheck';
-import _createClass from 'babel-runtime/helpers/createClass';
-import _possibleConstructorReturn from 'babel-runtime/helpers/possibleConstructorReturn';
-import _inherits from 'babel-runtime/helpers/inherits';
 import React from 'react';
 import PropTypes from 'prop-types';
-import I18N from './I18N';
-
-var FormatText = function (_React$Component) {
-  _inherits(FormatText, _React$Component);
-
-  function FormatText() {
-    _classCallCheck(this, FormatText);
-
-    return _possibleConstructorReturn(this, (FormatText.__proto__ || _Object$getPrototypeOf(FormatText)).apply(this, arguments));
+import I18N from "./I18N";
+export default class FormatText extends React.Component {
+  render() {
+    return /*#__PURE__*/React.createElement(I18N, {
+      ...this.props
+    });
   }
-
-  _createClass(FormatText, [{
-    key: 'render',
-    value: function render() {
-      return React.createElement(I18N, this.props);
-    }
-  }]);
-
-  return FormatText;
-}(React.Component);
-
-export default FormatText;
-
+}
 FormatText.propTypes = {
   i18NKey: PropTypes.string.isRequired,
   isHtml: PropTypes.bool,

package/es/components/HOCI18N.js

@@ -1,62 +1,39 @@
-import _extends from 'babel-runtime/helpers/extends';
-import _Object$getPrototypeOf from 'babel-runtime/core-js/object/get-prototype-of';
-import _classCallCheck from 'babel-runtime/helpers/classCallCheck';
-import _createClass from 'babel-runtime/helpers/createClass';
-import _possibleConstructorReturn from 'babel-runtime/helpers/possibleConstructorReturn';
-import _inherits from 'babel-runtime/helpers/inherits';
 import React, { Children } from 'react';
 import PropTypes from 'prop-types';
-import { replaceI18NValuesWithRegex, unescapeUnicode } from '../utils';
-import { I18NContext } from '../I18NContext';
-export default (function () {
-  var i18NKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  return function (Component) {
-    var HOCI18N = function (_React$Component) {
-      _inherits(HOCI18N, _React$Component);
-
-      function HOCI18N(props) {
-        _classCallCheck(this, HOCI18N);
-
-        var _this = _possibleConstructorReturn(this, (HOCI18N.__proto__ || _Object$getPrototypeOf(HOCI18N)).call(this, props));
-
-        _this.getI18NValue = _this.getI18NValue.bind(_this);
-        return _this;
+import { replaceI18NValuesWithRegex, unescapeUnicode } from "../utils";
+import { I18NContext } from "../I18NContext";
+export default (i18NKeys = []) => Component => {
+  class HOCI18N extends React.Component {
+    constructor(props) {
+      super(props);
+      this.getI18NValue = this.getI18NValue.bind(this);
+    }
+    getI18NValue(key) {
+      const {
+        i18n
+      } = this.context || {};
+      if (typeof i18n === 'undefined') {
+        return key;
       }
-
-      _createClass(HOCI18N, [{
-        key: 'getI18NValue',
-        value: function getI18NValue(key) {
-          var _ref = this.context || {},
-              i18n = _ref.i18n;
-
-          if (typeof i18n === 'undefined') {
-            return key;
-          }
-          var i18nStr = i18n[key];
-          if (i18nStr === undefined) {
-            return key;
-          }
-          return unescapeUnicode(i18nStr);
-        }
-      }, {
-        key: 'render',
-        value: function render() {
-          var _this2 = this;
-
-          var i18nProps = i18NKeys.reduce(function (result, key) {
-            if (_this2.props[key]) {
-              result[key] = _this2.getI18NValue(_this2.props[key]);
-            }
-            return result;
-          }, {});
-          return React.createElement(Component, _extends({}, this.props, i18nProps));
+      let i18nStr = i18n[key];
+      if (i18nStr === undefined) {
+        return key;
+      }
+      return unescapeUnicode(i18nStr);
+    }
+    render() {
+      let i18nProps = i18NKeys.reduce((result, key) => {
+        if (this.props[key]) {
+          result[key] = this.getI18NValue(this.props[key]);
         }
-      }]);
-
-      return HOCI18N;
-    }(React.Component);
-
-    HOCI18N.contextType = I18NContext;
-    return HOCI18N;
-  };
-});
+        return result;
+      }, {});
+      return /*#__PURE__*/React.createElement(Component, {
+        ...this.props,
+        ...i18nProps
+      });
+    }
+  }
+  HOCI18N.contextType = I18NContext;
+  return HOCI18N;
+};