mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-01-18 22:36:31 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

fix: Input with readOnly should not clearable (#21494)

Browse Source
This commit is contained in:
二货机器人 2020-02-20 19:56:22 +08:00 committed by GitHub
parent db1383ca58
commit 7e649ec1b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/input/ClearableLabeledInput.tsx
View File

@ -26,6 +26,7 @@ interface BasicProps {
disabled?: boolean;
direction?: any;
focused?: boolean;
readOnly?: boolean;
}
/**
@ -42,8 +43,15 @@ interface ClearableInputProps extends BasicProps {
class ClearableLabeledInput extends React.Component<ClearableInputProps> {
renderClearIcon(prefixCls: string) {
const { allowClear, value, disabled, inputType, handleReset } = this.props;
if (!allowClear || disabled || value === undefined || value === null || value === '') {
const { allowClear, value, disabled, readOnly, inputType, handleReset } = this.props;
if (
!allowClear ||
disabled ||
readOnly ||
value === undefined ||
value === null ||
value === ''
) {
return null;
}
const className =

8
components/input/__tests__/index.test.js
View File

@ -376,9 +376,11 @@ describe('Input allowClear', () => {
wrapper.unmount();
});
it('should not support allowClear when it is disabled', () => {
const wrapper = mount(<Input allowClear defaultValue="111" disabled />);
expect(wrapper.find('.ant-input-clear-icon').length).toBe(0);
['disabled', 'readOnly'].forEach(prop => {
it(`should not support allowClear when it is ${prop}`, () => {
const wrapper = mount(<Input allowClear defaultValue="111" {...{ [prop]: true }} />);
expect(wrapper.find('.ant-input-clear-icon').length).toBe(0);
});
});
});

4
package.json
View File

@ -152,9 +152,9 @@
"@types/lodash": "^4.14.139",
"@types/prop-types": "^15.7.1",
"@types/raf": "^3.4.0",
"@types/react": "^16.9.0",
"@types/react": "^16.9.21",
"@types/react-color": "^3.0.1",
"@types/react-dom": "^16.8.4",
"@types/react-dom": "^16.9.5",
"@types/shallowequal": "^1.1.1",
"@types/warning": "^3.0.0",
"@typescript-eslint/eslint-plugin": "^2.19.0",