Skip to content

feat: comobobox mode should not has selected item #738

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
merged 1 commit into from
Apr 12, 2022
Merged

feat: comobobox mode should not has selected item #738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion assets/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@

// ------- Active -------
&-active {
background: green;
background: #ddd;
}

// ------ Disabled ------
Expand Down
23 changes: 19 additions & 4 deletions src/OptionList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,17 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, OptionListP
_,
ref,
) => {
const { prefixCls, id, open, multiple, searchValue, toggleOpen, notFoundContent, onPopupScroll } =
useBaseProps();
const {
prefixCls,
id,
open,
multiple,
mode,
searchValue,
toggleOpen,
notFoundContent,
onPopupScroll,
} = useBaseProps();
const {
flattenOptions,
onActiveValue,
Expand Down Expand Up @@ -108,6 +117,12 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, OptionListP
setActive(defaultActiveFirstOption !== false ? getEnabledActiveIndex(0) : -1);
}, [memoFlattenOptions.length, searchValue]);

// https://github.com/ant-design/ant-design/issues/34975
const isSelected = React.useCallback(
(value: RawValueType) => rawValues.has(value) && mode !== 'combobox',
[mode, [...rawValues].toString()],
);

// Auto scroll to item position in single mode
useEffect(() => {
/**
Expand Down Expand Up @@ -246,7 +261,7 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, OptionListP
key={index}
role={group ? 'presentation' : 'option'}
id={`${id}_list_${index}`}
aria-selected={rawValues.has(value)}
aria-selected={isSelected(value)}
>
{value}
</div>
Expand Down Expand Up @@ -293,7 +308,7 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, OptionListP
const passedProps = omit(otherProps, omitFieldNameList);

// Option
const selected = rawValues.has(value);
const selected = isSelected(value);

const optionPrefixCls = `${itemPrefixCls}-option`;
const optionClassName = classNames(itemPrefixCls, optionPrefixCls, className, {
Expand Down
14 changes: 14 additions & 0 deletions tests/Combobox.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,4 +507,18 @@ describe('Select.Combobox', () => {

expect(wrapper.find('List').prop('data')).toHaveLength(2);
});

// https://github.com/ant-design/ant-design/issues/34975
it('should not contain selected className in combobox mode', () => {
const onChange = jest.fn();
const wrapper = mount(
<Select mode="combobox" onChange={onChange}>
<Option value="One">One</Option>
<Option value="Two">Two</Option>
</Select>,
);
toggleOpen(wrapper);
selectItem(wrapper);
expect(wrapper.find('.rc-select-item-option-selected').length).toBe(0);
});
});