Merge pull request #447 from oceanbase/dengfuping-ui

fix(ui): FooterToolbar children large size should work correctly
oceanbase · Jan 29, 2024 · 4c6d2c3 · 4c6d2c3
2 parents ea63501 + d06dfc9
commit 4c6d2c3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 24 deletions.
diff --git a/packages/ui/src/FooterToolbar/__tests__/__snapshots__/index.test.tsx.snap b/packages/ui/src/FooterToolbar/__tests__/__snapshots__/index.test.tsx.snap
@@ -14,15 +14,15 @@ exports[`FooterToolbar portalDom is true 1`] = `
       class="ant-pro-footer-bar-right"
     >
       <button
-        class="ant-btn ant-btn-default ant-btn-lg"
+        class="ant-btn ant-btn-default"
         type="button"
       >
         <span>
           Cancel
         </span>
       </button>
       <button
-        class="ant-btn ant-btn-primary ant-btn-lg"
+        class="ant-btn ant-btn-primary"
         type="button"
       >
         <span>
@@ -48,15 +48,15 @@ exports[`FooterToolbar render 1`] = `
       class="ant-pro-footer-bar-right"
     >
       <button
-        class="ant-btn ant-btn-default ant-btn-lg"
+        class="ant-btn ant-btn-default"
         type="button"
       >
         <span>
           Cancel
         </span>
       </button>
       <button
-        class="ant-btn ant-btn-primary ant-btn-lg"
+        class="ant-btn ant-btn-primary"
         type="button"
       >
         <span>

diff --git a/packages/ui/src/FooterToolbar/index.tsx b/packages/ui/src/FooterToolbar/index.tsx
@@ -10,30 +10,14 @@ const FooterToolbar: React.FC<FooterToolbarProps> = ({
   // render footer under parent instead of body by default
   portalDom = false,
   prefixCls: customizePrefixCls,
-  children,
   ...restProps
 }) => {
   const { getPrefixCls } = useContext(ConfigProvider.ConfigContext);
   const prefixCls = getPrefixCls('pro-footer-bar', customizePrefixCls);
   const { wrapSSR } = useStyle(prefixCls);
 
-  const { token } = theme.useToken();
-
   return wrapSSR(
-    <AntFooterToolbar portalDom={portalDom} prefixCls={customizePrefixCls} {...restProps}>
-      <ConfigProvider
-        // large size component
-        componentSize="large"
-        // middle font size
-        theme={{
-          token: {
-            fontSizeLG: token.fontSize,
-          },
-        }}
-      >
-        {children}
-      </ConfigProvider>
-    </AntFooterToolbar>
+    <AntFooterToolbar portalDom={portalDom} prefixCls={customizePrefixCls} {...restProps} />
   );
 };
 

diff --git a/packages/ui/src/PageContainer/index.tsx b/packages/ui/src/PageContainer/index.tsx
@@ -8,7 +8,7 @@ import { PageContainer as AntPageContainer } from '@ant-design/pro-components';
 import classNames from 'classnames';
 import { isObject } from 'lodash';
 import React, { useContext } from 'react';
-import { ConfigProvider, Space, Tooltip, theme } from '@oceanbase/design';
+import { ConfigProvider, Space, Tooltip } from '@oceanbase/design';
 import LocaleWrapper from '../locale/LocaleWrapper';
 import ItemRender from './ItemRender';
 import zhCN from './locale/zh-CN';
@@ -46,8 +46,6 @@ const PageContainer = ({
   const prefixCls = getPrefixCls('pro-page-container', customizePrefixCls);
   const { wrapSSR } = useStyle(prefixCls);
 
-  const { token } = theme.useToken();
-
   const { reload, subTitle, breadcrumb } = header || {};
   const reloadProps =
     isObject(reload) && !React.isValidElement(reload)