intelicoreact 0.3.17 → 0.3.18

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

@@ -2,7 +2,7 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof = require("@babel/runtime/helpers/typeof");
+var _typeof3 = require("@babel/runtime/helpers/typeof");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -13,6 +13,12 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -23,9 +29,11 @@ var _defaultIcons = require("./partial/defaultIcons");
 
 require("./UserContacts.scss");
 
+var _excluded = ["email", "phone", "EmalIcon", "PhoneIcon", "maxWidth", "className", "isUseCommaSeparator", "isNotRenderGeneralizingWord", "Lng", "otherContacts"];
+
 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); }
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 var RC = 'user-contacts';
 
@@ -35,26 +43,49 @@ var UserContacts = function UserContacts(props) {
   var _ref = props || {},
       email = _ref.email,
       phone = _ref.phone,
-      contactType = _ref.contactType,
-      _ref$useCommaSeparato = _ref.useCommaSeparator,
-      useCommaSeparator = _ref$useCommaSeparato === void 0 ? true : _ref$useCommaSeparato,
-      _ref$isDisputeContact = _ref.isDisputeContact,
-      isDisputeContact = _ref$isDisputeContact === void 0 ? null : _ref$isDisputeContact,
-      _ref$isSalesContact = _ref.isSalesContact,
-      isSalesContact = _ref$isSalesContact === void 0 ? null : _ref$isSalesContact,
-      _ref$isAccountingCont = _ref.isAccountingContact,
-      isAccountingContact = _ref$isAccountingCont === void 0 ? null : _ref$isAccountingCont,
       EmalIcon = _ref.EmalIcon,
       PhoneIcon = _ref.PhoneIcon,
       maxWidth = _ref.maxWidth,
+      className = _ref.className,
+      _ref$isUseCommaSepara = _ref.isUseCommaSeparator,
+      isUseCommaSeparator = _ref$isUseCommaSepara === void 0 ? true : _ref$isUseCommaSepara,
+      _ref$isNotRenderGener = _ref.isNotRenderGeneralizingWord,
+      isNotRenderGeneralizingWord = _ref$isNotRenderGener === void 0 ? false : _ref$isNotRenderGener,
       _ref$Lng = _ref.Lng,
       Lng = _ref$Lng === void 0 ? function (value) {
     return value;
   } : _ref$Lng,
-      className = _ref.className;
+      _ref$otherContacts = _ref.otherContacts,
+      otherContacts = _ref$otherContacts === void 0 ? [] : _ref$otherContacts,
+      mainContacts = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+
+  var PRIMARY_TEXT = Lng('Primary'); //? В случае появления новых типов контактов добавлять их сюда по аналогии,
+  //? или на крайний случай в массив otherContacts (otherContacts - массив строк)
+
+  var mainContactsDescriptions = {
+    isDisputeContact: 'Dispute',
+    isSalesContact: 'Sales',
+    isAccountingContact: 'Accounting',
+    isBusinessContact: 'Business',
+    isTechnicalContact: 'Technical'
+  };
+
+  var getContact = function getContact(key) {
+    var _ref2 = (0, _typeof2.default)(mainContacts[key]) === 'object' ? mainContacts[key] : {},
+        prefix = _ref2.prefix,
+        postfix = _ref2.postfix;
+
+    return "".concat(prefix ? Lng(prefix.toString()) + ' ' : '').concat(Lng(mainContactsDescriptions[key])).concat(postfix ? ' ' + Lng(postfix.toString()) : '');
+  };
 
-  var isContact = !!isDisputeContact || !!isSalesContact || !!isAccountingContact;
-  var typeContactCount = isSalesContact + isDisputeContact + isAccountingContact;
+  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)(otherContacts.map(function (contact) {
+    return Lng(contact);
+  })));
+  var typeContactCount = mainContactsStructure.length;
+  var isContact = !!typeContactCount;
   var mainRef = (0, _react.useRef)(null);
   var emailRef = (0, _react.useRef)(null);
   var phoneRef = (0, _react.useRef)(null);
@@ -75,8 +106,10 @@ var UserContacts = function UserContacts(props) {
       isRunTask = _useState6[0],
       setIsRunTask = _useState6[1];
 
-  var getComma = function getComma() {
-    return typeContactCount-- > 1 ? ', ' : ' ';
+  var getSeparator = function getSeparator(isNotUseACount) {
+    if (isNotUseACount) return isUseCommaSeparator ? ', ' : ' ';
+    if (typeContactCount-- > 1) return isUseCommaSeparator ? ', ' : ' ';
+    return '';
   };
 
   var EIcon = EmalIcon || /*#__PURE__*/_react.default.createElement(_defaultIcons.DefaultEmalIcon, null);
@@ -104,7 +137,7 @@ var UserContacts = function UserContacts(props) {
       setIsUseEmailIcon(false);
       setIsUsePhoneIcon(false);
     };
-  }, [email, phone, isSalesContact, isSalesContact, isDisputeContact, isAccountingContact, +maxWidth, mainRef === null || mainRef === void 0 ? void 0 : (_mainRef$current = mainRef.current) === null || _mainRef$current === void 0 ? void 0 : _mainRef$current.clientWidth]);
+  }, [email, phone, JSON.stringify(mainContactsStructure), +maxWidth, mainRef === null || mainRef === void 0 ? void 0 : (_mainRef$current = mainRef.current) === null || _mainRef$current === void 0 ? void 0 : _mainRef$current.clientWidth]);
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: mainRef,
     className: (0, _classnames.default)('j4', RC, className)
