Skip to content

Commit fee6615

Browse files
committed
fix: Disabled should not display clear button
1 parent 12349ef commit fee6615

File tree

4 files changed

+8
-14
lines changed

4 files changed

+8
-14
lines changed

src/OptionList.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ const OptionList: React.RefForwardingComponent<
131131
// ========================== Values ==========================
132132
const onSelectValue = (value: RawValueType) => {
133133
if (value !== null) {
134-
console.log('-->', value, Array.from(values));
135134
onSelect(value, { selected: !values.has(value) });
136135
}
137136

src/generate.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ export default function generateSelector<
796796
triggerSearch('', false);
797797
};
798798

799-
if (allowClear && (mergedRawValue.length || mergedSearchValue)) {
799+
if (!disabled && allowClear && (mergedRawValue.length || mergedSearchValue)) {
800800
clearNode = (
801801
<TransBtn
802802
className={`${prefixCls}-clear`}

tests/Select.test.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,13 @@ describe('Select.Basic', () => {
359359
);
360360

361361
wrapper.find('input').simulate('change', { target: { value: 'foo' } });
362+
363+
// disabled
364+
wrapper.setProps({ disabled: true });
365+
expect(wrapper.find('.rc-select-clear')).toHaveLength(0);
366+
367+
// enabled
368+
wrapper.setProps({ disabled: false });
362369
wrapper
363370
.find('.rc-select-clear')
364371
.last()

tests/__snapshots__/Select.test.tsx.snap

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -422,18 +422,6 @@ exports[`Select.Basic render renders disabled select correctly 1`] = `
422422
class="antd-arrow-icon"
423423
/>
424424
</span>
425-
<span
426-
aria-hidden="true"
427-
class="antd-clear"
428-
style="user-select:none;-webkit-user-select:none"
429-
unselectable="on"
430-
>
431-
<span
432-
class="antd-clear-icon"
433-
>
434-
×
435-
</span>
436-
</span>
437425
</div>
438426
`;
439427

0 commit comments

Comments
 (0)