Skip to content

Commit ceb0d56

Browse files
authored
fix(ColorPicker): disable interactions when disabled (#59164)
1 parent 46d905e commit ceb0d56

11 files changed

Lines changed: 83 additions & 23 deletions

File tree

‎components/color-picker/ColorPickerPanel.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ const ColorPickerPanel: FC<ColorPickerPanelProps> = (props) => {
2525
onChange,
2626
onClear,
2727
allowClear,
28+
disabled,
2829
disabledAlpha,
2930
mode,
3031
onModeChange,
@@ -48,6 +49,7 @@ const ColorPickerPanel: FC<ColorPickerPanelProps> = (props) => {
4849
onChange,
4950
onClear,
5051
allowClear,
52+
disabled,
5153
disabledAlpha,
5254
mode,
5355
onModeChange,
@@ -67,6 +69,7 @@ const ColorPickerPanel: FC<ColorPickerPanelProps> = (props) => {
6769
onChange,
6870
onClear,
6971
allowClear,
72+
disabled,
7073
disabledAlpha,
7174
mode,
7275
onModeChange,

‎components/color-picker/__tests__/__snapshots__/index.test.tsx.snap‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ exports[`ColorPicker Should disabled work 1`] = `
66
class="ant-color-picker-trigger css-var-root ant-color-picker-css-var ant-color-picker-trigger-disabled"
77
>
88
<div
9+
aria-disabled="true"
910
aria-label="Clear color"
10-
class="ant-color-picker-clear"
11+
class="ant-color-picker-clear ant-color-picker-clear-disabled"
1112
role="button"
12-
tabindex="0"
13+
tabindex="-1"
1314
/>
1415
</div>
1516
</div>

‎components/color-picker/__tests__/components.test.tsx‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import React from 'react';
22
import { fireEvent, render } from '@testing-library/react';
33

44
import ColorAlphaInput from '../components/ColorAlphaInput';
5+
import ColorClear from '../components/ColorClear';
56
import ColorHexInput from '../components/ColorHexInput';
67
import ColorHsbInput from '../components/ColorHsbInput';
78
import ColorRgbInput from '../components/ColorRgbInput';
@@ -17,6 +18,24 @@ describe('ColorPicker Components test', () => {
1718
jest.useRealTimers();
1819
});
1920

21+
it('Should ColorClear disabled work', () => {
22+
const onChange = jest.fn();
23+
const { container } = render(
24+
<ColorClear prefixCls="test" value={generateColor('#1677ff')} onChange={onChange} disabled />,
25+
);
26+
const clear = container.querySelector<HTMLElement>('.test-clear')!;
27+
28+
expect(clear).toHaveClass('test-clear-disabled');
29+
expect(clear).toHaveAttribute('aria-disabled', 'true');
30+
expect(clear).toHaveAttribute('tabindex', '-1');
31+
32+
fireEvent.click(clear);
33+
fireEvent.keyDown(clear, { key: 'Enter' });
34+
fireEvent.keyDown(clear, { key: ' ' });
35+
36+
expect(onChange).not.toHaveBeenCalled();
37+
});
38+
2039
it('Should ColorSteppers work correct', () => {
2140
const handleAlphaChange = jest.fn();
2241
const { container } = render(<ColorSteppers prefixCls="test" onChange={handleAlphaChange} />);

‎components/color-picker/__tests__/index.test.tsx‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,29 @@ describe('ColorPicker', () => {
121121
it('Should disabled work', async () => {
122122
const { container } = render(<ColorPicker disabled />);
123123
expect(container.querySelector('.ant-color-picker-trigger-disabled')).toBeTruthy();
124+
const clear = container.querySelector<HTMLElement>('.ant-color-picker-clear')!;
125+
expect(clear).toHaveClass('ant-color-picker-clear-disabled');
126+
expect(clear).toHaveAttribute('aria-disabled', 'true');
127+
expect(clear).toHaveAttribute('tabindex', '-1');
124128
expect(container).toMatchSnapshot();
125129
fireEvent.click(container.querySelector('.ant-color-picker-trigger')!);
126130
await waitFakeTimer();
127131
expect(container.querySelector('.ant-color-picker')).toBeFalsy();
128132
});
129133

134+
it('Should update clear disabled state when disabled changes', () => {
135+
const { container, rerender } = render(<ColorPicker defaultValue={null} />);
136+
const clear = container.querySelector<HTMLElement>('.ant-color-picker-clear')!;
137+
138+
expect(clear).toHaveAttribute('tabindex', '0');
139+
expect(clear).not.toHaveClass('ant-color-picker-clear-disabled');
140+
141+
rerender(<ColorPicker defaultValue={null} disabled />);
142+
143+
expect(clear).toHaveAttribute('tabindex', '-1');
144+
expect(clear).toHaveClass('ant-color-picker-clear-disabled');
145+
});
146+
130147
it('Should allowClear and onClear work', async () => {
131148
const onClear = jest.fn();
132149
const { container } = render(

‎components/color-picker/components/ColorClear.tsx‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,22 @@ interface ColorClearProps {
1111
onChange?: (value: AggregationColor) => void;
1212
className?: string;
1313
style?: React.CSSProperties;
14+
disabled?: boolean;
1415
}
1516

16-
const ColorClear: FC<ColorClearProps> = ({ prefixCls, value, onChange, className, style }) => {
17+
const ColorClear: FC<ColorClearProps> = ({
18+
prefixCls,
19+
value,
20+
onChange,
21+
className,
22+
style,
23+
disabled,
24+
}) => {
1725
const onClick = () => {
26+
if (disabled) {
27+
return;
28+
}
29+
1830
if (onChange && value && !value.cleared) {
1931
const hsba = value.toHsb();
2032
hsba.a = 0;
@@ -36,8 +48,11 @@ const ColorClear: FC<ColorClearProps> = ({ prefixCls, value, onChange, className
3648
<div
3749
role="button"
3850
aria-label="Clear color"
39-
tabIndex={0}
40-
className={clsx(`${prefixCls}-clear`, className)}
51+
aria-disabled={disabled || undefined}
52+
tabIndex={disabled ? -1 : 0}
53+
className={clsx(`${prefixCls}-clear`, className, {
54+
[`${prefixCls}-clear-disabled`]: disabled,
55+
})}
4156
style={style}
4257
onClick={onClick}
4358
onKeyDown={onKeyDown}

‎components/color-picker/components/ColorTrigger.tsx‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,12 @@ const ColorTrigger = forwardRef<HTMLDivElement, ColorTriggerProps>((props, ref)
100100
const containerNode = useMemo<React.ReactNode>(
101101
() =>
102102
color.cleared ? (
103-
<ColorClear prefixCls={prefixCls} className={classNames.body} style={styles.body} />
103+
<ColorClear
104+
prefixCls={prefixCls}
105+
className={classNames.body}
106+
style={styles.body}
107+
disabled={disabled}
108+
/>
104109
) : (
105110
<ColorBlock
106111
prefixCls={prefixCls}
@@ -111,7 +116,7 @@ const ColorTrigger = forwardRef<HTMLDivElement, ColorTriggerProps>((props, ref)
111116
innerStyle={styles.content}
112117
/>
113118
),
114-
[color, prefixCls, classNames.body, classNames.content, styles.body, styles.content],
119+
[color, prefixCls, disabled, classNames.body, classNames.content, styles.body, styles.content],
115120
);
116121

117122
return (

‎components/color-picker/style/index.ts‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ const genClearStyle = (
128128
backgroundColor: red6,
129129
},
130130

131-
'&:hover': {
131+
[`&:not(${componentCls}-clear-disabled):hover`]: {
132132
borderColor: colorBorder,
133133
},
134134
},
@@ -148,7 +148,7 @@ const genStatusStyle: GenerateStyle<ColorPickerToken, CSSObject> = (token) => {
148148
return {
149149
[`&${componentCls}-status-error`]: {
150150
borderColor: colorError,
151-
'&:hover': {
151+
[`&:not(${componentCls}-trigger-disabled):hover`]: {
152152
borderColor: colorErrorHover,
153153
},
154154
[`&${componentCls}-trigger-active`]: {
@@ -157,7 +157,7 @@ const genStatusStyle: GenerateStyle<ColorPickerToken, CSSObject> = (token) => {
157157
},
158158
[`&${componentCls}-status-warning`]: {
159159
borderColor: colorWarning,
160-
'&:hover': {
160+
[`&:not(${componentCls}-trigger-disabled):hover`]: {
161161
borderColor: colorWarningHover,
162162
},
163163
[`&${componentCls}-trigger-active`]: {
@@ -226,7 +226,6 @@ const genColorPickerStyle: GenerateStyle<ColorPickerToken> = (token) => {
226226
marginSM,
227227
controlHeight,
228228
controlHeightSM,
229-
colorBgTextActive,
230229
colorPickerPresetColorSize,
231230
colorPickerPreviewSize,
232231
lineWidth,
@@ -303,7 +302,7 @@ const genColorPickerStyle: GenerateStyle<ColorPickerToken> = (token) => {
303302
},
304303
},
305304
},
306-
'&:hover': {
305+
[`&:not(${componentCls}-trigger-disabled):hover`]: {
307306
borderColor: colorPrimaryHover,
308307
},
309308
[`&${componentCls}-trigger-active`]: {
@@ -313,9 +312,6 @@ const genColorPickerStyle: GenerateStyle<ColorPickerToken> = (token) => {
313312
color: colorTextDisabled,
314313
background: colorBgContainerDisabled,
315314
cursor: 'not-allowed',
316-
'&:hover': {
317-
borderColor: colorBgTextActive,
318-
},
319315
[`${componentCls}-trigger-text`]: {
320316
color: colorTextDisabled,
321317
},

‎components/config-provider/__tests__/__snapshots__/components.test.tsx.snap‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12078,10 +12078,11 @@ exports[`ConfigProvider components ColorPicker configProvider componentDisabled
1207812078
class="config-color-picker-trigger css-var-root config-color-picker-css-var config-color-picker-trigger-disabled"
1207912079
>
1208012080
<div
12081+
aria-disabled="true"
1208112082
aria-label="Clear color"
12082-
class="config-color-picker-clear"
12083+
class="config-color-picker-clear config-color-picker-clear-disabled"
1208312084
role="button"
12084-
tabindex="0"
12085+
tabindex="-1"
1208512086
/>
1208612087
</div>
1208712088
`;

‎components/form/__tests__/__snapshots__/demo-extend.test.ts.snap‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5180,10 +5180,11 @@ Array [
51805180
class="ant-color-picker-trigger css-var-test-id ant-color-picker-css-var ant-color-picker-trigger-disabled"
51815181
>
51825182
<div
5183+
aria-disabled="true"
51835184
aria-label="Clear color"
5184-
class="ant-color-picker-clear"
5185+
class="ant-color-picker-clear ant-color-picker-clear-disabled"
51855186
role="button"
5186-
tabindex="0"
5187+
tabindex="-1"
51875188
/>
51885189
</div>
51895190
<div

‎components/form/__tests__/__snapshots__/demo.test.tsx.snap‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2685,10 +2685,11 @@ Array [
26852685
class="ant-color-picker-trigger css-var-test-id ant-color-picker-css-var ant-color-picker-trigger-disabled"
26862686
>
26872687
<div
2688+
aria-disabled="true"
26882689
aria-label="Clear color"
2689-
class="ant-color-picker-clear"
2690+
class="ant-color-picker-clear ant-color-picker-clear-disabled"
26902691
role="button"
2691-
tabindex="0"
2692+
tabindex="-1"
26922693
/>
26932694
</div>
26942695
</div>

0 commit comments

Comments
 (0)