Skip to content

Commit 2e594c7

Browse files
danielbariongabrieljablonski
authored andcommitted
chore: rebase from master and fix className import
1 parent a91941c commit 2e594c7

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

src/components/TooltipController/TooltipController.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import type {
1414
import { useTooltip } from 'components/TooltipProvider'
1515
import { TooltipContent } from 'components/TooltipContent'
1616
import { cssSupports } from 'utils'
17-
import classNames from 'classnames'
17+
import clsx from 'clsx'
1818
import type { ITooltipController } from './TooltipControllerTypes'
1919

2020
const TooltipController = React.forwardRef<TooltipRefProps, ITooltipController>(
@@ -335,7 +335,7 @@ const TooltipController = React.forwardRef<TooltipRefProps, ITooltipController>(
335335
id,
336336
anchorId,
337337
anchorSelect,
338-
className: classNames(className, tooltipClassName),
338+
className: clsx(className, tooltipClassName),
339339
classNameArrow,
340340
content: renderedContent,
341341
contentWrapperRef,

yarn.lock

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -450,25 +450,25 @@
450450
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.35.0.tgz#b7569632b0b788a0ca0e438235154e45d42813a7"
451451
integrity sha512-JXdzbRiWclLVoD8sNUjR443VVlYqiYmDVT6rGUEIEHU5YJW0gaVZwV2xgM7D4arkvASqD0IlLUVjHiFuxaftRw==
452452

453-
"@floating-ui/core@^1.4.1":
454-
version "1.4.1"
455-
resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.4.1.tgz#0d633f4b76052668afb932492ac452f7ebe97f17"
456-
integrity sha512-jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ==
453+
"@floating-ui/core@^1.0.0":
454+
version "1.6.0"
455+
resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.6.0.tgz#fa41b87812a16bf123122bf945946bae3fdf7fc1"
456+
integrity sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g==
457457
dependencies:
458-
"@floating-ui/utils" "^0.1.1"
458+
"@floating-ui/utils" "^0.2.1"
459459

460-
"@floating-ui/dom@^1.0.0":
461-
version "1.5.1"
462-
resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.5.1.tgz#88b70defd002fe851f17b4a25efb2d3c04d7a8d7"
463-
integrity sha512-KwvVcPSXg6mQygvA1TjbN/gh///36kKtllIF8SUm0qpFj8+rvYrpvlYdL1JoA71SHpDqgSSdGOSoQ0Mp3uY5aw==
460+
"@floating-ui/dom@^1.6.1":
461+
version "1.6.3"
462+
resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.3.tgz#954e46c1dd3ad48e49db9ada7218b0985cee75ef"
463+
integrity sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==
464464
dependencies:
465-
"@floating-ui/core" "^1.4.1"
466-
"@floating-ui/utils" "^0.1.1"
465+
"@floating-ui/core" "^1.0.0"
466+
"@floating-ui/utils" "^0.2.0"
467467

468-
"@floating-ui/utils@^0.1.1":
469-
version "0.1.1"
470-
resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.1.1.tgz#1a5b1959a528e374e8037c4396c3e825d6cf4a83"
471-
integrity sha512-m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw==
468+
"@floating-ui/utils@^0.2.0", "@floating-ui/utils@^0.2.1":
469+
version "0.2.1"
470+
resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.1.tgz#16308cea045f0fc777b6ff20a9f25474dd8293d2"
471+
integrity sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==
472472

473473
"@gar/promisify@^1.0.1":
474474
version "1.1.3"

0 commit comments

Comments
 (0)