intelicoreact 0.3.21 → 0.3.22

package/dist/Atomic/FormElements/UserContacts/UserContacts.js

@@ -29,7 +29,7 @@ var _defaultIcons = require("./partial/defaultIcons");
 
 require("./UserContacts.scss");
 
-var _excluded = ["className", "email", "phone", "EmalIcon", "PhoneIcon", "isFirstPhone", "maxWidth", "isUseCommaSeparator", "generalizingWord", "isNotRenderGeneralizingWord", "Lng", "otherContacts"];
+var _excluded = ["className", "email", "phone", "EmalIcon", "PhoneIcon", "isFirstPhone", "maxWidth", "isUseCommaSeparator", "generalizingWord", "isNotRenderGeneralizingWord", "Lng", "otherContacts", "isOtherTogetherMainContacts"];
 
 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); }
 
@@ -38,7 +38,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 var RC = 'user-contacts';
 
 var UserContacts = function UserContacts(props) {
-  var _otherContacts$map, _mainRef$current;
+  var _otherContacts$map, _mainRef$current, _otherContacts$map2;
 
   var _ref = props || {},
       className = _ref.className,
@@ -60,6 +60,8 @@ var UserContacts = function UserContacts(props) {
   } : _ref$Lng,
       _ref$otherContacts = _ref.otherContacts,
       otherContacts = _ref$otherContacts === void 0 ? [] : _ref$otherContacts,
+      _ref$isOtherTogetherM = _ref.isOtherTogetherMainContacts,
+      isOtherTogetherMainContacts = _ref$isOtherTogetherM === void 0 ? false : _ref$isOtherTogetherM,
       mainContacts = (0, _objectWithoutProperties2.default)(_ref, _excluded);
 
   var PRIMARY_TEXT = Lng('Primary'); //? В случае появления новых типов контактов добавлять их сюда по аналогии,
@@ -84,11 +86,12 @@ var UserContacts = function UserContacts(props) {
   var mainContactsStructure = Object.keys(mainContacts).reduce(function (acc, key) {
     return mainContacts[key] && key in mainContactsDescriptions ? [].concat((0, _toConsumableArray2.default)(acc), [getContact(key)]) : acc;
   }, []);
-  mainContactsStructure = [].concat((0, _toConsumableArray2.default)(mainContactsStructure), (0, _toConsumableArray2.default)(Array.isArray(otherContacts) ? otherContacts === null || otherContacts === void 0 ? void 0 : (_otherContacts$map = otherContacts.map) === null || _otherContacts$map === void 0 ? void 0 : _otherContacts$map.call(otherContacts, function (contact) {
+  mainContactsStructure = isOtherTogetherMainContacts ? [].concat((0, _toConsumableArray2.default)(mainContactsStructure), (0, _toConsumableArray2.default)(Array.isArray(otherContacts) ? otherContacts === null || otherContacts === void 0 ? void 0 : (_otherContacts$map = otherContacts.map) === null || _otherContacts$map === void 0 ? void 0 : _otherContacts$map.call(otherContacts, function (contact) {
     return Lng(contact);
-  }) : []));
-  var typeContactCount = mainContactsStructure.length;
-  var isContact = !!typeContactCount;
+  }) : [])) : mainContactsStructure;
+  var mainContactsCount = mainContactsStructure.length;
+  var otherContactsCount = (otherContacts === null || otherContacts === void 0 ? void 0 : otherContacts.length) || 0;
+  var isContact = !!mainContactsCount;
   var mainRef = (0, _react.useRef)(null);
   var firstRef = (0, _react.useRef)(null);
   var secondRef = (0, _react.useRef)(null);
@@ -104,10 +107,19 @@ var UserContacts = function UserContacts(props) {
       isRunTask = _useState4[0],
       setIsRunTask = _useState4[1];
 
-  var getSeparator = function getSeparator(isNotUseACount) {
-    if (isNotUseACount) return isUseCommaSeparator ? ', ' : ' ';
-    if (typeContactCount-- > 1) return isUseCommaSeparator ? ', ' : ' ';
-    return '';
+  var getSeparator = function getSeparator(type) {
+    var separator = isUseCommaSeparator ? ', ' : ' ';
+
+    switch (type) {
+      case 'main':
+        return mainContactsCount-- > 1 ? separator : '';
+
+      case 'other':
+        return otherContactsCount-- > 1 ? separator : '';
+
+      default:
+        return separator;
+    }
   };
 
   var firstKey = isFirstPhone ? 'phone' : 'email';
@@ -166,18 +178,20 @@ var UserContacts = function UserContacts(props) {
     target: "_blank",
     rel: "noreferrer",
     className: getClasses(true)
-  }, isIconMode ? getIcon(firstKey) : "".concat(props[firstKey]).concat(props[secondKey] || isContact ? getSeparator(true) : '')), !!props[secondKey] && /*#__PURE__*/_react.default.createElement("a", {
+  }, isIconMode ? getIcon(firstKey) : "".concat(props[firstKey]).concat(props[secondKey] || isContact ? getSeparator() : '')), !!props[secondKey] && /*#__PURE__*/_react.default.createElement("a", {
     ref: secondRef,
     href: "".concat(getProtocol(secondKey)).concat(props[secondKey].trim()),
     target: "_blank",
     rel: "noreferrer",
     className: getClasses()
-  }, isIconMode ? getIcon(secondKey) : "".concat(props[secondKey]).concat(isContact ? getSeparator(true) : '')), isContact && /*#__PURE__*/_react.default.createElement("span", {
+  }, isIconMode ? getIcon(secondKey) : "".concat(props[secondKey]).concat(isContact ? getSeparator() : '')), isContact && /*#__PURE__*/_react.default.createElement("span", {
     ref: contactsRef,
     className: (0, _classnames.default)('no-wrap', "".concat(RC, "__contacts"))
   }, mainContactsStructure.map(function (contact) {
-    return "".concat(contact).concat(getSeparator());
-  }), generalizingWord && !isNotRenderGeneralizingWord ? " ".concat(Lng(generalizingWord)) : ''));
+    return "".concat(contact).concat(getSeparator('main'));
+  }), generalizingWord && !isNotRenderGeneralizingWord ? " ".concat(Lng(generalizingWord)) : '', !!otherContacts && !!(otherContacts !== null && otherContacts !== void 0 && otherContacts.length) && !isOtherTogetherMainContacts ? getSeparator() : '', !!otherContacts && !!(otherContacts !== null && otherContacts !== void 0 && otherContacts.length) && !isOtherTogetherMainContacts ? otherContacts === null || otherContacts === void 0 ? void 0 : (_otherContacts$map2 = otherContacts.map) === null || _otherContacts$map2 === void 0 ? void 0 : _otherContacts$map2.call(otherContacts, function (contact) {
+    return "".concat(contact).concat(getSeparator('other'));
+  }) : null));
 };
 
 var _default = UserContacts;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intelicoreact",
-  "version": "0.3.21",
+  "version": "0.3.22",
   "description": "",
   "main": "dist/index.js",
   "files": [