test/ant-design
1
0
Fork 0
mirror of https://gitee.com/ant-design/ant-design.git synced 2024-12-15 17:31:25 +08:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

chore: auto merge branchs (#30708)

Browse Source 
chore: feature merge master
This commit is contained in:
github-actions[bot] 2021-05-26 11:41:30 +00:00 committed by GitHub
commit 772bdd8ada
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 968 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/pr-check-merge.yml vendored
View File

@ -7,7 +7,7 @@ on:
jobs:
comment:
runs-on: ubuntu-latest
if: (github.event.pull_request.head.ref == 'feature' && github.event.pull_request.base.ref == 'master') || (github.event.pull_request.base.ref == 'feature' && github.event.pull_request.head.ref == 'master')
if: github.event.pull_request.head.ref == 'feature' || github.event.pull_request.head.ref == 'master'
steps:
- uses: actions-cool/issues-helper@v2.2.1
with:

108
components/config-provider/__tests__/__snapshots__/components.test.js.snap
View File

@ -15054,9 +15054,12 @@ exports[`ConfigProvider components Menu configProvider 1`] = `
role="menuitem"
style="padding-left:24px"
tabindex="-1"
title="bamboo"
>
<span
class="config-menu-title-content"
>
bamboo
</span>
<i
class="config-menu-submenu-arrow"
/>
@ -15082,8 +15085,12 @@ exports[`ConfigProvider components Menu configProvider 1`] = `
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="config-menu-title-content"
>
Light
</span>
</li>
</ul>
</li>
@ -15110,9 +15117,12 @@ exports[`ConfigProvider components Menu configProvider componentSize large 1`] =
role="menuitem"
style="padding-left:24px"
tabindex="-1"
title="bamboo"
>
<span
class="config-menu-title-content"
>
bamboo
</span>
<i
class="config-menu-submenu-arrow"
/>
@ -15138,8 +15148,12 @@ exports[`ConfigProvider components Menu configProvider componentSize large 1`] =
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="config-menu-title-content"
>
Light
</span>
</li>
</ul>
</li>
@ -15166,9 +15180,12 @@ exports[`ConfigProvider components Menu configProvider componentSize middle 1`]
role="menuitem"
style="padding-left:24px"
tabindex="-1"
title="bamboo"
>
<span
class="config-menu-title-content"
>
bamboo
</span>
<i
class="config-menu-submenu-arrow"
/>
@ -15194,8 +15211,12 @@ exports[`ConfigProvider components Menu configProvider componentSize middle 1`]
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="config-menu-title-content"
>
Light
</span>
</li>
</ul>
</li>
@ -15222,9 +15243,12 @@ exports[`ConfigProvider components Menu configProvider virtual and dropdownMatch
role="menuitem"
style="padding-left:24px"
tabindex="-1"
title="bamboo"
>
<span
class="ant-menu-title-content"
>
bamboo
</span>
<i
class="ant-menu-submenu-arrow"
/>
@ -15250,8 +15274,12 @@ exports[`ConfigProvider components Menu configProvider virtual and dropdownMatch
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
Light
</span>
</li>
</ul>
</li>
@ -15278,9 +15306,12 @@ exports[`ConfigProvider components Menu normal 1`] = `
role="menuitem"
style="padding-left:24px"
tabindex="-1"
title="bamboo"
>
<span
class="ant-menu-title-content"
>
bamboo
</span>
<i
class="ant-menu-submenu-arrow"
/>
@ -15306,8 +15337,12 @@ exports[`ConfigProvider components Menu normal 1`] = `
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
Light
</span>
</li>
</ul>
</li>
@ -15334,9 +15369,12 @@ exports[`ConfigProvider components Menu prefixCls 1`] = `
role="menuitem"
style="padding-left:24px"
tabindex="-1"
title="bamboo"
>
<span
class="prefix-Menu-title-content"
>
bamboo
</span>
<i
class="prefix-Menu-submenu-arrow"
/>
@ -15364,8 +15402,12 @@ exports[`ConfigProvider components Menu prefixCls 1`] = `
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="prefix-Menu-title-content"
>
Light
</span>
</li>
</ul>
</li>
@ -22865,6 +22907,9 @@ exports[`ConfigProvider components Table configProvider 1`] = `
class="config-dropdown-menu-item"
role="menuitem"
tabindex="-1"
>
<span
class="config-dropdown-menu-title-content"
>
<label
class="config-checkbox-wrapper"
@ -22884,6 +22929,7 @@ exports[`ConfigProvider components Table configProvider 1`] = `
<span>
Joe
</span>
</span>
</li>
<li
class="config-dropdown-menu-submenu config-dropdown-menu-submenu-vertical"
@ -22895,9 +22941,12 @@ exports[`ConfigProvider components Table configProvider 1`] = `
class="config-dropdown-menu-submenu-title"
role="menuitem"
tabindex="-1"
title="Submenu"
>
<span
class="config-dropdown-menu-title-content"
>
Submenu
</span>
<i
class="config-dropdown-menu-submenu-arrow"
/>
@ -23128,6 +23177,9 @@ exports[`ConfigProvider components Table configProvider componentSize large 1`]
class="config-dropdown-menu-item"
role="menuitem"
tabindex="-1"
>
<span
class="config-dropdown-menu-title-content"
>
<label
class="config-checkbox-wrapper"
@ -23147,6 +23199,7 @@ exports[`ConfigProvider components Table configProvider componentSize large 1`]
<span>
Joe
</span>
</span>
</li>
<li
class="config-dropdown-menu-submenu config-dropdown-menu-submenu-vertical"
@ -23158,9 +23211,12 @@ exports[`ConfigProvider components Table configProvider componentSize large 1`]
class="config-dropdown-menu-submenu-title"
role="menuitem"
tabindex="-1"
title="Submenu"
>
<span
class="config-dropdown-menu-title-content"
>
Submenu
</span>
<i
class="config-dropdown-menu-submenu-arrow"
/>
@ -23391,6 +23447,9 @@ exports[`ConfigProvider components Table configProvider componentSize middle 1`]
class="config-dropdown-menu-item"
role="menuitem"
tabindex="-1"
>
<span
class="config-dropdown-menu-title-content"
>
<label
class="config-checkbox-wrapper"
@ -23410,6 +23469,7 @@ exports[`ConfigProvider components Table configProvider componentSize middle 1`]
<span>
Joe
</span>
</span>
</li>
<li
class="config-dropdown-menu-submenu config-dropdown-menu-submenu-vertical"
@ -23421,9 +23481,12 @@ exports[`ConfigProvider components Table configProvider componentSize middle 1`]
class="config-dropdown-menu-submenu-title"
role="menuitem"
tabindex="-1"
title="Submenu"
>
<span
class="config-dropdown-menu-title-content"
>
Submenu
</span>
<i
class="config-dropdown-menu-submenu-arrow"
/>
@ -23654,6 +23717,9 @@ exports[`ConfigProvider components Table configProvider virtual and dropdownMatc
class="ant-dropdown-menu-item"
role="menuitem"
tabindex="-1"
>
<span
class="ant-dropdown-menu-title-content"
>
<label
class="ant-checkbox-wrapper"
@ -23673,6 +23739,7 @@ exports[`ConfigProvider components Table configProvider virtual and dropdownMatc
<span>
Joe
</span>
</span>
</li>
<li
class="ant-dropdown-menu-submenu ant-dropdown-menu-submenu-vertical"
@ -23684,9 +23751,12 @@ exports[`ConfigProvider components Table configProvider virtual and dropdownMatc
class="ant-dropdown-menu-submenu-title"
role="menuitem"
tabindex="-1"
title="Submenu"
>
<span
class="ant-dropdown-menu-title-content"
>
Submenu
</span>
<i
class="ant-dropdown-menu-submenu-arrow"
/>
@ -23917,6 +23987,9 @@ exports[`ConfigProvider components Table normal 1`] = `
class="ant-dropdown-menu-item"
role="menuitem"
tabindex="-1"
>
<span
class="ant-dropdown-menu-title-content"
>
<label
class="ant-checkbox-wrapper"
@ -23936,6 +24009,7 @@ exports[`ConfigProvider components Table normal 1`] = `
<span>
Joe
</span>
</span>
</li>
<li
class="ant-dropdown-menu-submenu ant-dropdown-menu-submenu-vertical"
@ -23947,9 +24021,12 @@ exports[`ConfigProvider components Table normal 1`] = `
class="ant-dropdown-menu-submenu-title"
role="menuitem"
tabindex="-1"
title="Submenu"
>
<span
class="ant-dropdown-menu-title-content"
>
Submenu
</span>
<i
class="ant-dropdown-menu-submenu-arrow"
/>
@ -24180,6 +24257,9 @@ exports[`ConfigProvider components Table prefixCls 1`] = `
class="ant-dropdown-menu-item"
role="menuitem"
tabindex="-1"
>
<span
class="ant-dropdown-menu-title-content"
>
<label
class="ant-checkbox-wrapper"
@ -24199,6 +24279,7 @@ exports[`ConfigProvider components Table prefixCls 1`] = `
<span>
Joe
</span>
</span>
</li>
<li
class="ant-dropdown-menu-submenu ant-dropdown-menu-submenu-vertical"
@ -24210,9 +24291,12 @@ exports[`ConfigProvider components Table prefixCls 1`] = `
class="ant-dropdown-menu-submenu-title"
role="menuitem"
tabindex="-1"
title="Submenu"
>
<span
class="ant-dropdown-menu-title-content"
>
Submenu
</span>
<i
class="ant-dropdown-menu-submenu-arrow"
/>

172
components/layout/__tests__/__snapshots__/demo.test.js.snap
View File

@ -299,30 +299,42 @@ exports[`renders ./components/layout/demo/fixed.md correctly 1`] = `
role="menuitem"
style="opacity:1;order:0"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
nav 1
</span>
</li>
<li
class="ant-menu-overflow-item ant-menu-item ant-menu-item-selected ant-menu-item-only-child"
role="menuitem"
style="opacity:1;order:1"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
nav 2
</span>
</li>
<li
class="ant-menu-overflow-item ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="opacity:1;order:2"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
nav 3
</span>
</li>
<li
aria-hidden="true"
class="ant-menu-overflow-item ant-menu-overflow-item-rest ant-menu-submenu ant-menu-submenu-horizontal"
role="none"
style="opacity:0;height:0;overflow-y:hidden;order:9007199254740991;pointer-events:none"
style="opacity:0;height:0;overflow-y:hidden;order:9007199254740991;pointer-events:none;position:absolute"
>
<div
aria-expanded="false"
@ -330,9 +342,26 @@ exports[`renders ./components/layout/demo/fixed.md correctly 1`] = `
class="ant-menu-submenu-title"
role="menuitem"
tabindex="-1"
title="..."
>
...
<span
aria-label="ellipsis"
class="anticon anticon-ellipsis"
role="img"
>
<svg
aria-hidden="true"
data-icon="ellipsis"
fill="currentColor"
focusable="false"
height="1em"
viewBox="64 64 896 896"
width="1em"
>
<path
d="M176 511a56 56 0 10112 0 56 56 0 10-112 0zm280 0a56 56 0 10112 0 56 56 0 10-112 0zm280 0a56 56 0 10112 0 56 56 0 10-112 0z"
/>
</svg>
</span>
<i
class="ant-menu-submenu-arrow"
/>
@ -1271,30 +1300,42 @@ exports[`renders ./components/layout/demo/top.md correctly 1`] = `
role="menuitem"
style="opacity:1;order:0"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
nav 1
</span>
</li>
<li
class="ant-menu-overflow-item ant-menu-item ant-menu-item-selected ant-menu-item-only-child"
role="menuitem"
style="opacity:1;order:1"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
nav 2
</span>
</li>
<li
class="ant-menu-overflow-item ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="opacity:1;order:2"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
nav 3
</span>
</li>
<li
aria-hidden="true"
class="ant-menu-overflow-item ant-menu-overflow-item-rest ant-menu-submenu ant-menu-submenu-horizontal"
role="none"
style="opacity:0;height:0;overflow-y:hidden;order:9007199254740991;pointer-events:none"
style="opacity:0;height:0;overflow-y:hidden;order:9007199254740991;pointer-events:none;position:absolute"
>
<div
aria-expanded="false"
@ -1302,9 +1343,26 @@ exports[`renders ./components/layout/demo/top.md correctly 1`] = `
class="ant-menu-submenu-title"
role="menuitem"
tabindex="-1"
title="..."
>
...
<span
aria-label="ellipsis"
class="anticon anticon-ellipsis"
role="img"
>
<svg
aria-hidden="true"
data-icon="ellipsis"
fill="currentColor"
focusable="false"
height="1em"
viewBox="64 64 896 896"
width="1em"
>
<path
d="M176 511a56 56 0 10112 0 56 56 0 10-112 0zm280 0a56 56 0 10112 0 56 56 0 10-112 0zm280 0a56 56 0 10112 0 56 56 0 10-112 0z"
/>
</svg>
</span>
<i
class="ant-menu-submenu-arrow"
/>
@ -1393,30 +1451,42 @@ exports[`renders ./components/layout/demo/top-side.md correctly 1`] = `
role="menuitem"
style="opacity:1;order:0"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
nav 1
</span>
</li>
<li
class="ant-menu-overflow-item ant-menu-item ant-menu-item-selected ant-menu-item-only-child"
role="menuitem"
style="opacity:1;order:1"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
nav 2
</span>
</li>
<li
class="ant-menu-overflow-item ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="opacity:1;order:2"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
nav 3
</span>
</li>
<li
aria-hidden="true"
class="ant-menu-overflow-item ant-menu-overflow-item-rest ant-menu-submenu ant-menu-submenu-horizontal"
role="none"
style="opacity:0;height:0;overflow-y:hidden;order:9007199254740991;pointer-events:none"
style="opacity:0;height:0;overflow-y:hidden;order:9007199254740991;pointer-events:none;position:absolute"
>
<div
aria-expanded="false"
@ -1424,9 +1494,26 @@ exports[`renders ./components/layout/demo/top-side.md correctly 1`] = `
class="ant-menu-submenu-title"
role="menuitem"
tabindex="-1"
title="..."
>
...
<span
aria-label="ellipsis"
class="anticon anticon-ellipsis"
role="img"
>
<svg
aria-hidden="true"
data-icon="ellipsis"
fill="currentColor"
focusable="false"
height="1em"
viewBox="64 64 896 896"
width="1em"
>
<path
d="M176 511a56 56 0 10112 0 56 56 0 10-112 0zm280 0a56 56 0 10112 0 56 56 0 10-112 0zm280 0a56 56 0 10112 0 56 56 0 10-112 0z"
/>
</svg>
</span>
<i
class="ant-menu-submenu-arrow"
/>
@ -1546,32 +1633,48 @@ exports[`renders ./components/layout/demo/top-side.md correctly 1`] = `
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
option1
</span>
</li>
<li
class="ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
option2
</span>
</li>
<li
class="ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
option3
</span>
</li>
<li
class="ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
option4
</span>
</li>
</ul>
</li>
@ -1698,30 +1801,42 @@ exports[`renders ./components/layout/demo/top-side-2.md correctly 1`] = `
role="menuitem"
style="opacity:1;order:0"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
nav 1
</span>
</li>
<li
class="ant-menu-overflow-item ant-menu-item ant-menu-item-selected ant-menu-item-only-child"
role="menuitem"
style="opacity:1;order:1"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
nav 2
</span>
</li>
<li
class="ant-menu-overflow-item ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="opacity:1;order:2"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
nav 3
</span>
</li>
<li
aria-hidden="true"
class="ant-menu-overflow-item ant-menu-overflow-item-rest ant-menu-submenu ant-menu-submenu-horizontal"
role="none"
style="opacity:0;height:0;overflow-y:hidden;order:9007199254740991;pointer-events:none"
style="opacity:0;height:0;overflow-y:hidden;order:9007199254740991;pointer-events:none;position:absolute"
>
<div
aria-expanded="false"
@ -1729,9 +1844,26 @@ exports[`renders ./components/layout/demo/top-side-2.md correctly 1`] = `
class="ant-menu-submenu-title"
role="menuitem"
tabindex="-1"
title="..."
>
...
<span
aria-label="ellipsis"
class="anticon anticon-ellipsis"
role="img"
>
<svg
aria-hidden="true"
data-icon="ellipsis"
fill="currentColor"
focusable="false"
height="1em"
viewBox="64 64 896 896"
width="1em"
>
<path
d="M176 511a56 56 0 10112 0 56 56 0 10-112 0zm280 0a56 56 0 10112 0 56 56 0 10-112 0zm280 0a56 56 0 10112 0 56 56 0 10-112 0z"
/>
</svg>
</span>
<i
class="ant-menu-submenu-arrow"
/>
@ -1805,32 +1937,48 @@ exports[`renders ./components/layout/demo/top-side-2.md correctly 1`] = `
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
option1
</span>
</li>
<li
class="ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
option2
</span>
</li>
<li
class="ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
option3
</span>
</li>
<li
class="ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
option4
</span>
</li>
</ul>
</li>

5
components/menu/MenuItem.tsx
View File

@ -21,15 +21,16 @@ export default class MenuItem extends React.Component<MenuItemProps> {
renderItemChildren(inlineCollapsed: boolean) {
const { prefixCls, firstLevel } = this.context;
const { icon, children } = this.props;
const wrapNode = <span className={`${prefixCls}-title-content`}>{children}</span>;
// inline-collapsed.md demo 依赖 span 来隐藏文字,有 icon 属性，则内部包裹一个 span
// ref: https://github.com/ant-design/ant-design/pull/23456
if (!icon || (isValidElement(children) && children.type === 'span')) {
if (children && inlineCollapsed && firstLevel && typeof children === 'string') {
return <div className={`${prefixCls}-inline-collapsed-noicon`}>{children.charAt(0)}</div>;
}
return children;
}
return <span className={`${prefixCls}-title-content`}>{children}</span>;
return wrapNode;
}
renderItem = ({ siderCollapsed }: SiderContextProps) => {

5
components/menu/SubMenu.tsx
View File

@ -1,6 +1,5 @@
import * as React from 'react';
import { SubMenu as RcSubMenu } from 'rc-menu';
import { useFullPath } from 'rc-menu/lib/context/PathContext';
import { SubMenu as RcSubMenu, useFullPath } from 'rc-menu';
import classNames from 'classnames';
import omit from 'rc-util/lib/omit';
import MenuContext from './MenuContext';
@ -40,7 +39,7 @@ function SubMenu(props: SubMenuProps) {
inlineCollapsed && !parentPath.length && title && typeof title === 'string' ? (
<div className={`${prefixCls}-inline-collapsed-noicon`}>{title.charAt(0)}</div>
) : (
title
<span className={`${prefixCls}-title-content`}>{title}</span>
);
} else {
// inline-collapsed.md demo 依赖 span 来隐藏文字,有 icon 属性，则内部包裹一个 span

135
components/menu/__tests__/__snapshots__/demo.test.js.snap
View File

@ -115,6 +115,9 @@ exports[`renders ./components/menu/demo/horizontal.md correctly 1`] = `
role="menuitem"
style="opacity:1;order:3"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
<a
href="https://ant.design"
@ -123,12 +126,13 @@ exports[`renders ./components/menu/demo/horizontal.md correctly 1`] = `
>
Navigation Four - Link
</a>
</span>
</li>
<li
aria-hidden="true"
class="ant-menu-overflow-item ant-menu-overflow-item-rest ant-menu-submenu ant-menu-submenu-horizontal"
role="none"
style="opacity:0;height:0;overflow-y:hidden;order:9007199254740991;pointer-events:none"
style="opacity:0;height:0;overflow-y:hidden;order:9007199254740991;pointer-events:none;position:absolute"
>
<div
aria-expanded="false"
@ -136,9 +140,26 @@ exports[`renders ./components/menu/demo/horizontal.md correctly 1`] = `
class="ant-menu-submenu-title"
role="menuitem"
tabindex="-1"
title="..."
>
...
<span
aria-label="ellipsis"
class="anticon anticon-ellipsis"
role="img"
>
<svg
aria-hidden="true"
data-icon="ellipsis"
fill="currentColor"
focusable="false"
height="1em"
viewBox="64 64 896 896"
width="1em"
>
<path
d="M176 511a56 56 0 10112 0 56 56 0 10-112 0zm280 0a56 56 0 10112 0 56 56 0 10-112 0zm280 0a56 56 0 10112 0 56 56 0 10-112 0z"
/>
</svg>
</span>
<i
class="ant-menu-submenu-arrow"
/>
@ -216,16 +237,24 @@ exports[`renders ./components/menu/demo/inline.md correctly 1`] = `
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
Option 1
</span>
</li>
<li
class="ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
Option 2
</span>
</li>
</ul>
</li>
@ -246,16 +275,24 @@ exports[`renders ./components/menu/demo/inline.md correctly 1`] = `
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
Option 3
</span>
</li>
<li
class="ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
Option 4
</span>
</li>
</ul>
</li>
@ -523,32 +560,48 @@ exports[`renders ./components/menu/demo/inline-collapsed.md correctly 1`] = `
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
Option 5
</span>
</li>
<li
class="ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
Option 6
</span>
</li>
<li
class="ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
Option 7
</span>
</li>
<li
class="ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
Option 8
</span>
</li>
</ul>
</li>
@ -654,32 +707,48 @@ exports[`renders ./components/menu/demo/sider-current.md correctly 1`] = `
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
Option 1
</span>
</li>
<li
class="ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
Option 2
</span>
</li>
<li
class="ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
Option 3
</span>
</li>
<li
class="ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
Option 4
</span>
</li>
</ul>
</li>
@ -880,22 +949,30 @@ Array [
role="menuitem"
style="opacity:1;order:2"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
Option 11
</span>
</li>
<li
class="ant-menu-overflow-item ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="opacity:1;order:3"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
Option 12
</span>
</li>
<li
aria-hidden="true"
class="ant-menu-overflow-item ant-menu-overflow-item-rest ant-menu-submenu ant-menu-submenu-horizontal"
role="none"
style="opacity:0;height:0;overflow-y:hidden;order:9007199254740991;pointer-events:none"
style="opacity:0;height:0;overflow-y:hidden;order:9007199254740991;pointer-events:none;position:absolute"
>
<div
aria-expanded="false"
@ -903,9 +980,26 @@ Array [
class="ant-menu-submenu-title"
role="menuitem"
tabindex="-1"
title="..."
>
...
<span
aria-label="ellipsis"
class="anticon anticon-ellipsis"
role="img"
>
<svg
aria-hidden="true"
data-icon="ellipsis"
fill="currentColor"
focusable="false"
height="1em"
viewBox="64 64 896 896"
width="1em"
>
<path
d="M176 511a56 56 0 10112 0 56 56 0 10-112 0zm280 0a56 56 0 10112 0 56 56 0 10-112 0zm280 0a56 56 0 10112 0 56 56 0 10-112 0z"
/>
</svg>
</span>
<i
class="ant-menu-submenu-arrow"
/>
@ -1069,16 +1163,24 @@ Array [
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
Option 3
</span>
</li>
<li
class="ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
Option 4
</span>
</li>
<li
class="ant-menu-submenu ant-menu-submenu-inline"
@ -1091,9 +1193,12 @@ Array [
role="menuitem"
style="padding-left:48px"
tabindex="-1"
title="Submenu"
>
<span
class="ant-menu-title-content"
>
Submenu
</span>
<i
class="ant-menu-submenu-arrow"
/>
@ -1258,32 +1363,48 @@ Array [
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
Option 1
</span>
</li>
<li
class="ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
Option 2
</span>
</li>
<li
class="ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
Option 3
</span>
</li>
<li
class="ant-menu-item ant-menu-item-only-child"
role="menuitem"
style="padding-left:48px"
tabindex="-1"
>
<span
class="ant-menu-title-content"
>
Option 4
</span>
</li>
</ul>
</li>

11
components/menu/__tests__/__snapshots__/index.test.js.snap
View File

@ -63,9 +63,13 @@ exports[`Menu Menu.Item with icon children auto wrap span 1`] = `
/>
</svg>
</span>
<span
class="ant-menu-title-content"
>
<span>
Navigation One
</span>
</span>
</li>
<li
class="ant-menu-submenu ant-menu-submenu-vertical"
@ -164,7 +168,11 @@ exports[`Menu rtl render component should be rendered correctly in RTL direction
class="ant-menu-item"
role="menuitem"
tabindex="-1"
>
<span
class="ant-menu-title-content"
/>
</li>
<li
class="ant-menu-item-group"
>
@ -186,6 +194,9 @@ exports[`Menu rtl render component should be rendered correctly in RTL direction
role="menuitem"
tabindex="-1"
>
<span
class="ant-menu-title-content"
/>
<i
class="ant-menu-submenu-arrow"
/>

2
components/menu/index.tsx
View File

@ -2,6 +2,7 @@ import * as React from 'react';
import RcMenu, { Divider, ItemGroup, MenuProps as RcMenuProps } from 'rc-menu';
import classNames from 'classnames';
import omit from 'rc-util/lib/omit';
import { EllipsisOutlined } from '@ant-design/icons';
import SubMenu, { SubMenuProps } from './SubMenu';
import Item, { MenuItemProps } from './MenuItem';
import { ConfigConsumer, ConfigConsumerProps } from '../config-provider';
@ -89,6 +90,7 @@ class InternalMenu extends React.Component<InternalMenuProps> {
>
<RcMenu
getPopupContainer={getPopupContainer}
overflowedIndicator={<EllipsisOutlined />}
{...passedProps}
inlineCollapsed={inlineCollapsed}
className={menuClassName}

3
components/menu/style/dark.less
View File

@ -87,8 +87,7 @@
> span > a {
color: @menu-dark-highlight-color;
}
> .@{menu-prefix-cls}-submenu-title,
> .@{menu-prefix-cls}-submenu-title:hover {
> .@{menu-prefix-cls}-submenu-title {
> .@{menu-prefix-cls}-submenu-arrow {
opacity: 1;
&::after,

23
components/menu/style/index.less
View File

@ -211,8 +211,6 @@
+ span {
margin-left: @menu-icon-margin-right;
opacity: 1;
// transition: opacity @animation-duration-slow @ease-in-out,
// width @animation-duration-slow @ease-in-out, color @animation-duration-slow;
transition: opacity @animation-duration-slow @ease-in-out, margin @animation-duration-slow,
color @animation-duration-slow;
}
@ -365,22 +363,22 @@
&:not(.@{menu-prefix-cls}-dark) {
> .@{menu-prefix-cls}-item,
> .@{menu-prefix-cls}-submenu {
margin: @menu-item-padding;
margin-top: -1px;
margin-bottom: 0;
padding: @menu-item-padding;
padding-right: 0;
padding-left: 0;
&:hover,
&-active,
&-open,
&-selected {
color: @menu-highlight-color;
&::after {
border-bottom: 2px solid @menu-highlight-color;
}
}
}
}
> .@{menu-prefix-cls}-item,
> .@{menu-prefix-cls}-submenu {
@ -388,7 +386,16 @@
top: 1px;
display: inline-block;
vertical-align: bottom;
&::after {
position: absolute;
right: @menu-item-padding-horizontal;
bottom: 0;
left: @menu-item-padding-horizontal;
border-bottom: 2px solid transparent;
transition: border-color @animation-duration-slow @ease-in-out;
content: '';
}
}
> .@{menu-prefix-cls}-submenu > .@{menu-prefix-cls}-submenu-title {
@ -625,8 +632,12 @@
&-submenu-disabled {
color: @disabled-color !important;
background: none;
border-color: transparent !important;
cursor: not-allowed;
&::after {
border-color: transparent !important;
}
a {
color: @disabled-color !important;
pointer-events: none;

4
components/select/__tests__/__snapshots__/demo.test.js.snap
View File

@ -1583,7 +1583,7 @@ exports[`renders ./components/select/demo/responsive.md correctly 1`] = `
<div
aria-hidden="true"
class="ant-select-selection-overflow-item ant-select-selection-overflow-item-rest"
style="opacity:0;height:0;overflow-y:hidden;order:9007199254740991;pointer-events:none"
style="opacity:0;height:0;overflow-y:hidden;order:9007199254740991;pointer-events:none;position:absolute"
>
<span
class="ant-select-selection-item"
@ -1646,7 +1646,7 @@ exports[`renders ./components/select/demo/responsive.md correctly 1`] = `
<div
aria-hidden="true"
class="ant-select-selection-overflow-item ant-select-selection-overflow-item-rest"
style="opacity:0;height:0;overflow-y:hidden;order:9007199254740991;pointer-events:none"
style="opacity:0;height:0;overflow-y:hidden;order:9007199254740991;pointer-events:none;position:absolute"
>
<span
class="ant-select-selection-item"

3
components/style/themes/default.less
View File

@ -557,7 +557,8 @@
@menu-item-vertical-margin: 4px;
@menu-item-font-size: @font-size-base;
@menu-item-boundary-margin: 8px;
@menu-item-padding: 0 20px;
@menu-item-padding-horizontal: 20px;
@menu-item-padding: 0 @menu-item-padding-horizontal;
@menu-horizontal-line-height: 46px;
@menu-icon-margin-right: 10px;
@menu-icon-size: @menu-item-font-size;

26
components/table/__tests__/__snapshots__/Table.filter.test.js.snap
View File

@ -572,6 +572,9 @@ exports[`Table.filter should support getPopupContainer 1`] = `
data-menu-id="rc-menu-uuid-test-boy"
role="menuitem"
tabindex="-1"
>
<span
class="ant-dropdown-menu-title-content"
>
<label
class="ant-checkbox-wrapper"
@ -592,12 +595,16 @@ exports[`Table.filter should support getPopupContainer 1`] = `
<span>
Boy
</span>
</span>
</li>
<li
class="ant-dropdown-menu-item"
data-menu-id="rc-menu-uuid-test-girl"
role="menuitem"
tabindex="-1"
>
<span
class="ant-dropdown-menu-title-content"
>
<label
class="ant-checkbox-wrapper"
@ -618,6 +625,7 @@ exports[`Table.filter should support getPopupContainer 1`] = `
<span>
Girl
</span>
</span>
</li>
<li
class="ant-dropdown-menu-submenu ant-dropdown-menu-submenu-vertical"
@ -631,9 +639,12 @@ exports[`Table.filter should support getPopupContainer 1`] = `
data-menu-id="rc-menu-uuid-test-title"
role="menuitem"
tabindex="-1"
title="Title"
>
<span
class="ant-dropdown-menu-title-content"
>
Title
</span>
<i
class="ant-dropdown-menu-submenu-arrow"
/>
@ -805,6 +816,9 @@ exports[`Table.filter should support getPopupContainer from ConfigProvider 1`] =
data-menu-id="rc-menu-uuid-test-boy"
role="menuitem"
tabindex="-1"
>
<span
class="ant-dropdown-menu-title-content"
>
<label
class="ant-checkbox-wrapper"
@ -825,12 +839,16 @@ exports[`Table.filter should support getPopupContainer from ConfigProvider 1`] =
<span>
Boy
</span>
</span>
</li>
<li
class="ant-dropdown-menu-item"
data-menu-id="rc-menu-uuid-test-girl"
role="menuitem"
tabindex="-1"
>
<span
class="ant-dropdown-menu-title-content"
>
<label
class="ant-checkbox-wrapper"
@ -851,6 +869,7 @@ exports[`Table.filter should support getPopupContainer from ConfigProvider 1`] =
<span>
Girl
</span>
</span>
</li>
<li
class="ant-dropdown-menu-submenu ant-dropdown-menu-submenu-vertical"
@ -864,9 +883,12 @@ exports[`Table.filter should support getPopupContainer from ConfigProvider 1`] =
data-menu-id="rc-menu-uuid-test-title"
role="menuitem"
tabindex="-1"
title="Title"
>
<span
class="ant-dropdown-menu-title-content"
>
Title
</span>
<i
class="ant-dropdown-menu-submenu-arrow"
/>

24
components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap
View File

@ -1061,24 +1061,36 @@ exports[`Table.rowSelection should support getPopupContainer 1`] = `
data-menu-id="rc-menu-uuid-test-all"
role="menuitem"
tabindex="-1"
>
<span
class="ant-dropdown-menu-title-content"
>
Select all data
</span>
</li>
<li
class="ant-dropdown-menu-item ant-dropdown-menu-item-only-child"
data-menu-id="rc-menu-uuid-test-invert"
role="menuitem"
tabindex="-1"
>
<span
class="ant-dropdown-menu-title-content"
>
Invert current page
</span>
</li>
<li
class="ant-dropdown-menu-item ant-dropdown-menu-item-only-child"
data-menu-id="rc-menu-uuid-test-none"
role="menuitem"
tabindex="-1"
>
<span
class="ant-dropdown-menu-title-content"
>
Clear all data
</span>
</li>
</ul>
</div>
@ -1401,24 +1413,36 @@ exports[`Table.rowSelection should support getPopupContainer from ConfigProvider
data-menu-id="rc-menu-uuid-test-all"
role="menuitem"
tabindex="-1"
>
<span
class="ant-dropdown-menu-title-content"
>
Select all data
</span>
</li>
<li
class="ant-dropdown-menu-item ant-dropdown-menu-item-only-child"
data-menu-id="rc-menu-uuid-test-invert"
role="menuitem"
tabindex="-1"
>
<span
class="ant-dropdown-menu-title-content"
>
Invert current page
</span>
</li>
<li
class="ant-dropdown-menu-item ant-dropdown-menu-item-only-child"
data-menu-id="rc-menu-uuid-test-none"
role="menuitem"
tabindex="-1"
>
<span
class="ant-dropdown-menu-title-content"
>
Clear all data
</span>
</li>
</ul>
</div>

268
components/table/__tests__/__snapshots__/demo.test.js.snap
View File

@ -17091,23 +17091,19 @@ Array [
class="ant-spin-container"
>
<div
class="ant-table ant-table-bordered ant-table-fixed-column ant-table-scroll-horizontal ant-table-has-fix-left"
class="ant-table ant-table-bordered ant-table-fixed-header ant-table-fixed-column ant-table-scroll-horizontal ant-table-has-fix-left"
>
<div
class="ant-table-container"
>
<div
class="ant-table-content"
style="overflow-x:auto;overflow-y:hidden"
class="ant-table-header"
style="overflow:hidden"
>
<table
style="width:2000px;min-width:100%;table-layout:fixed"
style="table-layout:fixed;visibility:hidden"
>
<colgroup>
<col
style="width:100px;min-width:100px"
/>
</colgroup>
<colgroup />
<thead
class="ant-table-thead"
>
@ -17125,6 +17121,20 @@ Array [
</th>
</tr>
</thead>
</table>
</div>
<div
class="ant-table-body"
style="overflow-x:auto;overflow-y:scroll;max-height:500px"
>
<table
style="width:2000px;min-width:100%;table-layout:fixed"
>
<colgroup>
<col
style="width:100px;min-width:100px"
/>
</colgroup>
<tbody
class="ant-table-tbody"
>
@ -17160,7 +17170,7 @@ Array [
class="ant-table-cell ant-table-cell-fix-left ant-table-cell-fix-left-last"
style="position:sticky;left:0"
>
Bamboo
Light
</td>
<td
class="ant-table-cell"
@ -17176,7 +17186,7 @@ Array [
class="ant-table-cell ant-table-cell-fix-left ant-table-cell-fix-left-last"
style="position:sticky;left:0"
>
Light
Bamboo
</td>
<td
class="ant-table-cell"
@ -17192,7 +17202,7 @@ Array [
class="ant-table-cell ant-table-cell-fix-left ant-table-cell-fix-left-last"
style="position:sticky;left:0"
>
Bamboo
Little
</td>
<td
class="ant-table-cell"
@ -17235,6 +17245,22 @@ Array [
<tr
class="ant-table-row ant-table-row-level-0"
data-row-key="5"
>
<td
class="ant-table-cell ant-table-cell-fix-left ant-table-cell-fix-left-last"
style="position:sticky;left:0"
>
Little
</td>
<td
class="ant-table-cell"
>
Everything that has a beginning, has an end.
</td>
</tr>
<tr
class="ant-table-row ant-table-row-level-0"
data-row-key="6"
>
<td
class="ant-table-cell ant-table-cell-fix-left ant-table-cell-fix-left-last"
@ -17248,7 +17274,225 @@ Array [
Everything that has a beginning, has an end.
</td>
</tr>
<tr
class="ant-table-row ant-table-row-level-0"
data-row-key="7"
>
<td
class="ant-table-cell ant-table-cell-fix-left ant-table-cell-fix-left-last"
style="position:sticky;left:0"
>
Bamboo
</td>
<td
class="ant-table-cell"
>
Everything that has a beginning, has an end.
</td>
</tr>
<tr
class="ant-table-row ant-table-row-level-0"
data-row-key="8"
>
<td
class="ant-table-cell ant-table-cell-fix-left ant-table-cell-fix-left-last"
style="position:sticky;left:0"
>
Little
</td>
<td
class="ant-table-cell"
>
Everything that has a beginning, has an end.
</td>
</tr>
<tr
class="ant-table-row ant-table-row-level-0"
data-row-key="9"
>
<td
class="ant-table-cell ant-table-cell-fix-left ant-table-cell-fix-left-last"
style="position:sticky;left:0"
>
Light
</td>
<td
class="ant-table-cell"
>
Everything that has a beginning, has an end.
</td>
</tr>
<tr
class="ant-table-row ant-table-row-level-0"
data-row-key="10"
>
<td
class="ant-table-cell ant-table-cell-fix-left ant-table-cell-fix-left-last"
style="position:sticky;left:0"
>
Bamboo
</td>
<td
class="ant-table-cell"
>
Everything that has a beginning, has an end.
</td>
</tr>
<tr
class="ant-table-row ant-table-row-level-0"
data-row-key="11"
>
<td
class="ant-table-cell ant-table-cell-fix-left ant-table-cell-fix-left-last"
style="position:sticky;left:0"
>
Little
</td>
<td
class="ant-table-cell"
>
Everything that has a beginning, has an end.
</td>
</tr>
<tr
class="ant-table-row ant-table-row-level-0"
data-row-key="12"
>
<td
class="ant-table-cell ant-table-cell-fix-left ant-table-cell-fix-left-last"
style="position:sticky;left:0"
>
Light
</td>
<td
class="ant-table-cell"
>
Everything that has a beginning, has an end.
</td>
</tr>
<tr
class="ant-table-row ant-table-row-level-0"
data-row-key="13"
>
<td
class="ant-table-cell ant-table-cell-fix-left ant-table-cell-fix-left-last"
style="position:sticky;left:0"
>
Bamboo
</td>
<td
class="ant-table-cell"
>
Everything that has a beginning, has an end.
</td>
</tr>
<tr
class="ant-table-row ant-table-row-level-0"
data-row-key="14"
>
<td
class="ant-table-cell ant-table-cell-fix-left ant-table-cell-fix-left-last"
style="position:sticky;left:0"
>
Little
</td>
<td
class="ant-table-cell"
>
Everything that has a beginning, has an end.
</td>
</tr>
<tr
class="ant-table-row ant-table-row-level-0"
data-row-key="15"
>
<td
class="ant-table-cell ant-table-cell-fix-left ant-table-cell-fix-left-last"
style="position:sticky;left:0"
>
Light
</td>
<td
class="ant-table-cell"
>
Everything that has a beginning, has an end.
</td>
</tr>
<tr
class="ant-table-row ant-table-row-level-0"
data-row-key="16"
>
<td
class="ant-table-cell ant-table-cell-fix-left ant-table-cell-fix-left-last"
style="position:sticky;left:0"
>
Bamboo
</td>
<td
class="ant-table-cell"
>
Everything that has a beginning, has an end.
</td>
</tr>
<tr
class="ant-table-row ant-table-row-level-0"
data-row-key="17"
>
<td
class="ant-table-cell ant-table-cell-fix-left ant-table-cell-fix-left-last"
style="position:sticky;left:0"
>
Little
</td>
<td
class="ant-table-cell"
>
Everything that has a beginning, has an end.
</td>
</tr>
<tr
class="ant-table-row ant-table-row-level-0"
data-row-key="18"
>
<td
class="ant-table-cell ant-table-cell-fix-left ant-table-cell-fix-left-last"
style="position:sticky;left:0"
>
Light
</td>
<td
class="ant-table-cell"
>
Everything that has a beginning, has an end.
</td>
</tr>
<tr
class="ant-table-row ant-table-row-level-0"
data-row-key="19"
>
<td
class="ant-table-cell ant-table-cell-fix-left ant-table-cell-fix-left-last"
style="position:sticky;left:0"
>
Bamboo
</td>
<td
class="ant-table-cell"
>
Everything that has a beginning, has an end.
</td>
</tr>
</tbody>
</table>
</div>
<div
class="ant-table-summary"
style="overflow:hidden"
>
<table
style="table-layout:fixed;visibility:hidden"
>
<colgroup />
<tfoot
class="ant-table-summary"
>

12
components/table/demo/summary.md
View File

@ -7,11 +7,11 @@ title:
## zh-CN
通过 `summary` 设置总结栏。使用 `Table.Summary.Cell` 同步 Column 的固定状态。
通过 `summary` 设置总结栏。使用 `Table.Summary.Cell` 同步 Column 的固定状态。你可以通过配置 `Table.Summary` 的 `fixed` 属性使其固定(`4.16.0` 支持)。
## en-US
Set summary content by `summary` prop. Sync column fixed status with `Table.Summary.Cell`.
Set summary content by `summary` prop. Sync column fixed status with `Table.Summary.Cell`. You can fixed it by set `Table.Summary` `fixed` prop(since `4.16.0`).
```jsx
import { Table, Typography } from 'antd';
@ -74,10 +74,10 @@ const fixedColumns = [
];
const fixedData = [];
for (let i = 0; i < 6; i += 1) {
for (let i = 0; i < 20; i += 1) {
fixedData.push({
key: i,
name: i % 2 ? 'Light' : 'Bamboo',
name: ['Light', 'Bamboo', 'Little'][i % 3],
description: 'Everything that has a beginning, has an end.',
});
}
@ -126,13 +126,15 @@ ReactDOM.render(
columns={fixedColumns}
dataSource={fixedData}
pagination={false}
scroll={{ x: 2000 }}
scroll={{ x: 2000, y: 500 }}
bordered
summary={() => (
<Table.Summary fixed>
<Table.Summary.Row>
<Table.Summary.Cell index={0}>Summary</Table.Summary.Cell>
<Table.Summary.Cell index={1}>This is a summary content</Table.Summary.Cell>
</Table.Summary.Row>
</Table.Summary>
)}
/>
</>,

3
components/table/style/bordered.less
View File

@ -18,7 +18,8 @@
> .@{table-prefix-cls}-content,
> .@{table-prefix-cls}-header,
> .@{table-prefix-cls}-body {
> .@{table-prefix-cls}-body,
> .@{table-prefix-cls}-summary {
> table {
// ============================= Cell =============================
> thead > tr > th,

2
components/tag/index.zh-CN.md
View File

@ -24,7 +24,7 @@ cover: https://gw.alipayobjects.com/zos/alicdn/cH1BOLfxC/Tag.svg
| color | 标签色 | string | - | |
| icon | 设置图标 | ReactNode | - | |
| visible | 是否显示标签 | boolean | true | |
| onClose | 关闭时的回调（可通过 `e.preventdefault()` 来阻止默认行为） | (e) => void | - | |
| onClose | 关闭时的回调（可通过 `e.preventDefault()` 来阻止默认行为） | (e) => void | - | |
### Tag.CheckableTag

2
components/typography/Base.tsx
View File

@ -517,7 +517,7 @@ class Base extends React.Component<InternalBlockProps, BaseState> {
this.expandStr = expand;
return (
<ResizeObserver onResize={this.resizeOnNextFrame} disabled={!rows}>
<ResizeObserver onResize={this.resizeOnNextFrame} disabled={cssEllipsis}>
<Typography
className={classNames(
{

2
package.json
View File

@ -126,7 +126,7 @@
"rc-image": "~5.2.4",
"rc-input-number": "~7.1.0",
"rc-mentions": "~1.6.1",
"rc-menu": "~9.0.0",
"rc-menu": "~9.0.1",
"rc-motion": "^2.4.0",
"rc-notification": "~4.5.2",
"rc-pagination": "~3.1.6",

25
site/theme/template/Layout/Header/Navigation.less
View File

@ -13,16 +13,18 @@
& > .ant-menu-item,
& > .ant-menu-submenu {
min-width: 40px;
min-width: (40px + 12px * 2);
height: @header-height;
margin-right: 12px;
margin-left: 12px;
line-height: @header-height - @menu-item-border - 2px;
border-top: @menu-item-border solid transparent;
padding-right: 12px;
padding-left: 12px;
line-height: @header-height;
&:hover {
border-top: @menu-item-border solid @primary-color;
border-bottom: @menu-item-border solid transparent;
&::after {
top: 0;
right: 12px;
bottom: auto;
left: 12px;
border-width: @menu-item-border;
}
}
@ -30,14 +32,7 @@
margin: 0;
}
& > .ant-menu-submenu-open {
border-top: @menu-item-border solid @primary-color;
border-bottom: @menu-item-border solid transparent;
}
& > .ant-menu-item-selected {
border-top: @menu-item-border solid @primary-color;
border-bottom: @menu-item-border solid transparent;
a {
color: @primary-color;
}

1
site/theme/template/Layout/Header/Navigation.tsx
View File

@ -81,6 +81,7 @@ export default ({
mode={menuMode}
selectedKeys={[activeMenuItem]}
id="nav"
disabledOverflow
>
<Menu.Item key="docs/spec">
<Link to={utils.getLocalizedPathname('/docs/spec/introduce', isZhCN, location.query)}>