Skip to content

Commit 2a5b18a

Browse files
authored
fix: fix form error style for input addonAfter slot when disabled (#6403), close #6374
1 parent 65408bf commit 2a5b18a

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

components/form/style/mixin.less

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
color: @text-color;
3636
}
3737

38-
.@{ant-prefix}-input-group-addon,
39-
.@{ant-prefix}-input-number-group-addon {
38+
:not(.@{ant-prefix}-input-group-addon-disabled).@{ant-prefix}-input-group-addon,
39+
:not(.@{ant-prefix}-input-number-group-addon-disabled).@{ant-prefix}-input-number-group-addon {
4040
color: @text-color;
4141
border-color: @border-color;
4242
}

components/input/ClearableLabeledInput.tsx

+9-2
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ export default defineComponent({
144144
size,
145145
direction,
146146
hidden,
147+
disabled,
147148
} = props;
148149
// Not wrap when there is not addons
149150
if (!hasAddon({ addonBefore, addonAfter })) {
@@ -152,10 +153,16 @@ export default defineComponent({
152153

153154
const wrapperClassName = `${prefixCls}-group`;
154155
const addonClassName = `${wrapperClassName}-addon`;
156+
// fix form error style for input addonAfter slot when disabled
157+
const mergedAddonClassName = classNames(addonClassName, {
158+
[`${addonClassName}-disabled`]: disabled,
159+
});
155160
const addonBeforeNode = addonBefore ? (
156-
<span class={addonClassName}>{addonBefore}</span>
161+
<span class={mergedAddonClassName}>{addonBefore}</span>
162+
) : null;
163+
const addonAfterNode = addonAfter ? (
164+
<span class={mergedAddonClassName}>{addonAfter}</span>
157165
) : null;
158-
const addonAfterNode = addonAfter ? <span class={addonClassName}>{addonAfter}</span> : null;
159166

160167
const mergedWrapperClassName = classNames(`${prefixCls}-wrapper`, wrapperClassName, {
161168
[`${wrapperClassName}-rtl`]: direction === 'rtl',

0 commit comments

Comments
 (0)