Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V6 #1128

Closed
wants to merge 5 commits into from
Closed

V6 #1128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
125bd0b
changed classnames module with clsx
NemeZZiZZ Jul 24, 2023
db4b3c7
Merge branch 'V6' into classnames-to-clsx
danielbarion Nov 28, 2023
ccd06be
Update Tooltip.tsx
danielbarion Nov 28, 2023
811184d
Update Tooltip.tsx
danielbarion Nov 28, 2023
2f05d22
Merge pull request #1064 from NemeZZiZZ/classnames-to-clsx
danielbarion Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,6 @@
},
"dependencies": {
"@floating-ui/dom": "^1.0.0",
"classnames": "^2.3.0"
"clsx": "^2.0.0"
}
}
2 changes: 1 addition & 1 deletion rollup.config.dev.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const name = 'ReactTooltip'
const globals = {
react: 'React',
'react-dom': 'ReactDOM',
classnames: 'classNames',
clsx: 'clsx',
'prop-types': 'PropTypes',
}

Expand Down
2 changes: 1 addition & 1 deletion rollup.config.prod.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const buildFormats = [
'@floating-ui/dom': 'FloatingUIDOM',
react: 'React',
'react-dom': 'ReactDOM',
classnames: 'classNames',
clsx: 'clsx',
'prop-types': 'PropTypes',
},
},
Expand Down
6 changes: 3 additions & 3 deletions src/components/Tooltip/Tooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useEffect, useState, useRef, useCallback, useImperativeHandle } from 'react'
import { autoUpdate } from '@floating-ui/dom'
import classNames from 'classnames'
import clsx from 'clsx'
import debounce from 'utils/debounce'
import { useTooltip } from 'components/TooltipProvider'
import useIsomorphicLayoutEffect from 'utils/use-isomorphic-layout-effect'
Expand Down Expand Up @@ -790,7 +790,7 @@ const Tooltip = ({
<WrapperElement
id={id}
role={role}
className={classNames(
className={clsx(
'react-tooltip',
coreStyles['tooltip'],
styles['tooltip'],
Expand Down Expand Up @@ -823,7 +823,7 @@ const Tooltip = ({
>
{actualContent}
<WrapperElement
className={classNames(
className={clsx(
'react-tooltip-arrow',
coreStyles['arrow'],
styles['arrow'],
Expand Down
4 changes: 2 additions & 2 deletions src/components/TooltipProvider/TooltipWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect, useRef } from 'react'
import classNames from 'classnames'
import clsx from 'clsx'
import { useTooltip } from './TooltipProvider'
import type { ITooltipWrapper } from './TooltipProviderTypes'

Expand Down Expand Up @@ -35,7 +35,7 @@ const TooltipWrapper = ({
return (
<span
ref={anchorRef}
className={classNames('react-tooltip-wrapper', className)}
className={clsx('react-tooltip-wrapper', className)}
data-tooltip-place={place}
data-tooltip-content={content}
data-tooltip-html={html}
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2204,11 +2204,6 @@ cjs-module-lexer@^1.0.0:
resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==

classnames@^2.3.0:
version "2.3.2"
resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924"
integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==

clean-stack@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
Expand Down Expand Up @@ -2267,6 +2262,11 @@ clone-regexp@^2.1.0:
dependencies:
is-regexp "^2.0.0"

clsx@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.0.0.tgz#12658f3fd98fafe62075595a5c30e43d18f3d00b"
integrity sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==

co@^4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
Expand Down
Loading