fix(layout): support controlHeightLG token

ant-design · May 4, 2023 · c2841b3 · c2841b3
1 parent 1d47c30
commit c2841b3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/layout/src/ProLayout.tsx b/packages/layout/src/ProLayout.tsx
@@ -702,6 +702,8 @@ const BaseProLayout: React.FC<ProLayoutProps> = (props) => {
                     colorItemBg: token?.layout?.sider?.colorMenuBackground || 'transparent',
                     colorSubItemBg: token?.layout?.sider?.colorMenuBackground || 'transparent',
                     radiusItem: 4,
+                    controlHeightLG: token?.layout?.sider?.menuHeight || token?.controlHeightLG,
+
                     colorItemBgSelected:
                       token?.layout?.sider?.colorBgMenuItemSelected || token?.colorBgTextHover,
                     colorItemBgActive:
@@ -761,8 +763,6 @@ const BaseProLayout: React.FC<ProLayoutProps> = (props) => {
                         token?.layout?.header?.colorTextMenuActive || 'rgba(0, 0, 0, 0.85)',
                       colorItemTextSelected:
                         token?.layout?.header?.colorTextMenuSelected || 'rgba(0, 0, 0, 1)',
-                      colorBgElevated:
-                        token?.layout?.header?.colorBgMenuItemCollapsedElevated || '#fff',
                     },
                   },
                 }}

diff --git a/packages/provider/src/typing/layoutToken.ts b/packages/provider/src/typing/layoutToken.ts
@@ -29,6 +29,7 @@ export type BaseLayoutDesignToken = {
     colorTextCollapsedButtonHover: string;
     colorTextCollapsedButton: string;
     colorMenuBackground: string;
+    menuHeight: number;
     colorBgMenuItemCollapsedElevated: string;
     colorMenuItemDivider: string;
     colorBgMenuItemHover: string;