From 205779a89393f55b1d48c9add45429c60a44f7bc Mon Sep 17 00:00:00 2001 From: gabrieljablonski Date: Tue, 27 Dec 2022 10:41:20 -0300 Subject: [PATCH 1/2] fix: `TooltipWrapper` and `click` event behavior --- src/components/Tooltip/Tooltip.tsx | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/components/Tooltip/Tooltip.tsx b/src/components/Tooltip/Tooltip.tsx index 3b5f1616..c7efe64b 100644 --- a/src/components/Tooltip/Tooltip.tsx +++ b/src/components/Tooltip/Tooltip.tsx @@ -81,10 +81,11 @@ const Tooltip = ({ } else { handleShow(true) } + const target = event.currentTarget ?? event.target setActiveAnchor((anchor) => - anchor.current === event.target ? anchor : { current: event.target as HTMLElement }, + anchor.current === target ? anchor : { current: target as HTMLElement }, ) - setProviderActiveAnchor({ current: event.target as HTMLElement }) + setProviderActiveAnchor({ current: target as HTMLElement }) if (tooltipHideDelayTimerRef.current) { clearTimeout(tooltipHideDelayTimerRef.current) @@ -150,19 +151,15 @@ const Tooltip = ({ lastFloatPosition.current = mousePosition } - const handleClickTooltipAnchor = () => { - if (setIsOpen) { - setIsOpen(!isOpen) - } else if (!setIsOpen && isOpen === undefined) { - setShow(true) - if (delayHide) { - handleHideTooltipDelayed() - } + const handleClickTooltipAnchor = (event?: Event) => { + handleShowTooltip(event) + if (delayHide) { + handleHideTooltipDelayed() } } const handleClickOutsideAnchor = (event: MouseEvent) => { - if (event.target === activeAnchor.current) { + if (activeAnchor.current?.contains(event.target as HTMLElement)) { return } setShow(false) From 079f3b33482fcd158b0cc417b19280fc2280c507 Mon Sep 17 00:00:00 2001 From: gabrieljablonski Date: Tue, 27 Dec 2022 10:50:12 -0300 Subject: [PATCH 2/2] chore: bump project version and docs package --- docs/package.json | 2 +- docs/yarn.lock | 8 ++++---- package.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/package.json b/docs/package.json index 3e72cfd6..54477ae2 100644 --- a/docs/package.json +++ b/docs/package.json @@ -23,7 +23,7 @@ "raw-loader": "^4.0.2", "react": "18.2.0", "react-dom": "18.2.0", - "react-tooltip": "5.3.1" + "react-tooltip": "5.3.2" }, "devDependencies": { "@docusaurus/module-type-aliases": "2.2.0", diff --git a/docs/yarn.lock b/docs/yarn.lock index cefe8468..e53676b4 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -6112,10 +6112,10 @@ react-textarea-autosize@^8.3.2: use-composed-ref "^1.3.0" use-latest "^1.2.1" -react-tooltip@5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/react-tooltip/-/react-tooltip-5.3.1.tgz#b2bb849384c5e1fa182460efb3ea4f8ebad69fca" - integrity sha512-lBX24Xvs/ZGwq+3waku9FHNAqIIjjlq+Hlk6R+mpbmeGM6LQ9zUfMKlPtWynZg50ZZ1/3ndlt8YtCEPNPCT5gw== +react-tooltip@5.3.2: + version "5.3.2" + resolved "https://registry.yarnpkg.com/react-tooltip/-/react-tooltip-5.3.2.tgz#64593fb33ed1071e1d4dde89923906179abe98fe" + integrity sha512-3I6fGdNPCW/wF0doJ0qIT9DprUbXQ/qzBVH8c3GycBUoLmNMJFgDUWnqW1VV2fcz5uAdvX4cYEFl7nkc3Br7mA== dependencies: "@floating-ui/dom" "^1.0.4" classnames "^2.3.2" diff --git a/package.json b/package.json index 9f75359e..538b856b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-tooltip", - "version": "5.3.1", + "version": "5.3.2", "description": "react tooltip component", "scripts": { "dev": "node ./cli.js --env=development && node --max_old_space_size=2048 ./node_modules/rollup/dist/bin/rollup -c rollup.config.dev.js --watch",