intelicoreact 1.5.19 → 1.5.21

package/dist/Atomic/FormElements/RangeList/RangeList.js

@@ -35,7 +35,7 @@ const RangeList = props => {
     defaultErrorText,
     nullValueText,
     isOnlyOneRow = false,
-    testId
+    testId = "range-list"
   } = props;
   const NULL_VALUE_TEXT = nullValueText !== null && nullValueText !== void 0 ? nullValueText : "No data";
   const [state, setState] = (0, _react.useState)(DEFAULT_STATE);
@@ -93,7 +93,6 @@ const RangeList = props => {
   }, /*#__PURE__*/_react.default.createElement(_RangeListRow.RangeListCell, {
     className: "".concat(RC, "__cell-input")
   }, /*#__PURE__*/_react.default.createElement(_Input.default, {
-    testId: "range-list".concat(testId && "--".concat(testId), "-from"),
     ref: inputFromRef,
     onlyNumbers: isFloatValues ? {
       type: "float",
@@ -108,7 +107,6 @@ const RangeList = props => {
   })), /*#__PURE__*/_react.default.createElement(_RangeListRow.RangeListCell, {
     className: "".concat(RC, "__cell-input")
   }, /*#__PURE__*/_react.default.createElement(_Input.default, {
-    testId: "range-list".concat(testId && "--".concat(testId), "-to"),
     ref: inputToRef,
     onlyNumbers: isFloatValues ? {
       type: "float",
@@ -123,10 +121,10 @@ const RangeList = props => {
   })), /*#__PURE__*/_react.default.createElement(_RangeListRow.RangeListCell, {
     className: "".concat(RC, "__cell-button")
   }, /*#__PURE__*/_react.default.createElement(_Button.default, {
-    testId: "range-list".concat(testId && "--".concat(testId), "-button"),
     onClick: handle.addRange
   }, "Add")));
   return /*#__PURE__*/_react.default.createElement("div", {
+    "data-testid": testId,
     className: (0, _classnames.default)(RC, className, {
       ["".concat(RC, "_disabled")]: disabled
     })
@@ -141,7 +139,7 @@ const RangeList = props => {
   }, innerError || error || outerError), !(value !== null && value !== void 0 && value.length) && /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)("".concat(RC, "__row"), "".concat(RC, "__values"), "".concat(RC, "__null-value"))
   }, NULL_VALUE_TEXT), value.map((row, idx) => /*#__PURE__*/_react.default.createElement(_RangeListRow.default, (0, _extends2.default)({
-    "data-testid": "range-list-row-".concat(idx),
+    "data-testid": "".concat(testId, "-row-").concat(idx),
     key: "idx-".concat(idx, "-from-").concat(row.from, "-to").concat(row.to)
   }, row, {
     idx: idx,

package/dist/Atomic/FormElements/RangeSlider/RangeSlider.js

@@ -42,7 +42,7 @@ function RangeSlider(_ref) {
     decimalPlaces = 2,
     minRange = 0,
     precision = 0,
-    testId,
+    testId = "range-slider",
     value = {
       from: min,
       to: max
@@ -303,7 +303,7 @@ function RangeSlider(_ref) {
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "range-slider__inputs--from"
     }, /*#__PURE__*/_react.default.createElement(_Input.default, (0, _extends2.default)({
-      "data-testid": "rangeSlider--input--".concat(testId, "--type-from"),
+      "data-testid": "".concat(testId, "-input-from"),
       value: from.toString(),
       onFocus: e => onRangeInputFocus(e, "from"),
       onBlur: e => onRangeInputBlur(e, "from"),
@@ -318,7 +318,7 @@ function RangeSlider(_ref) {
     }, _mobileKeyboardTypesPresets.NUMERIC_KEYBOARD))), /*#__PURE__*/_react.default.createElement("div", {
       className: "range-slider__inputs__input"
     }, /*#__PURE__*/_react.default.createElement(_Input.default, (0, _extends2.default)({
-      "data-testid": "rangeSlider--input--".concat(testId, "--type-to"),
+      "data-testid": "".concat(testId, "-input-to"),
       value: to.toString(),
       onFocus: e => onRangeInputFocus(e, "to"),
       onBlur: e => onRangeInputBlur(e, "to"),
@@ -362,7 +362,7 @@ function RangeSlider(_ref) {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "range-slider__track__range-triggers"
     }, /*#__PURE__*/_react.default.createElement("div", {
-      "data-testid": "rangeSlider--track--".concat(testId, "--type-from"),
+      "data-testid": "".concat(testId, "-track-from"),
       ref: fromTriggerRef,
       style: fromStyle,
       className: "range-slider__track__range-triggers--trigger range-slider__track__range-triggers--trigger-left",
@@ -372,7 +372,7 @@ function RangeSlider(_ref) {
       onTouchEnd: onTriggerMoveEnd,
       onClick: () => {} // DONT REMOVE! MOBILE WILL NOT WORK WITHOUT IT
     }), /*#__PURE__*/_react.default.createElement("div", {
-      "data-testid": "rangeSlider--track--".concat(testId, "--type-to"),
+      "data-testid": "".concat(testId, "-track-to"),
       ref: toTriggerRef,
       style: toStyle,
       className: "range-slider__track__range-triggers--trigger range-slider__track__range-triggers--trigger-right",
@@ -394,6 +394,7 @@ function RangeSlider(_ref) {
     }), renderTrackRange(), renderTrackTriggers());
   };
   return /*#__PURE__*/_react.default.createElement("div", {
+    "data-testid": testId,
     className: "range-slider"
   }, renderHeader(), renderInputs(), renderTrack());
 }

package/dist/Atomic/FormElements/SwitchableRow/SwitchableRow.js

@@ -19,12 +19,11 @@ const SwitchableRow = props => {
     setIsActive,
     switcherLabel,
     isSwitcherLabelBold,
-    testId,
-    id
+    testId = RC_default
   } = props || {};
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(RC, className),
-    "data-testid": "".concat(RC, "-").concat(testId)
+    "data-testid": testId
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)("".concat(RC, "__cell"))
   }, /*#__PURE__*/_react.default.createElement(_Switcher.default, {
@@ -32,7 +31,7 @@ const SwitchableRow = props => {
     onChange: setIsActive,
     isLabelBold: isSwitcherLabelBold,
     label: switcherLabel,
-    "data-testid": "switchable-row-".concat(testId, "-switcher")
+    "data-testid": "".concat(testId, "-switcher")
   })), children);
 };
 var _default = exports.default = SwitchableRow;

package/dist/Atomic/FormElements/Switcher/Switcher.js

@@ -20,14 +20,15 @@ const Switcher = _ref => {
     isLabelBold,
     hint,
     hintSide,
-    testId
+    testId = "switcher"
   } = _ref;
   return /*#__PURE__*/_react.default.createElement("div", {
+    "data-testid": testId,
     className: (0, _classnames.default)(RC, className, {
       ["".concat(RC, "_disabled")]: disabled
     })
   }, /*#__PURE__*/_react.default.createElement("button", {
-    "data-testid": "switcher--key-".concat(testId, "--button"),
+    "data-testid": "".concat(testId, "-button"),
     className: (0, _classnames.default)("".concat(RC, "__button")),
     onClick: e => onChange(!isActive, e)
   }, /*#__PURE__*/_react.default.createElement("div", {

package/dist/Atomic/FormElements/Text/Text.js

@@ -97,7 +97,7 @@ const Text = _ref => {
     className: "".concat(RC, "__icon-container")
   }, icon), value);
   return /*#__PURE__*/_react.default.createElement("div", {
-    "data-testid": "text--".concat(testId),
+    "data-testid": testId,
     className: (0, _classnames.default)(RC, className, {
       ["".concat(RC, "-left")]: align === "left",
       ["".concat(RC, "-center")]: align === "center",

package/dist/Atomic/FormElements/Textarea/Textarea.js

@@ -23,7 +23,7 @@ const Textarea = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     disabled,
     className,
     isNotValidateASCII = false,
-    testId = "",
+    testId = RC,
     withAutoGrow,
     onKeyDown = () => {}
   } = _ref;
@@ -52,10 +52,11 @@ const Textarea = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     }
   }, [value, withAutoGrow]);
   return /*#__PURE__*/_react.default.createElement("div", {
+    "data-testid": testId,
     className: (0, _classnames.default)("".concat(RC), className)
   }, /*#__PURE__*/_react.default.createElement("textarea", {
     id: id !== null && id !== void 0 ? id : Math.random().toString(16).slice(2),
-    "data-testid": "textarea-".concat(testId),
+    "data-testid": "".concat(testId, "-textarea"),
     className: "".concat(RC, "__textarea"),
     value: value,
     onChange: e => handle.change(e.target.value),

package/dist/Atomic/FormElements/VariantsListRadio/VariantsListRadio.js

@@ -26,7 +26,7 @@ const VariantsListRadio = _ref => {
     isDisabled,
     id,
     className,
-    testId,
+    testId = "variants-list-radio",
     attributesOfNativeInput,
     isMixWithPersonalAttributes
   } = _ref;
@@ -47,7 +47,7 @@ const VariantsListRadio = _ref => {
   }, [outerValue]);
   return /*#__PURE__*/_react.default.createElement("div", {
     id: componentnId,
-    "data-testid": testId || "variants-list-radio-id-".concat(componentnId),
+    "data-testid": testId,
     className: (0, _classnames.default)(RC, "".concat(RC, "_items-content-").concat(mode), className, {
       ["".concat(RC, "_with-borders")]: isWithBorders && !isUseAsOptionsList,
       ["".concat(RC, "_radio-position-reverse")]: isRadioPositionReverse

package/dist/Atomic/FormElements/VariantsListRadio/partials/VariantsListRadioItem.js

@@ -18,7 +18,8 @@ const VariantsListRadioItem = _ref => {
     onChange = () => {},
     attributesOfNativeInput = {},
     isMixWithPersonalAttributes,
-    isUseAsOptionsList
+    isUseAsOptionsList,
+    testId = "variants-list-radio-item"
   } = _ref;
   // ? Для корректной работы нужны parentId и item(объект)
   if (!parentId || !(0, _utils.getIsOnlyAnObject)(item)) return null;
@@ -37,6 +38,7 @@ const VariantsListRadioItem = _ref => {
     ...personalAttributesOfNativeInput
   } : personalAttributesOfNativeInput || attributesOfNativeInput || {};
   return /*#__PURE__*/_react.default.createElement("label", {
+    "data-testid": testId,
     className: (0, _classnames.default)("".concat(RC, "__item"), {
       ["".concat(RC, "__item_disabled")]: isDisabled,
       ["".concat(RC, "__item_active")]: isActive,
@@ -49,7 +51,7 @@ const VariantsListRadioItem = _ref => {
     className: (0, _classnames.default)("".concat(RC, "__item-radio"))
   }, /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({
     id: id,
-    "data-testid": "variants-list-radio-id-".concat(parentId.toString(), "-item-id-").concat(value),
+    "data-testid": "".concat(testId, "-input"),
     type: "radio",
     checked: isActive,
     className: "".concat(RC, "__item-radio-input"),

package/dist/Atomic/Layout/Spinner/Spinner.js

@@ -10,13 +10,14 @@ var _classnames = _interopRequireDefault(require("classnames"));
 require("./Spinner.scss");
 const Spinner = function (_ref) {
   let {
+    className,
     size = null
   } = _ref;
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)("loader-box", {
       j5: size !== "small",
       j8: size === "small"
-    })
+    }, className)
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)("lds-ring", {
       ["lds-ring_".concat(size)]: size

package/dist/Atomic/UI/Accordion/Accordion.js

@@ -22,7 +22,7 @@ const Accordion = _ref => {
     itemClassName,
     isMenuHovered,
     isOpen,
-    testId = "accordion-test"
+    testId = "accordion"
   } = _ref;
   const [data, setData] = (0, _react.useState)(items);
   const onChange = (0, _utils.handleObjectChange)(setData, () => setData([...data]));

package/dist/Atomic/UI/Accordion/AccordionItem.js

@@ -22,7 +22,7 @@ const AccordionItem = _ref => {
     className,
     children,
     noChevron,
-    testId
+    testId = "accordion-item"
   } = _ref;
   const Icon = Icons[item.icon];
   const [maxHeight, setMaxHeight] = (0, _react.useState)(0);
@@ -64,9 +64,9 @@ const AccordionItem = _ref => {
     });
   };
   return /*#__PURE__*/_react.default.createElement("div", {
+    "data-testid": testId,
     className: (0, _classnames.default)("accordion--item", className)
   }, /*#__PURE__*/_react.default.createElement("div", {
-    "data-testid": testId,
     className: (0, _classnames.default)("accordion--title-box", {
       "accordion--title-open": isOpen
     }),

package/dist/Atomic/UI/AdvancedTag/AdvTag.js

@@ -15,7 +15,7 @@ const AdvTag = _ref => {
   let {
     item,
     className,
-    testId,
+    testId = "adv-tag",
     toTop = true
   } = _ref;
   if (!item) return null;
@@ -28,7 +28,6 @@ const AdvTag = _ref => {
     warnLeft,
     warnLeftMsg,
     warnRightMsg,
-    noPingTree,
     isEntityAndCounter = false,
     entityAndCounter = {
       nullCounterMessage: "",
@@ -68,6 +67,7 @@ const AdvTag = _ref => {
   });
   const renderClassicTag = () => {
     return /*#__PURE__*/_react.default.createElement("div", {
+      "data-testid": testId,
       className: advancedTagClass,
       ref: hintRef
     }, warnLeft && /*#__PURE__*/_react.default.createElement("div", {
@@ -116,6 +116,7 @@ const AdvTag = _ref => {
     var _entityAndCounter$cou;
     const isNullcounter = (entityAndCounter === null || entityAndCounter === void 0 || (_entityAndCounter$cou = entityAndCounter.counter) === null || _entityAndCounter$cou === void 0 ? void 0 : _entityAndCounter$cou.toString()) === "0";
     return /*#__PURE__*/_react.default.createElement("div", {
+      "data-testid": testId,
       className: advancedTagClass,
       ref: hintRef
     }, isNullcounter && /*#__PURE__*/_react.default.createElement("div", {

package/dist/Atomic/UI/Alert/Alert.js

@@ -24,7 +24,7 @@ const Alert = _ref => {
     className,
     children,
     noDismiss,
-    testId,
+    testId = "alert",
     isHidden = false,
     variant = "warning",
     isLoading,
@@ -40,19 +40,19 @@ const Alert = _ref => {
     }, /*#__PURE__*/_react.default.createElement(_Button.default, buttonParams), !noDismiss && /*#__PURE__*/_react.default.createElement("div", {
       className: "alert__close-btn"
     }, /*#__PURE__*/_react.default.createElement(_reactFeather.X, {
-      "data-testid": "test-alert-close",
+      "data-testid": "".concat(testId, "-close"),
       onClick: () => setOnClose(!onClose)
     })));
     if (!noDismiss) return /*#__PURE__*/_react.default.createElement("div", {
       className: "alert__close-btn"
     }, /*#__PURE__*/_react.default.createElement(_reactFeather.X, {
-      "data-testid": "test-alert-close",
+      "data-testid": "".concat(testId, "-close"),
       onClick: () => setOnClose(!onClose)
     }));
     return null;
   }
   return /*#__PURE__*/_react.default.createElement("div", {
-    "data-testid": "alert--key-".concat(testId, "--varint-").concat(variant),
+    "data-testid": testId,
     className: (0, _classnames.default)(className, {
       hidden: onClose
     }, "alert alert--".concat(variant), {

package/dist/Atomic/UI/Arrow/Arrow.js

@@ -31,6 +31,7 @@ const Arrow = _ref => {
   function renderSVG() {
     if (type === "left") {
       if (isAlt) return /*#__PURE__*/_react.default.createElement("svg", {
+        "data-testid": testId,
         version: "1.1",
         id: "Layer_1",
         xmlns: "http://www.w3.org/2000/svg",
@@ -53,7 +54,7 @@ const Arrow = _ref => {
         strokeLinejoin: "round"
       }));
       return /*#__PURE__*/_react.default.createElement("svg", {
-        "data-testid": "arrow-left",
+        "data-testid": testId,
         width: "24",
         height: "24",
         viewBox: "0 0 24 24",
@@ -68,6 +69,7 @@ const Arrow = _ref => {
       }));
     }
     if (isAlt) return /*#__PURE__*/_react.default.createElement("svg", {
+      "data-testid": testId,
       id: "Layer_1",
       xmlns: "http://www.w3.org/2000/svg",
       width: "16",
@@ -89,7 +91,7 @@ const Arrow = _ref => {
       strokeLinejoin: "round"
     }));
     return /*#__PURE__*/_react.default.createElement("svg", {
-      "data-testid": "arrow-right",
+      "data-testid": testId,
       width: "24",
       height: "24",
       viewBox: "0 0 24 24",

package/dist/Atomic/UI/Button/Button.js

@@ -21,14 +21,14 @@ const Button = _ref => {
     style,
     noIcon,
     isIconRight,
-    testId = "",
+    testId = "button",
     tabIndex = 0,
     variant = "primary",
     isTextEllipsis = false
   } = _ref;
   const noRenderIcon = noIcon || variant === "ellipse-apply" || variant === "ellipse-cancel";
   return /*#__PURE__*/_react.default.createElement("button", {
-    "data-testid": "button".concat(testId && "--".concat(testId), "--").concat((label === null || label === void 0 ? void 0 : label.replace(/\s/g, "-")) || variant),
+    "data-testid": testId,
     tabIndex: tabIndex === null || tabIndex === void 0 || (_tabIndex$toString = tabIndex.toString) === null || _tabIndex$toString === void 0 ? void 0 : _tabIndex$toString.call(tabIndex),
     style: style,
     className: (0, _classnames.default)(RC, {

package/dist/Atomic/UI/ButtonsBar/ButtonsBar.js

@@ -28,8 +28,8 @@ const ButtonsBar = _ref => {
     confirmBtnClass,
     isConfirmBtnDisabled,
     onConfirm,
-    testIdFirstBtn = "test-btn-bar-first",
-    testIdSecondBtn = "test-btn-bar-second"
+    testIdFirstBtn = "button-bar-first-item",
+    testIdSecondBtn = "button-bar-second-item"
   } = _ref;
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)("button-bar", className)

package/dist/Atomic/UI/CircleProgressBar/CircleProgressBar.js

@@ -21,7 +21,8 @@ const CircleProgressBar = _ref => {
     isInnerLine,
     radius = 59,
     strokeWidth = 2,
-    innerLineStrokeWidth = 2
+    innerLineStrokeWidth = 2,
+    testId = "circle-progress-bar"
   } = _ref;
   const circumference = Math.round(2 * Math.PI * radius);
   const amountProgress = amount < totalAmount ? Math.round(amount / totalAmount * 100) : 100; //%
@@ -35,7 +36,7 @@ const CircleProgressBar = _ref => {
     setStrokeDashoffset(circumference - circumference * amountProgress / 100);
   }, [amountProgress]);
   return /*#__PURE__*/_react.default.createElement("div", {
-    "data-testid": "test-circleProgress",
+    "data-testid": testId,
     className: (0, _classnames.default)("limit-progress-bar", {
       "limit-progress-bar--reverse": isReverseType
     }, className)
@@ -87,7 +88,6 @@ const CircleProgressBar = _ref => {
       strokeDashoffset
     }
   })), /*#__PURE__*/_react.default.createElement("div", {
-    "data-testid": "test-circleProgress-children",
     className: "limit-progress-bar__content"
   }, children));
 };

package/dist/Atomic/UI/DateTime/DateTime.js

@@ -22,19 +22,21 @@ const DateTime = _ref => {
     dateFormat: inputDateFormat,
     timeFormat: inputTimeFormat,
     isNoDate,
-    isNoTime
+    isNoTime,
+    testId = "date-time"
   } = _ref;
   const dateFormat = inputDateFormat ? inputDateFormat : DEFAULT_DATE_FORMAT;
   const timeFormat = inputTimeFormat ? inputTimeFormat : DEFAULT_TIME_FORMAT;
   const date = (0, _react.useMemo)(() => (valueFormat ? (0, _momentTimezone.default)(value, valueFormat) : (0, _momentTimezone.default)(value)).format(dateFormat), [value, valueFormat, dateFormat]);
   const time = (0, _react.useMemo)(() => (valueFormat ? (0, _momentTimezone.default)(value, valueFormat) : (0, _momentTimezone.default)(value)).format(timeFormat), [value, valueFormat, timeFormat]);
   return /*#__PURE__*/_react.default.createElement("div", {
+    "data-testid": testId,
     className: (0, _classnames.default)(RC, className)
   }, !isNoDate && /*#__PURE__*/_react.default.createElement("span", {
-    "data-testid": "test-date",
+    "data-testid": "".concat(testId, "-date"),
     className: (0, _classnames.default)("".concat(RC, "__date"))
   }, date), !isNoTime && /*#__PURE__*/_react.default.createElement("span", {
-    "data-testid": "test-time",
+    "data-testid": "".concat(testId, "-time"),
     className: (0, _classnames.default)("".concat(RC, "__time"), {
       ["".concat(RC, "_color--pause")]: !isNoDate
     })

package/dist/Atomic/UI/DoubleString/DoubleString.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _reactFeather = require("react-feather");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _moment = _interopRequireDefault(require("moment"));
+var _reactFeather = require("react-feather");
 require("./DoubleString.scss");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -19,7 +19,7 @@ const DoubleString = _ref => {
     description,
     valuePostfix,
     className,
-    testId = "",
+    testId = "double-string",
     isFormatValueToDate,
     isUseOnClick,
     dateFormatSettings: {
@@ -55,11 +55,11 @@ const DoubleString = _ref => {
     });
   }, [descriptionRef, valueRef]);
   return /*#__PURE__*/_react.default.createElement("div", {
+    "data-testid": testId,
     className: (0, _classnames.default)(RC, className)
   }, /*#__PURE__*/_react.default.createElement("p", {
     onClick: () => handle.click(),
     ref: valueRef,
-    "data-testid": "doubleString--".concat(testId, "--value"),
     className: (0, _classnames.default)("".concat(RC, "__value"), {
       "double-string--value-opened": isOnClickON && isUseOnClick
     }, {
@@ -76,7 +76,6 @@ const DoubleString = _ref => {
     className: (0, _classnames.default)("".concat(RC, "__value-postfix"))
   }, valuePostfix)) : description), /*#__PURE__*/_react.default.createElement("p", {
     ref: descriptionRef,
-    "data-testid": "doubleString--".concat(description, "--value"),
     className: (0, _classnames.default)("".concat(RC, "__description")),
     title: !noTitle && elemsWidth.descriptionWidth > 99 ? computedValue : ""
   }, !revert ? description : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, computedValue, valuePostfix && /*#__PURE__*/_react.default.createElement("span", {

package/dist/Atomic/UI/Hint/Hint.js

@@ -12,9 +12,11 @@ var _reactFeather = require("react-feather");
 var _utils = require("../../../Functions/utils");
 var _CustomIcons = require("./../../../Molecular/CustomIcons");
 var _utils2 = require("./partials/_utils");
+var _Spinner = _interopRequireDefault(require("./../../Layout/Spinner/Spinner"));
 require("./Hint.scss");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+let isContentHoveredOuter = false;
 const Hint = _ref => {
   var _ref2, _label$replace;
   let {
@@ -31,13 +33,15 @@ const Hint = _ref => {
     children,
     icon,
     isAccessability = false,
-    testId = "test-hint",
-    isHoverableContent = false
+    testId = "hint",
+    isHoverableContent = false,
+    isLoading
   } = _ref;
   const hintRef = (0, _react.useRef)(null);
   const timeoutRef = (0, _react.useRef)(null);
   const [hintId] = (0, _react.useState)((_ref2 = key !== null && key !== void 0 ? key : id) !== null && _ref2 !== void 0 ? _ref2 : Math.random().toString(16).slice(2));
   const [isOpen, setIsOpen] = (0, _react.useState)(false);
+  const [isContentHovered, setIsContentHovered] = (0, _react.useState)(false);
 
   //? Определяем handleScroll-стейт, чтобы никогда не менять ссылку тем самым гарантировать корректную работу removeEventListener.
   //? Инициализируем стейт вызовом конструктора HandleScrollObj, передаем setIsOpen для записи в объект.
@@ -45,12 +49,52 @@ const Hint = _ref => {
   //? По аналогии определяем handleClickOutside
   const [handleClickOutside] = (0, _react.useState)(new _utils2.HandleClickOutsideObj(hintId, setIsOpen));
   const isCallbackExist = typeof onClickCallback === "function";
+  const handle = {
+    onMouseEnter: () => {
+      if (handleOpenType === "hover") {
+        timeoutRef.current = setTimeout(() => {
+          setIsOpen(true);
+          !isOpen && onClickCallback();
+        }, 350);
+      }
+    },
+    onMouseLeave: () => {
+      if (!isHoverableContent && handleOpenType === "hover") {
+        clearTimeout(timeoutRef.current);
+        timeoutRef.current = setTimeout(() => {
+          setIsOpen(false);
+        }, 1000);
+      } else if (isHoverableContent && handleOpenType === "hover") {
+        clearTimeout(timeoutRef.current);
+        timeoutRef.current = setTimeout(() => {
+          if (!isContentHoveredOuter) {
+            setIsOpen(false);
+          }
+        }, 100);
+      }
+    },
+    onMouseLeaveHoverableContent: () => {
+      if (isHoverableContent && handleOpenType === "hover") {
+        clearTimeout(timeoutRef.current);
+        timeoutRef.current = setTimeout(() => {
+          setIsOpen(false);
+          setIsContentHovered(false);
+          isContentHoveredOuter = false;
+        }, 100);
+      }
+    }
+  };
   const getHintMarkUp = className => {
     return /*#__PURE__*/_react.default.createElement("div", {
       "data-testid": "test-hint-text",
       className: (0, _classnames.default)("hint__text", "hint__text_".concat(side), "hint--".concat(className, "__text")),
-      onMouseLeave: () => isHoverableContent && handleOpenType === "hover" && setIsOpen(false)
-    }, hint, children);
+      onMouseEnter: () => {
+        isContentHoveredOuter = true;
+      },
+      onMouseLeave: handle.onMouseLeaveHoverableContent
+    }, isLoading && /*#__PURE__*/_react.default.createElement(_Spinner.default, {
+      size: "small"
+    }), hint, children);
   };
   const setHintContainerStyles = () => {
     var _ref3, _ref4, _ref5;
@@ -116,24 +160,6 @@ const Hint = _ref => {
     if (!hc) return null;
     return /*#__PURE__*/(0, _reactDom.createPortal)(getHintMarkUp(className), hc);
   };
-  const handle = {
-    onMouseEnter: () => {
-      if (handleOpenType === "hover") {
-        timeoutRef.current = setTimeout(() => {
-          setIsOpen(true);
-          !isOpen && onClickCallback();
-        }, 350);
-      }
-    },
-    onMouseLeave: () => {
-      if (!isHoverableContent && handleOpenType === "hover") {
-        clearTimeout(timeoutRef.current);
-        timeoutRef.current = setTimeout(() => {
-          setIsOpen(false);
-        }, 1000);
-      }
-    }
-  };
   (0, _react.useEffect)(() => {
     (0, _utils2.initHintContainer)(hintId, hintContainer);
     return () => {
@@ -154,6 +180,7 @@ const Hint = _ref => {
     };
   }, [isOpen]);
   return /*#__PURE__*/_react.default.createElement("div", {
+    "data-testid": testId,
     className: (0, _classnames.default)("hint", className),
     ref: hintRef
   }, /*#__PURE__*/_react.default.createElement("button", {

package/dist/Atomic/UI/Modal/Modal.js

@@ -69,7 +69,7 @@ const Modal = /*#__PURE__*/_react.default.forwardRef((_ref2, ref) => {
     isScrollLock = true,
     leftContentOfFooter,
     customFooter,
-    testId,
+    testId = "modal",
     noHeaderCloseBtn,
     withMobileLogic,
     withFixedFooter
@@ -113,7 +113,7 @@ const Modal = /*#__PURE__*/_react.default.forwardRef((_ref2, ref) => {
     "data-testid": testId,
     className: "modal-box j5"
   }, renderModal( /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
-    "data-testid": "modal-closeOverlay",
+    "data-testid": "".concat(testId, "-overlay"),
     className: isOpen ? "modal-overlay" : "hidden",
     onClick: closeModal
   }), /*#__PURE__*/_react.default.createElement("div", {

package/dist/Atomic/UI/Modal/ModalHOC.js

@@ -18,7 +18,6 @@ const Modal = _ref => {
     className,
     size,
     testId,
-    isScrollLock = true,
     closeOnEsc = true
   } = _ref;
   if (!isOpen) return null;
@@ -32,7 +31,6 @@ const Modal = _ref => {
     "data-testid": testId,
     className: "modal-box j5"
   }, /*#__PURE__*/_react.default.createElement("div", {
-    "data-testid": "modal-closeOverlay",
     className: "modal-overlay",
     onClick: closeModal
   }), /*#__PURE__*/_react.default.createElement("div", {