Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ coverage
yarn.lock
es/
package-lock.json
pnpm-lock.yaml
src/*.js
src/*.map
tslint.json
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@
"react-dom": "*"
},
"dependencies": {
"@rc-component/trigger": "^3.0.0",
"@rc-component/motion": "^1.1.4",
"@rc-component/trigger": "^3.0.0",
"@rc-component/util": "^1.3.0",
"classnames": "2.x",
"clsx": "^2.1.1",
"rc-overflow": "^1.4.0",
"rc-virtual-list": "^3.5.2"
},
Expand All @@ -62,6 +62,7 @@
"@testing-library/jest-dom": "^6.4.5",
"@testing-library/react": "^15.0.6",
"@types/jest": "^29.5.12",
"@types/node": "^24.5.2",
"@types/react": "^18.3.0",
"@types/react-dom": "^18.3.0",
"babel-jest": "^29.6.1",
Expand Down
7 changes: 4 additions & 3 deletions src/OptionList.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import classNames from 'classnames';
import { clsx } from 'clsx';
import KeyCode from '@rc-component/util/lib/KeyCode';
import useMemo from '@rc-component/util/lib/hooks/useMemo';
import omit from '@rc-component/util/lib/omit';
Expand Down Expand Up @@ -351,7 +351,7 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r

return (
<div
className={classNames(itemPrefixCls, `${itemPrefixCls}-group`, data.className)}
className={clsx(itemPrefixCls, `${itemPrefixCls}-group`, data.className)}
title={groupTitle}
>
{label !== undefined ? label : key}
Expand All @@ -368,7 +368,8 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
const mergedDisabled = disabled || (!selected && overMaxCount);

const optionPrefixCls = `${itemPrefixCls}-option`;
const optionClassName = classNames(

const optionClassName = clsx(
itemPrefixCls,
optionPrefixCls,
className,
Expand Down
6 changes: 2 additions & 4 deletions src/SelectTrigger.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Trigger, { type TriggerRef } from '@rc-component/trigger';
import type { AlignType, BuildInPlacements } from '@rc-component/trigger/lib/interface';
import classNames from 'classnames';
import { clsx } from 'clsx';
import * as React from 'react';
import type { Placement, RenderDOMFunc } from './BaseSelect';

Expand Down Expand Up @@ -168,9 +168,7 @@ const SelectTrigger: React.ForwardRefRenderFunction<RefTriggerProps, SelectTrigg
popupAlign={popupAlign}
popupVisible={visible}
getPopupContainer={getPopupContainer}
popupClassName={classNames(popupClassName, {
[`${popupPrefixCls}-empty`]: empty,
})}
popupClassName={clsx(popupClassName, { [`${popupPrefixCls}-empty`]: empty })}
popupStyle={mergedPopupStyle}
onPopupVisibleChange={onPopupVisibleChange}
>
Expand Down
4 changes: 2 additions & 2 deletions src/Selector/MultipleSelector.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { useState } from 'react';
import classNames from 'classnames';
import { clsx } from 'clsx';
import pickAttrs from '@rc-component/util/lib/pickAttrs';
import Overflow from 'rc-overflow';
import TransBtn from '../TransBtn';
Expand Down Expand Up @@ -107,7 +107,7 @@ const SelectSelector: React.FC<SelectorProps> = (props) => {
) => (
<span
title={getTitle(item)}
className={classNames(`${selectionPrefixCls}-item`, {
className={clsx(`${selectionPrefixCls}-item`, {
[`${selectionPrefixCls}-item-disabled`]: itemDisabled,
})}
>
Expand Down
4 changes: 2 additions & 2 deletions src/Selector/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import useLock from '../hooks/useLock';
import { isValidateOpenKey } from '../utils/keyUtil';
import MultipleSelector from './MultipleSelector';
import SingleSelector from './SingleSelector';
import classNames from 'classnames';
import { clsx } from 'clsx';

export interface InnerSelectorProps {
prefixCls: string;
Expand Down Expand Up @@ -293,7 +293,7 @@ const Selector: React.ForwardRefRenderFunction<RefSelectorProps, SelectorProps>
onMouseDown={onMouseDown}
>
{prefix && (
<div className={classNames(`${prefixCls}-prefix`, prefixClassName)} style={prefixStyle}>
<div className={clsx(`${prefixCls}-prefix`, prefixClassName)} style={prefixStyle}>
{prefix}
</div>
)}
Expand Down
6 changes: 2 additions & 4 deletions src/TransBtn.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import classNames from 'classnames';
import { clsx } from 'clsx';
import type { RenderNode } from './BaseSelect';

export interface TransBtnProps {
Expand Down Expand Up @@ -34,9 +34,7 @@ const TransBtn: React.FC<TransBtnProps> = (props) => {
{icon !== undefined ? (
icon
) : (
<span className={classNames(className.split(/\s+/).map((cls) => `${cls}-icon`))}>
{children}
</span>
<span className={clsx(className.split(/\s+/).map((cls) => `${cls}-icon`))}>{children}</span>
)}
</span>
);
Expand Down
4 changes: 2 additions & 2 deletions tests/Tags.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createEvent, fireEvent, render } from '@testing-library/react';
import KeyCode from '@rc-component/util/lib/KeyCode';
import classNames from 'classnames';
import { clsx } from 'clsx';
import * as React from 'react';
import Select, { BaseSelect, OptGroup, Option } from '../src';
import allowClearTest from './shared/allowClearTest';
Expand Down Expand Up @@ -279,7 +279,7 @@ describe('Select.Tags', () => {
const { label } = props;
onTagRender(label);
return (
<span className={classNames(label, 'customize-tag')}>
<span className={clsx(label, 'customize-tag')}>
{label}
{label}
</span>
Expand Down
Loading