Skip to content

refactor/style #39

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

Merged
MadCcc merged 2 commits into from
Mar 27, 2023
Merged

refactor/style #39

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
dc5483f
refactor: better style logic
MadCcc Mar 27, 2023
23980a1
refactor: better style logic
MadCcc Mar 27, 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
3 changes: 2 additions & 1 deletion src/BaseInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ const BaseInput: FC<BaseInputProps> = (props) => {
) || null,
style: {
...inputElement.props?.style,
...(!hasPrefixSuffix(props) && !hasAddon(props) ? style : {}),
},
});

Expand Down Expand Up @@ -108,7 +109,7 @@ const BaseInput: FC<BaseInputProps> = (props) => {
element = (
<span
className={affixWrapperCls}
style={style}
style={!hasAddon(props) ? style : undefined}
hidden={!hasAddon(props) && hidden}
onClick={onInputClick}
{...dataAttrs?.affixWrapper}
Expand Down
71 changes: 70 additions & 1 deletion tests/__snapshots__/index.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
exports[`Input allowClear classNames and styles should work 1`] = `
<div>
<span
class="rc-input-affix-wrapper"
class="rc-input-affix-wrapper custom-class"
style="background-color: red;"
>
<span
class="rc-input-prefix custom-prefix"
Expand All @@ -30,6 +31,74 @@ exports[`Input allowClear classNames and styles should work 1`] = `
suffix
</span>
</span>
<span
class="rc-input-group-wrapper custom-class"
style="background-color: red;"
>
<span
class="rc-input-wrapper rc-input-group"
>
<span
class="rc-input-affix-wrapper"
>
<span
class="rc-input-prefix custom-prefix"
style="color: blue;"
>
prefix
</span>
<input
class="rc-input custom-input"
style="color: red;"
type="text"
value="123"
/>
<span
class="rc-input-suffix custom-suffix"
style="color: yellow;"
>
<span
class="rc-input-show-count-suffix rc-input-show-count-has-suffix custom-count"
style="color: green;"
>
3
</span>
suffix
</span>
</span>
<span
class="rc-input-group-addon"
>
addon
</span>
</span>
</span>
<input
class="rc-input custom-input custom-class"
style="color: red; background-color: red;"
type="text"
value="123"
/>
<span
class="rc-input-group-wrapper custom-class"
style="background-color: red;"
>
<span
class="rc-input-wrapper rc-input-group"
>
<input
class="rc-input custom-input"
style="color: red;"
type="text"
value="123"
/>
<span
class="rc-input-group-addon"
>
addon
</span>
</span>
</span>
</div>
`;

Expand Down
89 changes: 70 additions & 19 deletions tests/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,25 +242,76 @@ describe('Input allowClear', () => {

it('classNames and styles should work', () => {
const { container } = render(
<Input
value="123"
showCount
prefixCls="rc-input"
prefix="prefix"
suffix="suffix"
classNames={{
input: 'custom-input',
prefix: 'custom-prefix',
suffix: 'custom-suffix',
count: 'custom-count',
}}
styles={{
input: { color: 'red' },
prefix: { color: 'blue' },
suffix: { color: 'yellow' },
count: { color: 'green' },
}}
/>,
<>
<Input
value="123"
showCount
prefixCls="rc-input"
prefix="prefix"
suffix="suffix"
className="custom-class"
style={{ backgroundColor: 'red' }}
classNames={{
input: 'custom-input',
prefix: 'custom-prefix',
suffix: 'custom-suffix',
count: 'custom-count',
}}
styles={{
input: { color: 'red' },
prefix: { color: 'blue' },
suffix: { color: 'yellow' },
count: { color: 'green' },
}}
/>
<Input
value="123"
addonAfter="addon"
showCount
prefixCls="rc-input"
prefix="prefix"
suffix="suffix"
className="custom-class"
style={{ backgroundColor: 'red' }}
classNames={{
input: 'custom-input',
prefix: 'custom-prefix',
suffix: 'custom-suffix',
count: 'custom-count',
}}
styles={{
input: { color: 'red' },
prefix: { color: 'blue' },
suffix: { color: 'yellow' },
count: { color: 'green' },
}}
/>
<Input
value="123"
prefixCls="rc-input"
className="custom-class"
style={{ backgroundColor: 'red' }}
classNames={{
input: 'custom-input',
}}
styles={{
input: { color: 'red' },
}}
/>
<Input
value="123"
prefixCls="rc-input"
className="custom-class"
addonAfter="addon"
style={{ backgroundColor: 'red' }}
classNames={{
input: 'custom-input',
}}
styles={{
input: { color: 'red' },
}}
/>
</>,
);
expect(container).toMatchSnapshot();
});
Expand Down