@zohodesk/i18n 1.0.0-beta.2 → 1.0.0-beta.20

package/README.md

@@ -1,5 +1,80 @@
-# i18n
-
-# 1.0.0-beta.0
-
-- Test Publish
+# i18n
+
+# 1.0.0-beta.20
+
+- Date field issue fixed in UserTimeDiffFormat component
+
+# 1.0.0-beta.19
+
+- In this version we have made changes in i18n provider to call user date format function only if the time zone data is available.
+# 1.0.0-beta.18
+
+- Localization feature added and incorporated into getI18NValue Method.
+
+# 1.0.0-beta.17
+
+- There was some i18n changes done in live before moving the date format build to live. Since we need these changes we have published it as new version.
+
+# 1.0.0-beta.16
+
+- DatePattern and dateTimePattern key has been changed for the date format build.
+
+# 1.0.0-beta.15.1
+
+- Zoho security version updated.
+
+# 1.0.0-beta.15
+
+- When working on date format build we have published I18n. Also, before moving date format build to master we had a emergency fix that need to be sent, so when publishing I18n we have published the date format changes with the next version.
+
+# 1.0.0-beta.14
+
+- Issue fixed in enable current year.
+
+# 1.0.0-beta.13
+
+- Issue fixed in due date.
+
+# 1.0.0-beta.12
+
+- Issue fixed in date Format Pattern.
+
+# 1.0.0-beta.11
+
+- Date Format Changes
+
+# 1.0.0-beta.10
+
+- Date Format Issue Fixes
+
+# 1.0.0-beta.9
+
+- Date Format Changes
+
+# 1.0.0-beta.8
+
+- ES Module Support Changes
+
+# 1.0.0-beta.7
+
+- 'userDateFormat' util method - 'others' function fix
+
+# 1.0.0-beta.6
+
+- Added new prop 'isNeedTime' for DateTimeDiffFormat Component
+
+# 1.0.0-beta.5
+
+- Timezone logic moved to @zohodesk/datetimejs
+
+# 1.0.0-beta.4
+
+- Added new prop 'page' for DateTimeDiffFormat Component
+
+# 1.0.0-beta.3
+
+- Added support for exact times along with relative times in format() function
+
+# 1.0.0-beta.0
+
+- Test Publish

package/es/I18NContext.js

@@ -1,3 +1,2 @@
 import React from 'react';
-
-export var I18NContext = React.createContext();
+export const I18NContext = /*#__PURE__*/React.createContext();

package/es/components/DateTimeDiffFormat.js

@@ -1,204 +1,210 @@
-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 { 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);
+  }
 
-var DateTimeDiffFormat = function (_React$Component) {
-  _inherits(DateTimeDiffFormat, _React$Component);
-
-  function DateTimeDiffFormat(props) {
-    _classCallCheck(this, DateTimeDiffFormat);
+  getSuffix(min) {
+    let suffix;
 
-    var _this = _possibleConstructorReturn(this, (DateTimeDiffFormat.__proto__ || _Object$getPrototypeOf(DateTimeDiffFormat)).call(this, props));
+    if (this.props.ago && min < 0) {
+      suffix = this.props.ago || '';
+    } else if (this.props.later || min > 0) {
+      suffix = this.props.later || '';
+    } else {
+      suffix = '';
+    }
 
-    _this.getSuffix = _this.getSuffix.bind(_this);
-    return _this;
+    return suffix;
   }
 
-  _createClass(DateTimeDiffFormat, [{
-    key: 'getSuffix',
-    value: function getSuffix(min) {
-      var suffix = void 0;
-      if (min < 0) {
-        suffix = this.props.ago || '';
-      } else if (min > 0) {
-        suffix = this.props.later || '';
-      } else {
-        suffix = '';
-      }
-      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}`;
     }
-  }, {
-    key: 'render',
-    value: function render() {
-      var _props = this.props,
-          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;
-
-
-      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 = {
-        hours: diff.h,
-        minutes: diff.m,
-        seconds: diff.s,
-        years: diff.y,
-        yDays: diff.yd,
-        isWithInAWeek: withInAWeak,
-        suffix: suffix,
-        crntMonth: new Date(to).getMonth(),
-        betweenleepYears: getLyears(from, to)
-      };
-
-      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);
+
+    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
-      });
-    }
-  }]);
 
-  return DateTimeDiffFormat;
-}(React.Component);
+      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);
+      }
+    }
 
-export default DateTimeDiffFormat;
+    return text ? /*#__PURE__*/React.createElement("span", {
+      className: className,
+      "data-title": title,
+      "data-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,
@@ -206,6 +212,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,12 @@
-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));
+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,60 +1,48 @@
-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';
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
 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);
+  let i18NKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  return Component => {
+    class HOCI18N extends React.Component {
+      constructor(props) {
+        super(props);
+        this.getI18NValue = this.getI18NValue.bind(this);
+      }
 
-      function HOCI18N(props) {
-        _classCallCheck(this, HOCI18N);
+      getI18NValue(key) {
+        const {
+          i18n
+        } = this.context || {};
 
-        var _this = _possibleConstructorReturn(this, (HOCI18N.__proto__ || _Object$getPrototypeOf(HOCI18N)).call(this, props));
+        if (typeof i18n === 'undefined') {
+          return key;
+        }
 
-        _this.getI18NValue = _this.getI18NValue.bind(_this);
-        return _this;
-      }
+        let i18nStr = i18n[key];
 
-      _createClass(HOCI18N, [{
-        key: 'getI18NValue',
-        value: function getI18NValue(key) {
-          var _ref = this.context || {},
-              i18n = _ref.i18n;
+        if (i18nStr === undefined) {
+          return key;
+        }
 
-          if (typeof i18n === 'undefined') {
-            return key;
-          }
-          var 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 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));
-        }
-      }]);
 
-      return HOCI18N;
-    }(React.Component);
+          return result;
+        }, {});
+        return /*#__PURE__*/React.createElement(Component, _extends({}, this.props, i18nProps));
+      }
+
+    }
 
     HOCI18N.contextType = I18NContext;
     return HOCI18N;