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

feat: classNames support variant #57

Merged
merged 2 commits into from
Dec 15, 2023
Merged

feat: classNames support variant #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dae6063
feat: classNames support variant
MadCcc Dec 15, 2023
57cc5e6
chore: code clean
MadCcc Dec 15, 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
8 changes: 7 additions & 1 deletion src/BaseInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,17 @@ const BaseInput: FC<BaseInputProps> = (props) => {
}
};

const hasAffix = hasPrefixSuffix(props);

let element: ReactElement = cloneElement(inputElement, {
value,
className:
clsx(inputElement.props.className, !hasAffix && classNames?.variant) ||
null,
});

// ================== Prefix & Suffix ================== //
if (hasPrefixSuffix(props)) {
if (hasAffix) {
// ================== Clear Icon ================== //
let clearIcon: ReactNode = null;
if (allowClear) {
Expand Down Expand Up @@ -92,6 +97,7 @@ const BaseInput: FC<BaseInputProps> = (props) => {
},
classes?.affixWrapper,
classNames?.affixWrapper,
classNames?.variant,
);

const suffixNode = (suffix || allowClear) && (
Expand Down
1 change: 1 addition & 0 deletions src/interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export interface CommonInputProps {
suffix?: string;
groupWrapper?: string;
wrapper?: string;
variant?: string;
};
styles?: {
affixWrapper?: CSSProperties;
Expand Down
31 changes: 31 additions & 0 deletions tests/BaseInput.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,4 +236,35 @@ describe('BaseInput', () => {

expect(container.firstChild).toHaveClass('rc-input-group-wrapper-disabled');
});

it('variant cls', () => {
const { container, rerender } = render(
<BaseInput
prefixCls="rc-input"
prefix="$"
classNames={{ variant: 'test-variant' }}
disabled
>
<input />
</BaseInput>,
);

expect(container.querySelector('.rc-input-affix-wrapper')).toHaveClass(
'test-variant',
);
expect(container.querySelector('input')).not.toHaveClass('test-variant');

rerender(
<BaseInput
prefixCls="rc-input"
classNames={{ variant: 'test-variant' }}
disabled
>
<input />
</BaseInput>,
);

expect(container.querySelector('.rc-input-affix-wrapper')).toBeFalsy();
expect(container.querySelector('input')).toHaveClass('test-variant');
});
});
Loading