intelicoreact 1.5.18 → 1.5.19

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

@@ -30,25 +30,26 @@ const Hint = _ref => {
     id,
     children,
     icon,
-    activeHint,
-    setActiveHint,
     isAccessability = false,
     testId = "test-hint",
     isHoverableContent = false
   } = _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 = activeHint === id;
-  const [handleScroll] = (0, _react.useState)(new _utils2.HandleScrollObj(setActiveHint));
-  const [handleClickOutside] = (0, _react.useState)(new _utils2.HandleClickOutsideObj(hintId, setActiveHint));
-  const [hoverTimeout, setHoverTimeout] = (0, _react.useState)(null);
-  const [closeTimeout, setCloseTimeout] = (0, _react.useState)(null);
+  const [isOpen, setIsOpen] = (0, _react.useState)(false);
+
+  //? Определяем handleScroll-стейт, чтобы никогда не менять ссылку тем самым гарантировать корректную работу removeEventListener.
+  //? Инициализируем стейт вызовом конструктора HandleScrollObj, передаем setIsOpen для записи в объект.
+  const [handleScroll] = (0, _react.useState)(new _utils2.HandleScrollObj(setIsOpen));
+  //? По аналогии определяем handleClickOutside
+  const [handleClickOutside] = (0, _react.useState)(new _utils2.HandleClickOutsideObj(hintId, setIsOpen));
   const isCallbackExist = typeof onClickCallback === "function";
   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" && startCloseTimeout()
+      onMouseLeave: () => isHoverableContent && handleOpenType === "hover" && setIsOpen(false)
     }, hint, children);
   };
   const setHintContainerStyles = () => {
@@ -115,44 +116,29 @@ const Hint = _ref => {
     if (!hc) return null;
     return /*#__PURE__*/(0, _reactDom.createPortal)(getHintMarkUp(className), hc);
   };
-  const startCloseTimeout = () => {
-    const timeout = setTimeout(() => {
-      if (activeHint === id) setActiveHint(null);
-    }, 1000);
-    setCloseTimeout(timeout);
-  };
-  const stopCloseTimeout = () => {
-    if (closeTimeout) {
-      clearTimeout(closeTimeout);
-      setCloseTimeout(null);
-    }
-  };
   const handle = {
-    onMouseEnterHintIcon: () => {
-      stopCloseTimeout();
+    onMouseEnter: () => {
       if (handleOpenType === "hover") {
-        const timeout = setTimeout(() => {
-          setActiveHint(id);
+        timeoutRef.current = setTimeout(() => {
+          setIsOpen(true);
           !isOpen && onClickCallback();
         }, 350);
-        setHoverTimeout(timeout);
       }
     },
-    onMouseLeaveHintIcon: () => {
+    onMouseLeave: () => {
       if (!isHoverableContent && handleOpenType === "hover") {
-        clearTimeout(hoverTimeout);
-        setHoverTimeout(null);
-        startCloseTimeout();
-      }
-    },
-    onClickHintIcon: () => {
-      if (handleOpenType === "click") {
-        isCallbackExist ? onClickCallback() : setActiveHint(id);
+        clearTimeout(timeoutRef.current);
+        timeoutRef.current = setTimeout(() => {
+          setIsOpen(false);
+        }, 1000);
       }
     }
   };
   (0, _react.useEffect)(() => {
     (0, _utils2.initHintContainer)(hintId, hintContainer);
+    return () => {
+      clearTimeout(timeoutRef.current);
+    };
   }, []);
   (0, _react.useEffect)(() => {
     setHintContainerStyles();
@@ -163,10 +149,10 @@ const Hint = _ref => {
       document.removeEventListener("scroll", handleScroll, true);
       document.removeEventListener("click", handleClickOutside, true);
     }
+    return () => {
+      clearTimeout(timeoutRef.current);
+    };
   }, [isOpen]);
-  (0, _react.useEffect)(() => {
-    stopCloseTimeout(null);
-  }, [activeHint]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)("hint", className),
     ref: hintRef
@@ -174,9 +160,9 @@ const Hint = _ref => {
     tabIndex: isAccessability ? 0 : -1,
     "data-testid": typeof label === "string" && label.length ? (_label$replace = label.replace) === null || _label$replace === void 0 ? void 0 : _label$replace.call(label, /\s/g, "-") : testId,
     "aria-label": isAccessability && label || "",
-    onClick: handle.onClickHintIcon,
-    onMouseEnter: handle.onMouseEnterHintIcon,
-    onMouseLeave: handle.onMouseLeaveHintIcon,
+    onClick: () => handleOpenType === "click" && (isCallbackExist ? onClickCallback() : setIsOpen(!isOpen)),
+    onMouseEnter: handle.onMouseEnter,
+    onMouseLeave: handle.onMouseLeave,
     className: (0, _classnames.default)("hint__button", {
       hint__button_active: isOpen
     })

package/package.json

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