@zohodesk/i18n 1.0.0-beta.32 → 1.0.0-beta.34

package/README.md

@@ -1,5 +1,13 @@
 # i18n
 
+# 1.0.0-beta.34
+
+- Tagholder Replacement with React Component
+
+# 1.0.0-beta.33
+
+- Upgrading @zoho/SecurityJS package to 7.2.4
+
 # 1.0.0-beta.32
 
 - Upgrading @zoho/SecurityJS package to 7.2.0

package/es/components/DateTimeDiffFormat.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { pad, getValues, getDiffObj, formatDate, getLyears, getDatePatternWithoutYear } from '../utils';
-import FormatText from './FormatText';
+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) {

package/es/components/FormatText.js

@@ -1,9 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import I18N from './I18N';
+import I18N from "./I18N";
 export default class FormatText extends React.Component {
   render() {
-    return /*#__PURE__*/React.createElement(I18N, this.props);
+    return /*#__PURE__*/React.createElement(I18N, { ...this.props
+    });
   }
 
 }

package/es/components/HOCI18N.js

@@ -1,9 +1,7 @@
-function _extends() { _extends = Object.assign ? Object.assign.bind() : 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';
+import { replaceI18NValuesWithRegex, unescapeUnicode } from "../utils";
+import { I18NContext } from "../I18NContext";
 export default (function () {
   let i18NKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   return Component => {
@@ -39,7 +37,9 @@ export default (function () {
 
           return result;
         }, {});
-        return /*#__PURE__*/React.createElement(Component, _extends({}, this.props, i18nProps));
+        return /*#__PURE__*/React.createElement(Component, { ...this.props,
+          ...i18nProps
+        });
       }
 
     }

package/es/components/I18N.js

@@ -1,8 +1,8 @@
 import React, { Children } from 'react';
 import PropTypes from 'prop-types';
-import { replaceI18NValuesWithRegex, unescapeUnicode } from '../utils';
+import { replaceI18NValuesWithRegex, unescapeUnicode } from "../utils";
 import { HTMLPurifier } from '@zoho/SecurityJS';
-import { I18NContext } from '../I18NContext';
+import { I18NContext } from "../I18NContext";
 export default class I18N extends React.Component {
   constructor(props) {
     super(props);

package/es/components/I18NProvider.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { getI18NValue, userDateFormat } from '../utils';
-import { getI18NComponent } from '../utils/jsxTranslations';
-import { I18NContext } from '../I18NContext';
+import { getI18NValue, userDateFormat } from "../utils";
+import { getI18NComponent } from "../utils/jsxTranslations";
+import { I18NContext } from "../I18NContext";
 const emptyObj = {};
 
 const dummy = (key, values) => key;

package/es/components/PluralFormat.js

@@ -1,8 +1,6 @@
-function _extends() { _extends = Object.assign ? Object.assign.bind() : 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 from 'react';
 import PropTypes from 'prop-types';
-import FormatText from './FormatText';
+import FormatText from "./FormatText";
 export default class PluralFormat extends React.Component {
   render() {
     const {
@@ -23,13 +21,13 @@ export default class PluralFormat extends React.Component {
     }
 
     values = `${value}`;
-    return /*#__PURE__*/React.createElement(FormatText, _extends({}, this.props, {
+    return /*#__PURE__*/React.createElement(FormatText, { ...this.props,
       i18NKey: key,
       values: values,
       one: null,
       many: null,
       zero: null
-    }));
+    });
   }
 
 }

package/es/components/UserTimeDiffFormat.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import DateTimeDiffFormat from './DateTimeDiffFormat';
-import { I18NContext } from '../I18NContext';
+import DateTimeDiffFormat from "./DateTimeDiffFormat";
+import { I18NContext } from "../I18NContext";
 export default class UserTimeDiffFormat extends Component {
   render() {
     let currentTime = new Date();

package/es/components/__tests__/DateTimeDiffFormat.spec.js

@@ -1,5 +1,5 @@
-import DateTimeDiffFormat from '../DateTimeDiffFormat';
-import I18NProvider from '../I18NProvider';
+import DateTimeDiffFormat from "../DateTimeDiffFormat";
+import I18NProvider from "../I18NProvider";
 import React from 'react';
 import renderer from 'react-test-renderer';
 let tzData = {

package/es/components/__tests__/FormatText.spec.js

@@ -1,5 +1,5 @@
-import FormatText from '../FormatText';
-import I18NProvider from '../I18NProvider';
+import FormatText from "../FormatText";
+import I18NProvider from "../I18NProvider";
 import React from 'react';
 import renderer from 'react-test-renderer';
 describe('FormatText component', () => {

package/es/components/__tests__/HOCI18N.spec.js

@@ -1,5 +1,5 @@
-import HOCI18N from '..//HOCI18N';
-import I18NProvider from '../I18NProvider';
+import HOCI18N from "..//HOCI18N";
+import I18NProvider from "../I18NProvider";
 import PropTypes from 'prop-types';
 import React from 'react';
 import renderer from 'react-test-renderer';

package/es/components/__tests__/I18N.spec.js

@@ -1,7 +1,5 @@
-function _extends() { _extends = Object.assign ? Object.assign.bind() : 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 I18N from '../I18N';
-import I18NProvider from '../I18NProvider';
+import I18N from "../I18N";
+import I18NProvider from "../I18NProvider";
 import React from 'react';
 import renderer from 'react-test-renderer';
 const defaultProps = {
@@ -13,9 +11,9 @@ describe('I18N component', () => {
       i18n: {
         key1: 'vimal1<b>vimal</b>'
       }
-    }, /*#__PURE__*/React.createElement(I18N, _extends({}, defaultProps, {
+    }, /*#__PURE__*/React.createElement(I18N, { ...defaultProps,
       isHtml: true
-    }))));
+    })));
     let tree = ele.toJSON();
     expect(tree).toMatchSnapshot();
   });
@@ -24,7 +22,8 @@ describe('I18N component', () => {
       i18n: {
         key1: 'vimal1<b>vimal</b>'
       }
-    }, /*#__PURE__*/React.createElement(I18N, defaultProps)));
+    }, /*#__PURE__*/React.createElement(I18N, { ...defaultProps
+    })));
     let tree = ele.toJSON();
     expect(tree).toMatchSnapshot();
   });

package/es/components/__tests__/I18NProvider.spec.js

@@ -1,5 +1,5 @@
-import I18NProvider, { i18NProviderUtils } from '../I18NProvider';
-import I18N from '../I18N';
+import I18NProvider, { i18NProviderUtils } from "../I18NProvider";
+import I18N from "../I18N";
 import React from 'react';
 import renderer from 'react-test-renderer';
 import { Provider } from 'react-redux';

package/es/components/__tests__/PluralFormat.spec.js

@@ -1,6 +1,6 @@
-import PluralFormat from '../PluralFormat';
-import I18NProvider from '../I18NProvider';
-import FormatText from '../FormatText';
+import PluralFormat from "../PluralFormat";
+import I18NProvider from "../I18NProvider";
+import FormatText from "../FormatText";
 import React from 'react';
 import renderer from 'react-test-renderer';
 describe('PluralFormat component', () => {

package/es/components/__tests__/UserTimeDiffFormat.spec.js

@@ -1,5 +1,5 @@
-import UserTimeDiffFormat from '../UserTimeDiffFormat';
-import I18NProvider, { i18NProviderUtils } from '../I18NProvider';
+import UserTimeDiffFormat from "../UserTimeDiffFormat";
+import I18NProvider, { i18NProviderUtils } from "../I18NProvider";
 import React from 'react';
 import renderer from 'react-test-renderer';
 let temp = Date;

package/es/index.js

@@ -1,11 +1,12 @@
-export { formatDate, pad, replaceI18NValuesWithRegex, unescapeUnicode, getValues, getI18NInfo, isToday, isYesterday, isTomorrow, isWithinAWeek, isTwoWeeksOrMore, userDateFormat, getDiffObj, getLyears, getSuffix, getDatePatternWithoutYear, setLocalizedData, setI18NKeyMapping, dayi18n, monthi18n, timei18n } from './utils';
-import { getI18NValue as getI18NValue1 } from './utils';
-export { I18NContext } from './I18NContext';
-export { default as I18NProvider, i18NProviderUtils } from './components/I18NProvider';
-export { default as I18N } from './components/I18N';
-export { default as HOCI18N } from './components/HOCI18N';
-export { default as FormatText } from './components/FormatText';
-export { default as PluralFormat } from './components/PluralFormat';
-export { default as DateTimeDiffFormat } from './components/DateTimeDiffFormat';
-export { default as UserTimeDiffFormat } from './components/UserTimeDiffFormat';
+export { formatDate, pad, replaceI18NValuesWithRegex, unescapeUnicode, getValues, getI18NInfo, isToday, isYesterday, isTomorrow, isWithinAWeek, isTwoWeeksOrMore, userDateFormat, getDiffObj, getLyears, getSuffix, getDatePatternWithoutYear, setLocalizedData, setI18NKeyMapping, dayi18n, monthi18n, timei18n } from "./utils";
+import { getI18NValue as getI18NValue1 } from "./utils";
+export { I18NContext } from "./I18NContext";
+export { default as I18NProvider, i18NProviderUtils } from "./components/I18NProvider";
+export { default as I18N } from "./components/I18N";
+export { default as HOCI18N } from "./components/HOCI18N";
+export { default as FormatText } from "./components/FormatText";
+export { default as PluralFormat } from "./components/PluralFormat";
+export { default as DateTimeDiffFormat } from "./components/DateTimeDiffFormat";
+export { default as UserTimeDiffFormat } from "./components/UserTimeDiffFormat";
+export { placeComponentForTags } from "./utils/jsxTranslations";
 export const getI18NValue = (i18n, key, values) => getI18NValue1(i18n)(key, values);

package/es/utils/__tests__/jsxTranslations.spec.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { splitMatchedExp, generateChildren, replaceWithComponentPlaceHolder, createElement, prepareI18NFunc, getI18NComponent } from '../jsxTranslations';
+import { splitMatchedExp, generateChildren, replaceWithComponentPlaceHolder, createElement, prepareI18NFunc, getI18NComponent } from "../jsxTranslations";
 
 function Bold(_ref) {
   let {

package/es/utils/index.js

@@ -1,5 +1,5 @@
 import datetime from '@zohodesk/datetimejs';
-import { i18NProviderUtils } from '../components/I18NProvider';
+import { i18NProviderUtils } from "../components/I18NProvider";
 export const dayi18n = {
   'Sun': 'deskreact.calendar.daynameshort.sunday',
   'Mon': 'deskreact.calendar.daynameshort.monday',

package/es/utils/jsxTranslations.js

@@ -1,5 +1,6 @@
 import React from 'react';
-import { unescapeUnicode } from './index';
+import { unescapeUnicode } from "./index";
+import { i18NProviderUtils } from "../components/I18NProvider";
 export function splitMatchedExp(_ref) {
   let {
     expression,
@@ -165,6 +166,26 @@ export function prepareI18NFunc() {
     stringPlaceHolders
   });
 }
+
+function i18nMechanismForComponents(i18nValue, key) {
+  if (typeof i18nValue === 'string') {
+    i18nValue = unescapeUnicode(i18nValue);
+    const value = prepareI18NFunc({
+      i18nKey: i18nValue
+    });
+    window.loadI18nChunk && window.loadI18nChunk({
+      [key]: value
+    });
+    i18nValue = value;
+  }
+
+  return i18nValue;
+}
+
+export function placeComponentForTags(i18nValue) {
+  const value = i18NProviderUtils.getI18NComponent(i18nValue);
+  return i18nMechanismForComponents(value, value);
+}
 export function getI18NComponent(i18n) {
   if (typeof i18n === 'undefined') {
     return key => key;
@@ -177,17 +198,6 @@ export function getI18NComponent(i18n) {
       return key;
     }
 
-    if (typeof i18nStr === 'string') {
-      i18nStr = unescapeUnicode(i18nStr);
-      const value = prepareI18NFunc({
-        i18nKey: i18nStr
-      });
-      window.loadI18nChunk && window.loadI18nChunk({
-        [key]: value
-      });
-      i18nStr = value;
-    }
-
-    return i18nStr;
+    return i18nMechanismForComponents(i18nStr, key);
   };
 }

package/lib/index.js

@@ -150,6 +150,12 @@ Object.defineProperty(exports, "pad", {
     return _utils.pad;
   }
 });
+Object.defineProperty(exports, "placeComponentForTags", {
+  enumerable: true,
+  get: function get() {
+    return _jsxTranslations.placeComponentForTags;
+  }
+});
 Object.defineProperty(exports, "replaceI18NValuesWithRegex", {
   enumerable: true,
   get: function get() {
@@ -205,6 +211,8 @@ var _DateTimeDiffFormat = _interopRequireDefault(require("./components/DateTimeD
 
 var _UserTimeDiffFormat = _interopRequireDefault(require("./components/UserTimeDiffFormat"));
 
+var _jsxTranslations = require("./utils/jsxTranslations");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }

package/lib/utils/jsxTranslations.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.createElement = createElement;
 exports.generateChildren = generateChildren;
 exports.getI18NComponent = getI18NComponent;
+exports.placeComponentForTags = placeComponentForTags;
 exports.prepareI18NFunc = prepareI18NFunc;
 exports.replaceWithComponentPlaceHolder = replaceWithComponentPlaceHolder;
 exports.splitMatchedExp = splitMatchedExp;
@@ -14,6 +15,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _index = require("./index");
 
+var _I18NProvider = require("../components/I18NProvider");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -214,6 +217,25 @@ function prepareI18NFunc() {
   });
 }
 
+function i18nMechanismForComponents(i18nValue, key) {
+  if (typeof i18nValue === 'string') {
+    i18nValue = (0, _index.unescapeUnicode)(i18nValue);
+    var value = prepareI18NFunc({
+      i18nKey: i18nValue
+    });
+    window.loadI18nChunk && window.loadI18nChunk(_defineProperty({}, key, value));
+    i18nValue = value;
+  }
+
+  return i18nValue;
+}
+
+function placeComponentForTags(i18nValue) {
+  var value = _I18NProvider.i18NProviderUtils.getI18NComponent(i18nValue);
+
+  return i18nMechanismForComponents(value, value);
+}
+
 function getI18NComponent(i18n) {
   if (typeof i18n === 'undefined') {
     return function (key) {
@@ -228,15 +250,6 @@ function getI18NComponent(i18n) {
       return key;
     }
 
-    if (typeof i18nStr === 'string') {
-      i18nStr = (0, _index.unescapeUnicode)(i18nStr);
-      var value = prepareI18NFunc({
-        i18nKey: i18nStr
-      });
-      window.loadI18nChunk && window.loadI18nChunk(_defineProperty({}, key, value));
-      i18nStr = value;
-    }
-
-    return i18nStr;
+    return i18nMechanismForComponents(i18nStr, key);
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/i18n",
-  "version": "1.0.0-beta.32",
+  "version": "1.0.0-beta.34",
   "main": "lib/index",
   "module": "es/index.js",
   "jsnext:main": "es/index.js",
@@ -20,7 +20,7 @@
     "lint": "react-cli lint"
   },
   "dependencies": {
-    "@zoho/SecurityJS": "7.2.0"
+    "@zoho/SecurityJS": "7.2.4"
   },
   "react-cli": {
     "docs": {

package/src/index.js

@@ -33,5 +33,6 @@ export { default as FormatText } from './components/FormatText';
 export { default as PluralFormat } from './components/PluralFormat';
 export { default as DateTimeDiffFormat } from './components/DateTimeDiffFormat';
 export { default as UserTimeDiffFormat } from './components/UserTimeDiffFormat';
+export { placeComponentForTags } from "./utils/jsxTranslations";
 export const getI18NValue = (i18n, key, values) =>
   getI18NValue1(i18n)(key, values);

package/src/utils/jsxTranslations.js

@@ -2,6 +2,9 @@ import React from 'react';
 import {
     unescapeUnicode
 } from './index';
+import {
+    i18NProviderUtils
+} from "../components/I18NProvider";
 
 export function splitMatchedExp({
     expression,
@@ -156,6 +159,25 @@ export function prepareI18NFunc({
     });
 }
 
+function i18nMechanismForComponents(i18nValue, key) {
+    if(typeof i18nValue === 'string') {
+        i18nValue = unescapeUnicode(i18nValue);
+        const value = prepareI18NFunc({
+            i18nKey: i18nValue
+        });
+        window.loadI18nChunk && window.loadI18nChunk({
+            [key] : value
+        });
+        i18nValue = value;
+    } 
+    return i18nValue;
+}
+
+export function placeComponentForTags(i18nValue) {
+    const value = i18NProviderUtils.getI18NComponent(i18nValue);
+    return i18nMechanismForComponents(value, value);
+}
+
 export function getI18NComponent(i18n) {
     if(typeof i18n === 'undefined') {
         return (key) => key;
@@ -165,16 +187,6 @@ export function getI18NComponent(i18n) {
         if (i18nStr === undefined) {
             return  key;
         }
-        if(typeof i18nStr === 'string') {
-            i18nStr = unescapeUnicode(i18nStr);
-            const value = prepareI18NFunc({
-                i18nKey: i18nStr
-            });
-            window.loadI18nChunk && window.loadI18nChunk({
-                [key] : value
-            });
-            i18nStr = value;
-        } 
-        return i18nStr;
+        return i18nMechanismForComponents(i18nStr, key);
     }
 }