refactor: menu theme style (#37640)

This commit is contained in:
MadCcc 2022-09-19 22:17:26 +08:00 committed by GitHub
parent bcfb3c9fc6
commit 415c22bc8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 285 additions and 287 deletions

View File

@ -137,7 +137,7 @@ exports[`renders ./components/breadcrumb/demo/overlay.md extend context correctl
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"

View File

@ -1834,7 +1834,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"

View File

@ -17710,7 +17710,7 @@ exports[`ConfigProvider components List prefixCls 1`] = `
exports[`ConfigProvider components Menu configProvider 1`] = `
HTMLCollection [
<ul
class="config-menu config-menu-root config-menu-inline"
class="config-menu config-menu-root config-menu-inline config-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -17783,7 +17783,7 @@ HTMLCollection [
exports[`ConfigProvider components Menu configProvider componentDisabled 1`] = `
HTMLCollection [
<ul
class="config-menu config-menu-root config-menu-inline"
class="config-menu config-menu-root config-menu-inline config-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -17856,7 +17856,7 @@ HTMLCollection [
exports[`ConfigProvider components Menu configProvider componentSize large 1`] = `
HTMLCollection [
<ul
class="config-menu config-menu-root config-menu-inline"
class="config-menu config-menu-root config-menu-inline config-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -17929,7 +17929,7 @@ HTMLCollection [
exports[`ConfigProvider components Menu configProvider componentSize middle 1`] = `
HTMLCollection [
<ul
class="config-menu config-menu-root config-menu-inline"
class="config-menu config-menu-root config-menu-inline config-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -18002,7 +18002,7 @@ HTMLCollection [
exports[`ConfigProvider components Menu configProvider virtual and dropdownMatchSelectWidth 1`] = `
HTMLCollection [
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -18075,7 +18075,7 @@ HTMLCollection [
exports[`ConfigProvider components Menu normal 1`] = `
HTMLCollection [
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -18148,7 +18148,7 @@ HTMLCollection [
exports[`ConfigProvider components Menu prefixCls 1`] = `
HTMLCollection [
<ul
class="prefix-Menu prefix-Menu-root prefix-Menu-inline"
class="prefix-Menu prefix-Menu-root prefix-Menu-inline prefix-Menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -26641,7 +26641,7 @@ exports[`ConfigProvider components Table configProvider 1`] = `
class="config-table-filter-dropdown"
>
<ul
class="config-dropdown-menu config-dropdown-menu-root config-dropdown-menu-vertical"
class="config-dropdown-menu config-dropdown-menu-root config-dropdown-menu-vertical config-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -26946,7 +26946,7 @@ exports[`ConfigProvider components Table configProvider componentDisabled 1`] =
class="config-table-filter-dropdown"
>
<ul
class="config-dropdown-menu config-dropdown-menu-root config-dropdown-menu-vertical"
class="config-dropdown-menu config-dropdown-menu-root config-dropdown-menu-vertical config-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -27253,7 +27253,7 @@ exports[`ConfigProvider components Table configProvider componentSize large 1`]
class="config-table-filter-dropdown"
>
<ul
class="config-dropdown-menu config-dropdown-menu-root config-dropdown-menu-vertical"
class="config-dropdown-menu config-dropdown-menu-root config-dropdown-menu-vertical config-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -27558,7 +27558,7 @@ exports[`ConfigProvider components Table configProvider componentSize middle 1`]
class="config-table-filter-dropdown"
>
<ul
class="config-dropdown-menu config-dropdown-menu-root config-dropdown-menu-vertical"
class="config-dropdown-menu config-dropdown-menu-root config-dropdown-menu-vertical config-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -27863,7 +27863,7 @@ exports[`ConfigProvider components Table configProvider virtual and dropdownMatc
class="ant-table-filter-dropdown"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -28168,7 +28168,7 @@ exports[`ConfigProvider components Table normal 1`] = `
class="ant-table-filter-dropdown"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -28473,7 +28473,7 @@ exports[`ConfigProvider components Table prefixCls 1`] = `
class="prefix-Table-filter-dropdown"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"

View File

@ -19,7 +19,7 @@ Array [
class="ant-dropdown-arrow"
/>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -235,7 +235,7 @@ Array [
class="ant-dropdown-arrow"
/>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -451,7 +451,7 @@ Array [
class="ant-dropdown-arrow"
/>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -668,7 +668,7 @@ Array [
class="ant-dropdown-arrow"
/>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -884,7 +884,7 @@ Array [
class="ant-dropdown-arrow"
/>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -1100,7 +1100,7 @@ Array [
class="ant-dropdown-arrow"
/>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -1321,7 +1321,7 @@ Array [
class="ant-dropdown-arrow"
/>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -1537,7 +1537,7 @@ Array [
class="ant-dropdown-arrow"
/>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -1753,7 +1753,7 @@ Array [
class="ant-dropdown-arrow"
/>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -1970,7 +1970,7 @@ Array [
class="ant-dropdown-arrow"
/>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -2186,7 +2186,7 @@ Array [
class="ant-dropdown-arrow"
/>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -2402,7 +2402,7 @@ Array [
class="ant-dropdown-arrow"
/>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -2649,7 +2649,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -2940,7 +2940,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -3174,7 +3174,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md extend context co
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -3459,7 +3459,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md extend context co
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -3746,7 +3746,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md extend context co
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -4059,7 +4059,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md extend context co
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -4347,7 +4347,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md extend context co
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -4631,7 +4631,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md extend context co
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -4919,7 +4919,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -5148,7 +5148,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -5420,7 +5420,7 @@ exports[`renders ./components/dropdown/demo/loading.md extend context correctly
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -5560,7 +5560,7 @@ exports[`renders ./components/dropdown/demo/loading.md extend context correctly
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -5676,7 +5676,7 @@ exports[`renders ./components/dropdown/demo/loading.md extend context correctly
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -5791,7 +5791,7 @@ exports[`renders ./components/dropdown/demo/loading.md extend context correctly
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -5910,7 +5910,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -6060,7 +6060,7 @@ Array [
</div>
<div>
<div
class="ant-dropdown-menu-submenu ant-dropdown-menu-submenu-popup ant-dropdown-menu"
class="ant-dropdown-menu-submenu ant-dropdown-menu-submenu-popup ant-dropdown-menu ant-dropdown-menu-light"
style="opacity: 0;"
>
<ul
@ -6299,7 +6299,7 @@ Array [
</div>
<div>
<div
class="ant-dropdown-menu-submenu ant-dropdown-menu-submenu-popup ant-dropdown-menu"
class="ant-dropdown-menu-submenu ant-dropdown-menu-submenu-popup ant-dropdown-menu ant-dropdown-menu-light"
style="opacity: 0;"
>
<ul
@ -6419,7 +6419,7 @@ Array [
</div>
<div>
<div
class="ant-dropdown-menu-submenu ant-dropdown-menu-submenu-popup ant-dropdown-menu"
class="ant-dropdown-menu-submenu ant-dropdown-menu-submenu-popup ant-dropdown-menu ant-dropdown-menu-light"
style="opacity: 0;"
>
<ul
@ -6566,7 +6566,7 @@ Array [
</div>
<div>
<div
class="ant-dropdown-menu-submenu ant-dropdown-menu-submenu-popup ant-dropdown-menu"
class="ant-dropdown-menu-submenu ant-dropdown-menu-submenu-popup ant-dropdown-menu ant-dropdown-menu-light"
style="opacity: 0;"
>
<ul
@ -7078,7 +7078,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -7292,7 +7292,7 @@ exports[`renders ./components/dropdown/demo/placement.md extend context correctl
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -7510,7 +7510,7 @@ exports[`renders ./components/dropdown/demo/placement.md extend context correctl
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -7728,7 +7728,7 @@ exports[`renders ./components/dropdown/demo/placement.md extend context correctl
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -7955,7 +7955,7 @@ exports[`renders ./components/dropdown/demo/placement.md extend context correctl
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -8173,7 +8173,7 @@ exports[`renders ./components/dropdown/demo/placement.md extend context correctl
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -8391,7 +8391,7 @@ exports[`renders ./components/dropdown/demo/placement.md extend context correctl
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -8609,7 +8609,7 @@ exports[`renders ./components/dropdown/demo/render-panel.md extend context corre
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -8934,7 +8934,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -9163,7 +9163,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -9294,7 +9294,7 @@ Array [
</div>
<div>
<div
class="ant-dropdown-menu-submenu ant-dropdown-menu-submenu-popup ant-dropdown-menu"
class="ant-dropdown-menu-submenu ant-dropdown-menu-submenu-popup ant-dropdown-menu ant-dropdown-menu-light"
style="opacity: 0;"
>
<ul
@ -9418,7 +9418,7 @@ Array [
</div>
<div>
<div
class="ant-dropdown-menu-submenu ant-dropdown-menu-submenu-popup ant-dropdown-menu"
class="ant-dropdown-menu-submenu ant-dropdown-menu-submenu-popup ant-dropdown-menu ant-dropdown-menu-light"
style="opacity: 0;"
>
<ul
@ -9686,7 +9686,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"

View File

@ -914,7 +914,7 @@ exports[`renders ./components/dropdown/demo/render-panel.md correctly 1`] = `
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"

View File

@ -523,7 +523,7 @@ exports[`renders ./components/empty/demo/config-provider.md extend context corre
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -813,7 +813,7 @@ exports[`renders ./components/empty/demo/config-provider.md extend context corre
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"

View File

@ -138,7 +138,7 @@ exports[`renders ./components/layout/demo/custom-trigger.md extend context corre
class="logo"
/>
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-dark"
data-menu-list="true"
role="menu"
tabindex="0"
@ -429,7 +429,7 @@ exports[`renders ./components/layout/demo/fixed.md extend context correctly 1`]
class="logo"
/>
<ul
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal"
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal ant-menu-dark"
data-menu-list="true"
role="menu"
tabindex="0"
@ -577,7 +577,7 @@ exports[`renders ./components/layout/demo/fixed.md extend context correctly 1`]
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu-dark"
style="opacity: 0;"
>
<ul
@ -739,7 +739,7 @@ exports[`renders ./components/layout/demo/fixed-sider.md extend context correctl
class="logo"
/>
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-dark"
data-menu-list="true"
role="menu"
tabindex="0"
@ -1606,7 +1606,7 @@ exports[`renders ./components/layout/demo/responsive.md extend context correctly
class="logo"
/>
<ul
class="ant-menu ant-menu-root ant-menu-vertical ant-menu-inline-collapsed"
class="ant-menu ant-menu-root ant-menu-vertical ant-menu-dark ant-menu-inline-collapsed"
data-menu-list="true"
role="menu"
tabindex="0"
@ -2006,7 +2006,7 @@ exports[`renders ./components/layout/demo/side.md extend context correctly 1`] =
class="logo"
/>
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-dark"
data-menu-list="true"
role="menu"
tabindex="0"
@ -2163,7 +2163,7 @@ exports[`renders ./components/layout/demo/side.md extend context correctly 1`] =
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-dark"
style="opacity: 0;"
>
<ul
@ -2324,7 +2324,7 @@ exports[`renders ./components/layout/demo/side.md extend context correctly 1`] =
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-dark"
style="opacity: 0;"
>
<ul
@ -2738,7 +2738,7 @@ exports[`renders ./components/layout/demo/top.md extend context correctly 1`] =
class="logo"
/>
<ul
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal"
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal ant-menu-dark"
data-menu-list="true"
role="menu"
tabindex="0"
@ -3294,7 +3294,7 @@ exports[`renders ./components/layout/demo/top.md extend context correctly 1`] =
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu-dark"
style="opacity: 0;"
>
<ul
@ -3715,7 +3715,7 @@ exports[`renders ./components/layout/demo/top-side.md extend context correctly 1
class="logo"
/>
<ul
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal"
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal ant-menu-dark"
data-menu-list="true"
role="menu"
tabindex="0"
@ -3863,7 +3863,7 @@ exports[`renders ./components/layout/demo/top-side.md extend context correctly 1
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu-dark"
style="opacity: 0;"
>
<ul
@ -4006,7 +4006,7 @@ exports[`renders ./components/layout/demo/top-side.md extend context correctly 1
class="ant-layout-sider-children"
>
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-light"
data-menu-list="true"
role="menu"
style="height: 100%;"
@ -4056,7 +4056,7 @@ exports[`renders ./components/layout/demo/top-side.md extend context correctly 1
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul
@ -4398,7 +4398,7 @@ exports[`renders ./components/layout/demo/top-side.md extend context correctly 1
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul
@ -4594,7 +4594,7 @@ exports[`renders ./components/layout/demo/top-side.md extend context correctly 1
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul
@ -5046,7 +5046,7 @@ exports[`renders ./components/layout/demo/top-side-2.md extend context correctly
class="logo"
/>
<ul
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal"
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal ant-menu-dark"
data-menu-list="true"
role="menu"
tabindex="0"
@ -5194,7 +5194,7 @@ exports[`renders ./components/layout/demo/top-side-2.md extend context correctly
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu-dark"
style="opacity: 0;"
>
<ul
@ -5289,7 +5289,7 @@ exports[`renders ./components/layout/demo/top-side-2.md extend context correctly
class="ant-layout-sider-children"
>
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-light"
data-menu-list="true"
role="menu"
style="height: 100%; border-right: 0;"
@ -5339,7 +5339,7 @@ exports[`renders ./components/layout/demo/top-side-2.md extend context correctly
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul
@ -5681,7 +5681,7 @@ exports[`renders ./components/layout/demo/top-side-2.md extend context correctly
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul
@ -5877,7 +5877,7 @@ exports[`renders ./components/layout/demo/top-side-2.md extend context correctly
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul

View File

@ -138,7 +138,7 @@ exports[`renders ./components/layout/demo/custom-trigger.md correctly 1`] = `
class="logo"
/>
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-dark"
data-menu-list="true"
role="menu"
tabindex="0"
@ -296,7 +296,7 @@ exports[`renders ./components/layout/demo/fixed.md correctly 1`] = `
class="logo"
/>
<ul
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal"
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal ant-menu-dark"
data-menu-list="true"
role="menu"
tabindex="0"
@ -461,7 +461,7 @@ exports[`renders ./components/layout/demo/fixed-sider.md correctly 1`] = `
class="logo"
/>
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-dark"
data-menu-list="true"
role="menu"
tabindex="0"
@ -975,7 +975,7 @@ exports[`renders ./components/layout/demo/responsive.md correctly 1`] = `
class="logo"
/>
<ul
class="ant-menu ant-menu-root ant-menu-vertical ant-menu-inline-collapsed"
class="ant-menu ant-menu-root ant-menu-vertical ant-menu-dark ant-menu-inline-collapsed"
data-menu-list="true"
role="menu"
tabindex="0"
@ -1182,7 +1182,7 @@ exports[`renders ./components/layout/demo/side.md correctly 1`] = `
class="logo"
/>
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-dark"
data-menu-list="true"
role="menu"
tabindex="0"
@ -1470,7 +1470,7 @@ exports[`renders ./components/layout/demo/top.md correctly 1`] = `
class="logo"
/>
<ul
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal"
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal ant-menu-dark"
data-menu-list="true"
role="menu"
tabindex="0"
@ -1774,7 +1774,7 @@ exports[`renders ./components/layout/demo/top-side.md correctly 1`] = `
class="logo"
/>
<ul
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal"
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal ant-menu-dark"
data-menu-list="true"
role="menu"
tabindex="0"
@ -1920,7 +1920,7 @@ exports[`renders ./components/layout/demo/top-side.md correctly 1`] = `
class="ant-layout-sider-children"
>
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-light"
data-menu-list="true"
role="menu"
style="height: 100%;"
@ -2148,7 +2148,7 @@ exports[`renders ./components/layout/demo/top-side-2.md correctly 1`] = `
class="logo"
/>
<ul
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal"
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal ant-menu-dark"
data-menu-list="true"
role="menu"
tabindex="0"
@ -2246,7 +2246,7 @@ exports[`renders ./components/layout/demo/top-side-2.md correctly 1`] = `
class="ant-layout-sider-children"
>
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-light"
data-menu-list="true"
role="menu"
style="height: 100%; border-right: 0;"

View File

@ -7,6 +7,7 @@ export interface MenuContextProps {
prefixCls: string;
inlineCollapsed: boolean;
direction?: DirectionType;
theme?: MenuTheme;
firstLevel: boolean;
/** @private Internal Usage. Safe to remove */
disableMenuItemTitleTooltip?: boolean;

View File

@ -24,14 +24,13 @@ export interface SubMenuProps {
popupOffset?: [number, number];
popupClassName?: string;
children?: React.ReactNode;
// FIXME: not implemented in v5 yet
theme?: MenuTheme;
}
function SubMenu(props: SubMenuProps) {
const { popupClassName, icon, title } = props;
const { popupClassName, icon, title, theme: customTheme } = props;
const context = React.useContext(MenuContext);
const { prefixCls, inlineCollapsed } = context;
const { prefixCls, inlineCollapsed, theme: contextTheme } = context;
const parentPath = useFullPath();
@ -74,7 +73,11 @@ function SubMenu(props: SubMenuProps) {
<RcSubMenu
{...omit(props, ['icon'])}
title={titleNode}
popupClassName={classNames(prefixCls, popupClassName)}
popupClassName={classNames(
prefixCls,
popupClassName,
`${prefixCls}-${customTheme || contextTheme}`,
)}
/>
</MenuContext.Provider>
);

View File

@ -3,7 +3,7 @@
exports[`renders ./components/menu/demo/deprecated.md extend context correctly 1`] = `
Array [
<ul
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal"
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal ant-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -144,7 +144,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu-light"
style="opacity: 0;"
>
<ul
@ -277,7 +277,7 @@ Array [
exports[`renders ./components/menu/demo/horizontal.md extend context correctly 1`] = `
Array [
<ul
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal"
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal ant-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -511,7 +511,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu-light"
style="opacity: 0;"
>
<ul
@ -688,7 +688,7 @@ Array [
exports[`renders ./components/menu/demo/inline.md extend context correctly 1`] = `
Array [
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-light"
data-menu-list="true"
role="menu"
style="width: 256px;"
@ -738,7 +738,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul
@ -1136,7 +1136,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul
@ -1239,7 +1239,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul
@ -1369,7 +1369,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul
@ -1824,7 +1824,7 @@ exports[`renders ./components/menu/demo/inline-collapsed.md extend context corre
</span>
</button>
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-dark"
data-menu-list="true"
role="menu"
tabindex="0"
@ -2035,7 +2035,7 @@ exports[`renders ./components/menu/demo/inline-collapsed.md extend context corre
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-dark"
style="opacity: 0;"
>
<ul
@ -2377,7 +2377,7 @@ exports[`renders ./components/menu/demo/inline-collapsed.md extend context corre
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-dark"
style="opacity: 0;"
>
<ul
@ -2480,7 +2480,7 @@ exports[`renders ./components/menu/demo/inline-collapsed.md extend context corre
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-dark"
style="opacity: 0;"
>
<ul
@ -2820,7 +2820,7 @@ exports[`renders ./components/menu/demo/inline-collapsed.md extend context corre
exports[`renders ./components/menu/demo/sider-current.md extend context correctly 1`] = `
Array [
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-light"
data-menu-list="true"
role="menu"
style="width: 256px;"
@ -2870,7 +2870,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul
@ -3212,7 +3212,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul
@ -3315,7 +3315,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul
@ -3445,7 +3445,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul
@ -3890,7 +3890,7 @@ Array [
<br />,
<br />,
<ul
class="ant-menu ant-menu-root ant-menu-vertical ant-menu-inline-collapsed"
class="ant-menu ant-menu-root ant-menu-vertical ant-menu-dark ant-menu-inline-collapsed"
data-menu-list="true"
role="menu"
tabindex="0"
@ -3939,7 +3939,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-dark"
style="opacity: 0;"
>
<ul
@ -4047,7 +4047,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-dark"
style="opacity: 0;"
>
<ul
@ -4106,7 +4106,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-dark"
style="opacity: 0;"
>
<ul
@ -4202,7 +4202,7 @@ Array [
<br />,
<br />,
<ul
class="ant-menu ant-menu-root ant-menu-vertical"
class="ant-menu ant-menu-root ant-menu-vertical ant-menu-dark"
data-menu-list="true"
role="menu"
style="width: 256px;"
@ -4252,7 +4252,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul
@ -4588,7 +4588,7 @@ Array [
<br />,
<br />,
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-light"
data-menu-list="true"
role="menu"
style="width: 256px;"
@ -4746,7 +4746,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul
@ -4849,7 +4849,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul
@ -5034,7 +5034,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul
@ -5162,7 +5162,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul
@ -5645,7 +5645,7 @@ Array [
<br />,
<br />,
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-dark"
data-menu-list="true"
role="menu"
style="width: 256px;"
@ -5695,7 +5695,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-dark"
style="opacity: 0;"
>
<ul
@ -6037,7 +6037,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-dark"
style="opacity: 0;"
>
<ul
@ -6140,7 +6140,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-dark"
style="opacity: 0;"
>
<ul
@ -6270,7 +6270,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-dark"
style="opacity: 0;"
>
<ul
@ -6698,7 +6698,7 @@ Array [
exports[`renders ./components/menu/demo/vertical.md extend context correctly 1`] = `
Array [
<ul
class="ant-menu ant-menu-root ant-menu-vertical"
class="ant-menu ant-menu-root ant-menu-vertical ant-menu-light"
data-menu-list="true"
role="menu"
style="width: 256px;"
@ -6747,7 +6747,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul
@ -6966,7 +6966,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul
@ -7066,7 +7066,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul
@ -7193,7 +7193,7 @@ Array [
</div>
<div>
<div
class="ant-menu-submenu ant-menu-submenu-popup ant-menu"
class="ant-menu-submenu ant-menu-submenu-popup ant-menu ant-menu-light"
style="opacity: 0;"
>
<ul

View File

@ -3,7 +3,7 @@
exports[`renders ./components/menu/demo/deprecated.md correctly 1`] = `
Array [
<ul
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal"
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal ant-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -132,7 +132,7 @@ Array [
exports[`renders ./components/menu/demo/horizontal.md correctly 1`] = `
Array [
<ul
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal"
class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal ant-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -310,7 +310,7 @@ Array [
exports[`renders ./components/menu/demo/inline.md correctly 1`] = `
Array [
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-light"
data-menu-list="true"
role="menu"
style="width: 256px;"
@ -569,7 +569,7 @@ exports[`renders ./components/menu/demo/inline-collapsed.md correctly 1`] = `
</span>
</button>
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-dark"
data-menu-list="true"
role="menu"
tabindex="0"
@ -825,7 +825,7 @@ exports[`renders ./components/menu/demo/inline-collapsed.md correctly 1`] = `
exports[`renders ./components/menu/demo/sider-current.md correctly 1`] = `
Array [
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-light"
data-menu-list="true"
role="menu"
style="width: 256px;"
@ -1046,7 +1046,7 @@ Array [
<br />,
<br />,
<ul
class="ant-menu ant-menu-root ant-menu-vertical ant-menu-inline-collapsed"
class="ant-menu ant-menu-root ant-menu-vertical ant-menu-dark ant-menu-inline-collapsed"
data-menu-list="true"
role="menu"
tabindex="0"
@ -1191,7 +1191,7 @@ Array [
<br />,
<br />,
<ul
class="ant-menu ant-menu-root ant-menu-vertical"
class="ant-menu ant-menu-root ant-menu-vertical ant-menu-dark"
data-menu-list="true"
role="menu"
style="width: 256px;"
@ -1307,7 +1307,7 @@ Array [
<br />,
<br />,
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-light"
data-menu-list="true"
role="menu"
style="width: 256px;"
@ -1585,7 +1585,7 @@ Array [
<br />,
<br />,
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-dark"
data-menu-list="true"
role="menu"
style="width: 256px;"
@ -1789,7 +1789,7 @@ Array [
exports[`renders ./components/menu/demo/vertical.md correctly 1`] = `
Array [
<ul
class="ant-menu ant-menu-root ant-menu-vertical"
class="ant-menu ant-menu-root ant-menu-vertical ant-menu-light"
data-menu-list="true"
role="menu"
style="width: 256px;"

View File

@ -3,7 +3,7 @@
exports[`Menu Menu.Item with icon children auto wrap span 1`] = `
<DocumentFragment>
<ul
class="ant-menu ant-menu-root ant-menu-vertical"
class="ant-menu ant-menu-root ant-menu-vertical ant-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -165,7 +165,7 @@ exports[`Menu Menu.Item with icon children auto wrap span 1`] = `
exports[`Menu all types must be available in the "items" syntax 1`] = `
<DocumentFragment>
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -326,8 +326,9 @@ exports[`Menu all types must be available in the "items" syntax 1`] = `
exports[`Menu rtl render component should be rendered correctly in RTL direction 1`] = `
HTMLCollection [
<ul
class="ant-menu ant-menu-root ant-menu-vertical"
class="ant-menu ant-menu-root ant-menu-vertical ant-menu-light ant-menu-rtl"
data-menu-list="true"
dir="rtl"
role="menu"
tabindex="0"
>
@ -383,7 +384,7 @@ HTMLCollection [
exports[`Menu should controlled collapse work 1`] = `
<DocumentFragment>
<ul
class="ant-menu ant-menu-root ant-menu-inline"
class="ant-menu ant-menu-root ant-menu-inline ant-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -431,7 +432,7 @@ exports[`Menu should controlled collapse work 1`] = `
exports[`Menu should controlled collapse work 2`] = `
<DocumentFragment>
<ul
class="ant-menu ant-menu-root ant-menu-vertical ant-menu-inline-collapsed"
class="ant-menu ant-menu-root ant-menu-vertical ant-menu-light ant-menu-inline-collapsed"
data-menu-list="true"
role="menu"
tabindex="0"

View File

@ -346,30 +346,29 @@ describe('Menu', () => {
);
});
// TODO: should cover this
// describe('allows the overriding of theme at the popup submenu level', () => {
// const menuModesWithPopupSubMenu: MenuMode[] = ['horizontal', 'vertical'];
// menuModesWithPopupSubMenu.forEach(menuMode => {
// it(`when menu is mode ${menuMode}`, () => {
// const { container } = render(
// <Menu mode={menuMode} openKeys={['1']} theme="dark">
// <SubMenu key="1" title="submenu1" theme="light">
// <Menu.Item key="submenu1">Option 1</Menu.Item>
// <Menu.Item key="submenu2">Option 2</Menu.Item>
// </SubMenu>
// <Menu.Item key="2">menu2</Menu.Item>
// </Menu>,
// );
//
// act(() => {
// jest.runAllTimers();
// });
//
// expect(container.querySelector('ul.ant-menu-root')).toHaveClass('ant-menu-dark');
// expect(container.querySelector('div.ant-menu-submenu-popup')).toHaveClass('ant-menu-light');
// });
// });
// });
describe('allows the overriding of theme at the popup submenu level', () => {
const menuModesWithPopupSubMenu: MenuProps['mode'][] = ['horizontal', 'vertical'];
menuModesWithPopupSubMenu.forEach(menuMode => {
it(`when menu is mode ${menuMode}`, () => {
const { container } = render(
<Menu mode={menuMode} openKeys={['1']} theme="dark">
<SubMenu key="1" title="submenu1" theme="light">
<Menu.Item key="submenu1">Option 1</Menu.Item>
<Menu.Item key="submenu2">Option 2</Menu.Item>
</SubMenu>
<Menu.Item key="2">menu2</Menu.Item>
</Menu>,
);
act(() => {
jest.runAllTimers();
});
expect(container.querySelector('ul.ant-menu-root')).toHaveClass('ant-menu-dark');
expect(container.querySelector('div.ant-menu-submenu-popup')).toHaveClass('ant-menu-light');
});
});
});
// https://github.com/ant-design/ant-design/pulls/4677
// https://github.com/ant-design/ant-design/issues/4692

View File

@ -1,26 +1,19 @@
import { ItemGroup } from 'rc-menu';
import type { MenuRef as RcMenuRef } from 'rc-menu';
import { ItemGroup } from 'rc-menu';
import * as React from 'react';
import { forwardRef, useImperativeHandle, useMemo, useRef } from 'react';
import { TinyColor } from '@ctrl/tinycolor';
import { forwardRef, useImperativeHandle, useRef } from 'react';
import type { MenuProps } from './menu';
import InternalMenu from './menu';
import type { SiderContextProps } from '../layout/Sider';
import { SiderContext } from '../layout/Sider';
import { MenuTheme } from './MenuContext';
import MenuDivider from './MenuDivider';
import Item, { MenuItemProps } from './MenuItem';
import SubMenu, { SubMenuProps } from './SubMenu';
import { ConfigProvider } from '..';
import type { ComponentToken } from './style';
import { useToken } from '../theme';
export { MenuItemGroupProps } from 'rc-menu';
export { MenuDividerProps } from './MenuDivider';
export { MenuTheme, SubMenuProps, MenuItemProps, MenuProps };
export type MenuMode = 'vertical' | 'vertical-left' | 'vertical-right' | 'horizontal' | 'inline';
export type MenuRef = {
menu: RcMenuRef | null;
focus: (options?: FocusOptions) => void;
@ -34,9 +27,9 @@ interface CompoundedComponent
ItemGroup: typeof ItemGroup;
}
const ThemedMenu = forwardRef<MenuRef, MenuProps>(({ theme = 'light', ...rest }, ref) => {
const Menu = forwardRef<MenuRef, MenuProps>((props, ref) => {
const menuRef = useRef<RcMenuRef>(null);
const [, token] = useToken();
const context = React.useContext(SiderContext);
useImperativeHandle(ref, () => ({
focus: options => {
@ -45,48 +38,8 @@ const ThemedMenu = forwardRef<MenuRef, MenuProps>(({ theme = 'light', ...rest },
menu: menuRef.current,
}));
const { colorTextLightSolid, colorTextDescription, colorPrimary, colorError, colorErrorHover } =
token;
const darkThemeToken = useMemo<Partial<ComponentToken>>(() => {
if (theme === 'dark') {
return {
colorItemText: new TinyColor(colorTextLightSolid).setAlpha(0.65).toRgbString(),
colorItemTextHover: colorTextLightSolid,
colorGroupTitle: colorTextDescription,
colorItemTextSelected: colorTextLightSolid,
colorItemBg: '#001529',
colorSubItemBg: '#000c17',
colorItemBgActive: 'transparent',
colorItemBgSelected: colorPrimary,
colorActiveBarWidth: 0,
colorActiveBarHeight: 0,
colorActiveBarBorderSize: 0,
// Disabled
colorItemTextDisabled: new TinyColor(colorTextLightSolid).setAlpha(0.25).toRgbString(),
// Danger
colorDangerItemText: colorError,
colorDangerItemTextHover: colorErrorHover,
colorDangerItemTextSelected: colorTextLightSolid,
colorDangerItemBgActive: colorError,
colorDangerItemBgSelected: colorError,
};
}
return {};
}, [theme]);
return (
<ConfigProvider theme={{ components: { Menu: darkThemeToken } }}>
<SiderContext.Consumer>
{(context: SiderContextProps) => <InternalMenu ref={menuRef} {...rest} {...context} />}
</SiderContext.Consumer>
</ConfigProvider>
);
});
const Menu: CompoundedComponent = ThemedMenu as CompoundedComponent;
return <InternalMenu ref={menuRef} {...props} {...context} />;
}) as CompoundedComponent;
Menu.Divider = MenuDivider;
Menu.Item = Item;

View File

@ -32,7 +32,7 @@ export interface MenuProps extends Omit<RcMenuProps, 'items'> {
items?: ItemType[];
}
type InternalMenuProps = Omit<MenuProps, 'theme'> &
type InternalMenuProps = MenuProps &
SiderContextProps & {
collapsedWidth?: string | number;
};
@ -47,6 +47,8 @@ const InternalMenu = forwardRef<RcMenuRef, InternalMenuProps>((props, ref) => {
const {
prefixCls: customizePrefixCls,
className,
theme = 'light',
expandIcon,
_internalDisableMenuItemTitleTooltip,
inlineCollapsed,
@ -116,6 +118,7 @@ const InternalMenu = forwardRef<RcMenuRef, InternalMenuProps>((props, ref) => {
const prefixCls = getPrefixCls('menu', customizePrefixCls || overrideObj.prefixCls);
const [wrapSSR, hashId] = useStyle(prefixCls, !override);
const menuClassName = classNames(`${prefixCls}-${theme}`, className);
// ====================== Expand Icon ========================
let mergedExpandIcon: MenuProps[`expandIcon`];
@ -134,9 +137,10 @@ const InternalMenu = forwardRef<RcMenuRef, InternalMenuProps>((props, ref) => {
inlineCollapsed: mergedInlineCollapsed || false,
direction,
firstLevel: true,
theme,
disableMenuItemTitleTooltip: _internalDisableMenuItemTitleTooltip,
}),
[prefixCls, mergedInlineCollapsed, direction, _internalDisableMenuItemTitleTooltip],
[prefixCls, mergedInlineCollapsed, direction, _internalDisableMenuItemTitleTooltip, theme],
);
// ========================= Render ==========================
@ -146,11 +150,13 @@ const InternalMenu = forwardRef<RcMenuRef, InternalMenuProps>((props, ref) => {
<RcMenu
getPopupContainer={getPopupContainer}
overflowedIndicator={<EllipsisOutlined />}
overflowedIndicatorPopupClassName={`${prefixCls}-${theme}`}
mode={mergedMode}
selectable={mergedSelectable}
onClick={onItemClick}
{...passedProps}
inlineCollapsed={mergedInlineCollapsed}
className={menuClassName}
prefixCls={prefixCls}
direction={direction}
defaultMotions={defaultMotions}

View File

@ -1,3 +1,4 @@
import { TinyColor } from '@ctrl/tinycolor';
import { genCollapseMotion, initSlideMotion, initZoomMotion } from '../../style/motion';
import type { FullToken, GenerateStyle, UseComponentStyleResult } from '../../theme';
import { genComponentStyleHook, mergeToken } from '../../theme';
@ -31,6 +32,8 @@ export interface ComponentToken {
colorDangerItemText: string;
colorDangerItemTextHover: string;
colorDangerItemTextSelected: string;
colorDangerItemBgActive: string;
colorDangerItemBgSelected: string;
// Item Bg
colorItemBg: string;
@ -41,10 +44,6 @@ export interface ComponentToken {
colorItemBgSelected: string;
colorItemBgSelectedHorizontal: string;
// > Danger
colorDangerItemBgActive: string;
colorDangerItemBgSelected: string;
// Ink Bar
colorActiveBarWidth: number;
colorActiveBarHeight: number;
@ -392,12 +391,15 @@ const getBaseStyle: GenerateStyle<MenuToken> = token => {
export default (prefixCls: string, injectStyle: boolean): UseComponentStyleResult => {
const useOriginHook = genComponentStyleHook(
'Menu',
token => {
(token, { overrideComponentToken }) => {
// Dropdown will handle menu style self. We do not need to handle this.
if (injectStyle === false) {
return [];
}
const { colorPrimary, colorError, colorErrorHover, colorTextLightSolid, colorTextSecondary } =
token;
const { controlHeightLG, fontSize } = token;
const menuArrowSize = (fontSize / 7) * 5;
@ -413,6 +415,36 @@ export default (prefixCls: string, injectStyle: boolean): UseComponentStyleResul
menuPanelMaskInset: -7, // Still a hardcode here since it's offset by rc-align
});
const menuDarkToken = mergeToken<MenuToken>(
menuToken,
{
colorItemText: new TinyColor(colorTextLightSolid).setAlpha(0.65).toRgbString(),
colorItemTextHover: colorTextLightSolid,
colorGroupTitle: colorTextSecondary,
colorItemTextSelected: colorTextLightSolid,
colorItemBg: '#001529',
colorSubItemBg: '#000c17',
colorItemBgActive: 'transparent',
colorItemBgSelected: colorPrimary,
colorActiveBarWidth: 0,
colorActiveBarHeight: 0,
colorActiveBarBorderSize: 0,
// Disabled
colorItemTextDisabled: new TinyColor(colorTextLightSolid).setAlpha(0.25).toRgbString(),
// Danger
colorDangerItemText: colorError,
colorDangerItemTextHover: colorErrorHover,
colorDangerItemTextSelected: colorTextLightSolid,
colorDangerItemBgActive: colorError,
colorDangerItemBgSelected: colorError,
},
{
...overrideComponentToken,
},
);
return [
// Basic
getBaseStyle(menuToken),
@ -424,7 +456,8 @@ export default (prefixCls: string, injectStyle: boolean): UseComponentStyleResul
getVerticalStyle(menuToken), // Hard code for some light style
// Theme
getThemeStyle(menuToken),
getThemeStyle(menuToken, 'light'),
getThemeStyle(menuDarkToken, 'dark'),
// RTL
getRTLStyle(menuToken),

View File

@ -6,7 +6,7 @@ const accessibilityFocus = (token: MenuToken) => ({
...genFocusOutline(token),
});
const getThemeStyle = (token: MenuToken): CSSInterpolation => {
const getThemeStyle = (token: MenuToken, themeSuffix: string): CSSInterpolation => {
const {
componentCls,
colorItemText,
@ -41,7 +41,7 @@ const getThemeStyle = (token: MenuToken): CSSInterpolation => {
} = token;
return {
[componentCls]: {
[`${componentCls}-${themeSuffix}`]: {
color: colorItemText,
background: colorItemBg,

View File

@ -557,7 +557,7 @@ exports[`Table.filter renders menu correctly 1`] = `
class="ant-table-filter-dropdown"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -699,7 +699,7 @@ exports[`Table.filter renders radio filter correctly 1`] = `
class="ant-table-filter-dropdown"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"

View File

@ -979,7 +979,7 @@ exports[`Table.rowSelection render with default selection correctly 1`] = `
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -1116,7 +1116,7 @@ exports[`Table.rowSelection should support getPopupContainer 1`] = `
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -1472,7 +1472,7 @@ exports[`Table.rowSelection should support getPopupContainer from ConfigProvider
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"

View File

@ -188,7 +188,7 @@ exports[`renders ./components/table/demo/ajax.md extend context correctly 1`] =
class="ant-table-filter-dropdown"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-without-submenu"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light ant-dropdown-menu-without-submenu"
data-menu-list="true"
role="menu"
tabindex="0"
@ -3433,7 +3433,7 @@ Array [
class="ant-table-filter-dropdown"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-without-submenu"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light ant-dropdown-menu-without-submenu"
data-menu-list="true"
role="menu"
tabindex="0"
@ -7757,7 +7757,7 @@ exports[`renders ./components/table/demo/filter-in-tree.md extend context correc
</span>
</div>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-without-submenu"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light ant-dropdown-menu-without-submenu"
data-menu-list="true"
role="menu"
tabindex="0"
@ -8583,7 +8583,7 @@ exports[`renders ./components/table/demo/filter-search.md extend context correct
</span>
</div>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-without-submenu"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light ant-dropdown-menu-without-submenu"
data-menu-list="true"
role="menu"
tabindex="0"
@ -12069,7 +12069,7 @@ exports[`renders ./components/table/demo/grouping-columns.md extend context corr
class="ant-table-filter-dropdown"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-without-submenu"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light ant-dropdown-menu-without-submenu"
data-menu-list="true"
role="menu"
tabindex="0"
@ -13485,7 +13485,7 @@ exports[`renders ./components/table/demo/head.md extend context correctly 1`] =
class="ant-table-filter-dropdown"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -13638,7 +13638,7 @@ exports[`renders ./components/table/demo/head.md extend context correctly 1`] =
</div>
<div>
<div
class="ant-dropdown-menu-submenu ant-dropdown-menu-submenu-popup ant-dropdown-menu ant-table-filter-dropdown-submenu"
class="ant-dropdown-menu-submenu ant-dropdown-menu-submenu-popup ant-dropdown-menu ant-table-filter-dropdown-submenu ant-dropdown-menu-light"
style="opacity: 0;"
>
<ul
@ -14004,7 +14004,7 @@ exports[`renders ./components/table/demo/head.md extend context correctly 1`] =
class="ant-table-filter-dropdown"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-without-submenu"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light ant-dropdown-menu-without-submenu"
data-menu-list="true"
role="menu"
tabindex="0"
@ -16567,7 +16567,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -16787,7 +16787,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -17007,7 +17007,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -17617,7 +17617,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -17837,7 +17837,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -18057,7 +18057,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -18667,7 +18667,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -18887,7 +18887,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -19107,7 +19107,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -20586,7 +20586,7 @@ Array [
class="ant-table-filter-dropdown"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-without-submenu"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light ant-dropdown-menu-without-submenu"
data-menu-list="true"
role="menu"
tabindex="0"
@ -20981,7 +20981,7 @@ Array [
class="ant-table-filter-dropdown"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-without-submenu"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light ant-dropdown-menu-without-submenu"
data-menu-list="true"
role="menu"
tabindex="0"
@ -22940,7 +22940,7 @@ exports[`renders ./components/table/demo/row-selection-custom.md extend context
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"

View File

@ -14,11 +14,12 @@ export type OverrideComponent = keyof OverrideTokenWithoutDerivative;
export type GlobalTokenWithComponent<ComponentName extends OverrideComponent> = GlobalToken &
ComponentTokenMap[ComponentName];
export interface StyleInfo {
export interface StyleInfo<ComponentName extends OverrideComponent> {
hashId: string;
prefixCls: string;
rootPrefixCls: string;
iconPrefixCls: string;
overrideComponentToken: ComponentTokenMap[ComponentName];
}
export type TokenWithCommonCls<T> = T & {
@ -37,7 +38,7 @@ export type FullToken<ComponentName extends OverrideComponent> = TokenWithCommon
export default function genComponentStyleHook<ComponentName extends OverrideComponent>(
component: ComponentName,
styleFn: (token: FullToken<ComponentName>, info: StyleInfo) => CSSInterpolation,
styleFn: (token: FullToken<ComponentName>, info: StyleInfo<ComponentName>) => CSSInterpolation,
getDefaultToken?:
| OverrideTokenWithoutDerivative[ComponentName]
| ((token: GlobalToken) => OverrideTokenWithoutDerivative[ComponentName]),
@ -98,6 +99,7 @@ export default function genComponentStyleHook<ComponentName extends OverrideComp
prefixCls,
rootPrefixCls,
iconPrefixCls,
overrideComponentToken: token[component],
});
flush(component, mergedComponentToken);
return styleInterpolation;

View File

@ -52,7 +52,7 @@ exports[`renders ./components/transfer/demo/advanced.md extend context correctly
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -643,7 +643,7 @@ exports[`renders ./components/transfer/demo/advanced.md extend context correctly
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -1180,7 +1180,7 @@ exports[`renders ./components/transfer/demo/basic.md extend context correctly 1`
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -1713,7 +1713,7 @@ exports[`renders ./components/transfer/demo/basic.md extend context correctly 1`
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -2148,7 +2148,7 @@ exports[`renders ./components/transfer/demo/custom-item.md extend context correc
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -2714,7 +2714,7 @@ exports[`renders ./components/transfer/demo/custom-item.md extend context correc
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -3232,7 +3232,7 @@ exports[`renders ./components/transfer/demo/custom-select-all-labels.md extend c
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -3658,7 +3658,7 @@ exports[`renders ./components/transfer/demo/custom-select-all-labels.md extend c
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -3918,7 +3918,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -4546,7 +4546,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -5162,7 +5162,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -5739,7 +5739,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -6121,7 +6121,7 @@ exports[`renders ./components/transfer/demo/search.md extend context correctly 1
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -6692,7 +6692,7 @@ exports[`renders ./components/transfer/demo/search.md extend context correctly 1
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -7223,7 +7223,7 @@ exports[`renders ./components/transfer/demo/status.md extend context correctly 1
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -7513,7 +7513,7 @@ exports[`renders ./components/transfer/demo/status.md extend context correctly 1
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -7757,7 +7757,7 @@ exports[`renders ./components/transfer/demo/status.md extend context correctly 1
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -8113,7 +8113,7 @@ exports[`renders ./components/transfer/demo/status.md extend context correctly 1
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -8425,7 +8425,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"
@ -9286,7 +9286,7 @@ Array [
style="opacity: 0;"
>
<ul
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical"
class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
data-menu-list="true"
role="menu"
tabindex="0"