intelicoreact 1.5.20 → 1.5.22

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/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 {
@@ -32,12 +34,14 @@ const Hint = _ref => {
     icon,
     isAccessability = false,
     testId = "hint",
-    isHoverableContent = false
+    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,11 +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;
@@ -115,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 () => {

package/dist/Atomic/UI/UserBox/UserBox.js

@@ -25,15 +25,15 @@ const UserBox = _ref => {
   const getNameFirstLetter = name.charAt(0).toUpperCase();
   const renderUser = () => {
     if (isModal) {
-      return /*#__PURE__*/_react.default.createElement("div", {
-        "data-testid": testId
-      }, /*#__PURE__*/_react.default.createElement("div", {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+        "data-testid": testId,
         style: {
           backgroundColor: (0, _utils.getColorById)(id, colors)
         },
         className: "td-user-box__avatar"
       }, getNameFirstLetter), /*#__PURE__*/_react.default.createElement("div", {
-        className: "td-user-box__user-data"
+        className: "td-user-box__user-data",
+        "data-testid": "".concat(testId, "-data")
       }, /*#__PURE__*/_react.default.createElement(_Button.default, {
         className: "p0 no-shadow",
         onClick: onClick,
@@ -41,15 +41,15 @@ const UserBox = _ref => {
         variant: "link"
       }), role && /*#__PURE__*/_react.default.createElement("span", null, role)));
     } else {
-      return /*#__PURE__*/_react.default.createElement("div", {
-        "data-testid": testId
-      }, /*#__PURE__*/_react.default.createElement("div", {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+        "data-testid": testId,
         style: {
           backgroundColor: (0, _utils.getColorById)(id)
         },
         className: "td-user-box__avatar"
       }, getNameFirstLetter), /*#__PURE__*/_react.default.createElement("div", {
-        className: "td-user-box__user-data"
+        className: "td-user-box__user-data",
+        "data-testid": "".concat(testId, "-data")
       }, /*#__PURE__*/_react.default.createElement(_Label.default, {
         label: name
       }), role && /*#__PURE__*/_react.default.createElement("span", null, role)));

package/package.json

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