Skip to content
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

fix(menu): fix custom expand icon cannot be hidden #40071

Merged
merged 8 commits into from
Jan 7, 2023
Merged

fix(menu): fix custom expand icon cannot be hidden #40071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2991e93
test: add case
Wxh16144 Jan 6, 2023
71c79a3
fix: fix the error of missing custom icon className
Wxh16144 Jan 6, 2023
6ba39f2
test: add case
Wxh16144 Jan 6, 2023
4eb27cb
fix(menu): fix the bug that the custom expand icon is not hidden in c…
Wxh16144 Jan 6, 2023
1df3f75
test: update snapshot
Wxh16144 Jan 6, 2023
b03991b
Revert "fix: fix the error of missing custom icon className"
Wxh16144 Jan 7, 2023
df989a6
test: update case
Wxh16144 Jan 7, 2023
c2705d1
fix: fix the error of missing custom icon className
Wxh16144 Jan 7, 2023
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
14 changes: 7 additions & 7 deletions components/config-provider/__tests__/__snapshots__/components.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26765,7 +26765,7 @@ exports[`ConfigProvider components Table configProvider 1`] = `
Submenu
</span>
<span
class="config-dropdown-menu-submenu-expand-icon"
class="config-dropdown-menu-submenu-expand-icon config-dropdown-menu-submenu-arrow"
>
<span
aria-label="right"
Expand Down Expand Up @@ -27072,7 +27072,7 @@ exports[`ConfigProvider components Table configProvider componentDisabled 1`] =
Submenu
</span>
<span
class="config-dropdown-menu-submenu-expand-icon"
class="config-dropdown-menu-submenu-expand-icon config-dropdown-menu-submenu-arrow"
>
<span
aria-label="right"
Expand Down Expand Up @@ -27379,7 +27379,7 @@ exports[`ConfigProvider components Table configProvider componentSize large 1`]
Submenu
</span>
<span
class="config-dropdown-menu-submenu-expand-icon"
class="config-dropdown-menu-submenu-expand-icon config-dropdown-menu-submenu-arrow"
>
<span
aria-label="right"
Expand Down Expand Up @@ -27685,7 +27685,7 @@ exports[`ConfigProvider components Table configProvider componentSize middle 1`]
Submenu
</span>
<span
class="config-dropdown-menu-submenu-expand-icon"
class="config-dropdown-menu-submenu-expand-icon config-dropdown-menu-submenu-arrow"
>
<span
aria-label="right"
Expand Down Expand Up @@ -27991,7 +27991,7 @@ exports[`ConfigProvider components Table configProvider virtual and dropdownMatc
Submenu
</span>
<span
class="ant-dropdown-menu-submenu-expand-icon"
class="ant-dropdown-menu-submenu-expand-icon ant-dropdown-menu-submenu-arrow"
>
<span
aria-label="right"
Expand Down Expand Up @@ -28297,7 +28297,7 @@ exports[`ConfigProvider components Table normal 1`] = `
Submenu
</span>
<span
class="ant-dropdown-menu-submenu-expand-icon"
class="ant-dropdown-menu-submenu-expand-icon ant-dropdown-menu-submenu-arrow"
>
<span
aria-label="right"
Expand Down Expand Up @@ -28603,7 +28603,7 @@ exports[`ConfigProvider components Table prefixCls 1`] = `
Submenu
</span>
<span
class="ant-dropdown-menu-submenu-expand-icon"
class="ant-dropdown-menu-submenu-expand-icon ant-dropdown-menu-submenu-arrow"
>
<span
aria-label="right"
Expand Down
12 changes: 6 additions & 6 deletions components/dropdown/__tests__/__snapshots__/demo-extend.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6675,7 +6675,7 @@ Array [
Navigation One
</span>
<span
class="ant-dropdown-menu-submenu-expand-icon"
class="ant-dropdown-menu-submenu-expand-icon ant-dropdown-menu-submenu-arrow"
>
<span
aria-label="right"
Expand Down Expand Up @@ -6907,7 +6907,7 @@ Array [
Navigation Two
</span>
<span
class="ant-dropdown-menu-submenu-expand-icon"
class="ant-dropdown-menu-submenu-expand-icon ant-dropdown-menu-submenu-arrow"
>
<span
aria-label="right"
Expand Down Expand Up @@ -7022,7 +7022,7 @@ Array [
Submenu
</span>
<span
class="ant-dropdown-menu-submenu-expand-icon"
class="ant-dropdown-menu-submenu-expand-icon ant-dropdown-menu-submenu-arrow"
>
<span
aria-label="right"
Expand Down Expand Up @@ -7164,7 +7164,7 @@ Array [
Navigation Three
</span>
<span
class="ant-dropdown-menu-submenu-expand-icon"
class="ant-dropdown-menu-submenu-expand-icon ant-dropdown-menu-submenu-arrow"
>
<span
aria-label="right"
Expand Down Expand Up @@ -9852,7 +9852,7 @@ Array [
sub menu
</span>
<span
class="ant-dropdown-menu-submenu-expand-icon"
class="ant-dropdown-menu-submenu-expand-icon ant-dropdown-menu-submenu-arrow"
>
<span
aria-label="right"
Expand Down Expand Up @@ -9971,7 +9971,7 @@ Array [
disabled sub menu
</span>
<span
class="ant-dropdown-menu-submenu-expand-icon"
class="ant-dropdown-menu-submenu-expand-icon ant-dropdown-menu-submenu-arrow"
>
<span
aria-label="right"
Expand Down
52 changes: 52 additions & 0 deletions components/menu/__tests__/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1047,4 +1047,56 @@ describe('Menu', () => {
);
errorSpy.mockRestore();
});

it('expandIconClassName', () => {
const { container } = render(
<Menu
expandIcon={<span className="custom-expand-icon" />}
inlineCollapsed
items={[
{
label: 'Option 1',
key: '1',
icon: '112',
children: [
{
label: 'Option 1-1',
key: '1-1',
},
],
},
]}
/>,
);
expect(container.querySelector('.custom-expand-icon')).toBeTruthy();
});

// https://github.com/ant-design/ant-design/issues/40041
it('should not show icon when inlineCollapsed', () => {
const { container } = render(
<Menu
expandIcon={<span className="bamboo">I</span>}
inlineCollapsed
items={[
{
label: 'Option 1',
key: '1',
icon: '112',
children: [
{
label: 'Option 1-1',
key: '1-1',
},
],
},
]}
/>,
);

expect(container.querySelector('.bamboo')).toBeTruthy();
expect(getComputedStyle(container.querySelector('.bamboo') as HTMLElement)).toHaveProperty(
'opacity',
'0',
);
});
});
li-jia-nan marked this conversation as resolved.
Show resolved Hide resolved
5 changes: 3 additions & 2 deletions components/menu/menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,9 @@ const InternalMenu = forwardRef<RcMenuRef, InternalMenuProps>((props, ref) => {
if (typeof expandIcon === 'function') {
mergedExpandIcon = expandIcon;
} else {
mergedExpandIcon = cloneElement(expandIcon || overrideObj.expandIcon, {
className: `${prefixCls}-submenu-expand-icon`,
const beClone: any = expandIcon || overrideObj.expandIcon;
mergedExpandIcon = cloneElement(beClone, {
className: classNames(`${prefixCls}-submenu-expand-icon`, beClone?.props?.className),
});
}

Expand Down
5 changes: 4 additions & 1 deletion components/menu/style/vertical.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,10 @@ const getVerticalStyle: GenerateStyle<MenuToken> = (token) => {
paddingInline: `calc(50% - ${fontSizeSM}px)`,
textOverflow: 'clip',

[`${componentCls}-submenu-arrow`]: {
[`
${componentCls}-submenu-arrow,
${componentCls}-submenu-expand-icon
`]: {
opacity: 0,
},

Expand Down
4 changes: 2 additions & 2 deletions components/table/__tests__/__snapshots__/Table.filter.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ exports[`Table.filter renders menu correctly 1`] = `
Title
</span>
<span
class="ant-dropdown-menu-submenu-expand-icon"
class="ant-dropdown-menu-submenu-expand-icon ant-dropdown-menu-submenu-arrow"
>
<span
aria-label="right"
Expand Down Expand Up @@ -787,7 +787,7 @@ exports[`Table.filter renders radio filter correctly 1`] = `
Title
</span>
<span
class="ant-dropdown-menu-submenu-expand-icon"
class="ant-dropdown-menu-submenu-expand-icon ant-dropdown-menu-submenu-arrow"
>
<span
aria-label="right"
Expand Down
2 changes: 1 addition & 1 deletion components/table/__tests__/__snapshots__/demo-extend.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13569,7 +13569,7 @@ exports[`renders ./components/table/demo/head.tsx extend context correctly 1`] =
Submenu
</span>
<span
class="ant-dropdown-menu-submenu-expand-icon"
class="ant-dropdown-menu-submenu-expand-icon ant-dropdown-menu-submenu-arrow"
>
<span
aria-label="right"
Expand Down