Skip to content

fix: Group not provide title attr #727

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 2 commits into from
Mar 15, 2022
Merged

fix: Group not provide title attr #727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8cc734
fix: group missing title
zombieJ Mar 15, 2022
149a2b3
test: coverage
zombieJ Mar 15, 2022
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
16 changes: 11 additions & 5 deletions src/OptionList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ export interface RefOptionListProps {
scrollTo?: (index: number) => void;
}

function isTitleType(content: any) {
return typeof content === 'string' || typeof content === 'number';
}

/**
* Using virtual list of option display.
* Will fallback to dom if use customize render.
Expand Down Expand Up @@ -272,8 +276,13 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, OptionListP

// Group
if (group) {
const groupTitle = data.title ?? (isTitleType(label) && label);

return (
<div className={classNames(itemPrefixCls, `${itemPrefixCls}-group`)}>
<div
className={classNames(itemPrefixCls, `${itemPrefixCls}-group`)}
title={groupTitle}
>
{label !== undefined ? label : key}
</div>
);
Expand Down Expand Up @@ -301,10 +310,7 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, OptionListP
// https://github.com/ant-design/ant-design/issues/34145
const content = typeof mergedLabel === 'number' ? mergedLabel : mergedLabel || value;
// https://github.com/ant-design/ant-design/issues/26717
let optionTitle =
typeof content === 'string' || typeof content === 'number'
? content.toString()
: undefined;
let optionTitle = isTitleType(content) ? content.toString() : undefined;
if (title !== undefined) {
optionTitle = title;
}
Expand Down
22 changes: 22 additions & 0 deletions tests/Group.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,26 @@ describe('Select.Group', () => {
wrapper.find('input').simulate('change', { target: { value: '1' } });
expect(wrapper.find('List').props().data).toHaveLength(2);
});

describe('group title', () => {
it('label as title', () => {
const wrapper = mount(
<Select open>
<OptGroup label="zombiej" />
</Select>,
);

expect(wrapper.find('.rc-select-item-group').prop('title')).toEqual('zombiej');
});

it('customize title', () => {
const wrapper = mount(
<Select open>
<OptGroup label="zombiej" title="bamboo" />
</Select>,
);

expect(wrapper.find('.rc-select-item-group').prop('title')).toEqual('bamboo');
});
});
});
2 changes: 2 additions & 0 deletions tests/__snapshots__/Select.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,7 @@ exports[`Select.Basic render renders dropdown correctly 1`] = `
>
<div
class="antd-item antd-item-group"
title="manager"
>
manager
</div>
Expand Down Expand Up @@ -584,6 +585,7 @@ exports[`Select.Basic render renders dropdown correctly 1`] = `
</div>
<div
class="antd-item antd-item-group"
title="engineer"
>
engineer
</div>
Expand Down
2 changes: 2 additions & 0 deletions tests/__snapshots__/Tags.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ exports[`Select.Tags OptGroup renders correctly 1`] = `
>
<div
class="rc-select-item rc-select-item-group"
title="Manager"
>
Manager
</div>
Expand Down Expand Up @@ -170,6 +171,7 @@ exports[`Select.Tags OptGroup renders correctly 1`] = `
</div>
<div
class="rc-select-item rc-select-item-group"
title="Engineer"
>
Engineer
</div>
Expand Down