@@ -114,18 +147,18 @@ var UserContacts = function UserContacts(props) {
     target: "_blank",
     rel: "noreferrer",
     className: (0, _classnames.default)('no-wrap', "".concat(RC, "__email"), (0, _defineProperty2.default)({}, "".concat(RC, "__email_icon-mode"), isUseEmailIcon))
-  }, isUseEmailIcon ? EIcon : "".concat(email).concat(phone && useCommaSeparator ? ',' : '')), !!phone && /*#__PURE__*/_react.default.createElement("a", {
+  }, isUseEmailIcon ? EIcon : "".concat(email).concat(phone || isContact ? getSeparator(true) : '')), !!phone && /*#__PURE__*/_react.default.createElement("a", {
     ref: phoneRef,
     href: "tel:+".concat((0, _fieldValueFormatters.formatOnlyNumbers)(phone).trim()),
     target: "_blank",
     rel: "noreferrer",
     className: (0, _classnames.default)('no-wrap', "".concat(RC, "__phone"), (0, _defineProperty2.default)({}, "".concat(RC, "__phone_icon-mode"), isUsePhonelIcon))
-  }, isUsePhonelIcon ? PIcon : "".concat(phone).concat(contactType && useCommaSeparator ? ',' : '')), !!contactType && /*#__PURE__*/_react.default.createElement("span", {
-    className: (0, _classnames.default)('no-wrap', "".concat(RC, "__contactType"))
-  }, contactType), isContact && /*#__PURE__*/_react.default.createElement("span", {
+  }, isUsePhonelIcon ? PIcon : "".concat(phone).concat(isContact ? getSeparator(true) : '')), isContact && /*#__PURE__*/_react.default.createElement("span", {
     ref: contactsRef,
     className: (0, _classnames.default)('no-wrap', "".concat(RC, "__contacts"))
-  }, isSalesContact ? "".concat(Lng('Sales')).concat(getComma()) : '', isDisputeContact ? "".concat(Lng('Dispute')).concat(getComma()) : '', isAccountingContact ? "".concat(Lng('Accounting ')) : '', "contact"));
+  }, mainContactsStructure.map(function (contact) {
+    return "".concat(contact).concat(getSeparator());
+  }), !isNotRenderGeneralizingWord ? " ".concat(Lng('contact')) : null));
 };
 
 var _default = UserContacts;

package/dist/Atomic/FormElements/WidgetWithSwitchableRows/WidgetWithSwitchableRows.js

@@ -56,7 +56,7 @@ var WidgetWithSwitchableRows = function WidgetWithSwitchableRows(props) {
     className: (0, _classnames.default)("".concat(RC, "__thead"))
   }, preperedColumns.map(function (field) {
     return /*#__PURE__*/_react.default.createElement("div", {
-      key: field.key,
+      key: "thead-".concat(field.key),
       className: (0, _classnames.default)("".concat(RC, "__thead-cell"), field.theadCellClassName, field.columnClassName, (0, _defineProperty2.default)({}, "".concat(RC, "__thead-cell_reqiured"), field.isRequired)),
       "data-key": field.key
     }, field.label);
@@ -64,10 +64,12 @@ var WidgetWithSwitchableRows = function WidgetWithSwitchableRows(props) {
     className: (0, _classnames.default)("".concat(RC, "__table"))
   }, rows !== null && rows !== void 0 && rows.length ? rows.map(function (row) {
     return /*#__PURE__*/_react.default.createElement("div", {
+      key: "row-".concat(row.id),
       className: (0, _classnames.default)("".concat(RC, "__row")),
       "data-id": row.id
     }, preperedColumns.map(function (cell) {
       return /*#__PURE__*/_react.default.createElement("div", {
+        key: "row-".concat(row.id, "-cell-").concat(cell.key),
         className: (0, _classnames.default)("".concat(RC, "__cell"), cell.cellClassName, cell.columnClassName)
       }, /*#__PURE__*/_react.default.createElement(CellComponent, (0, _extends2.default)({}, CellComponentProps, {
         field: _objectSpread(_objectSpread({}, cell), {}, {

package/package.json

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