删除无用的代码

Author: chenshuai2144

.dumi/app.tsx

@@ -1,5 +1,6 @@
 import { Alert } from 'antd';
 
+// @ts-ignore
 export function rootContainer(container) {
   return (
     <div>

packages/field/src/components/Checkbox/index.tsx

@@ -1,10 +1,9 @@
-import { useToken } from '@ant-design/pro-provider';
-import {
+import {
   objectToMap,
   proFieldParsingText,
   useStyle,
 } from '@ant-design/pro-utils';
-import { Checkbox, ConfigProvider, Form, Spin } from 'antd';
+import { Checkbox, ConfigProvider, Form, Spin, theme } from 'antd';
 import type { CheckboxGroupProps } from 'antd/lib/checkbox';
 import classNames from 'classnames';
 import React, { useContext, useImperativeHandle, useRef } from 'react';
@@ -65,7 +64,7 @@ const FieldCheckbox: ProFieldFC<GroupProps> = (
     };
   });
 
-  const { token } = useToken?.();
+  const { token } = theme.useToken?.();
   const checkBoxRef = useRef();
   useImperativeHandle(
     ref,

packages/provider/src/index.tsx

@@ -1,7 +1,7 @@
 import type { Theme } from '@ant-design/cssinjs';
 import { useCacheToken } from '@ant-design/cssinjs';
 import { omitUndefined } from '@ant-design/pro-utils';
-import { ConfigProvider as AntdConfigProvider } from 'antd';
+import { ConfigProvider as AntdConfigProvider, theme as antdTheme } from 'antd';
 
 import zh_CN from 'antd/lib/locale/zh_CN';
 import React, { useContext, useEffect, useMemo } from 'react';
@@ -13,8 +13,6 @@ import dayjs from 'dayjs';
 import type { DeepPartial, ProTokenType } from './typing/layoutToken';
 import { getLayoutDesignToken } from './typing/layoutToken';
 import type { ProAliasToken } from './useStyle';
-import { proTheme } from './useStyle';
-import { defaultToken, emptyTheme } from './useStyle/token';
 import { merge } from './utils/merge';
 
 import 'dayjs/locale/zh-cn';
@@ -154,7 +152,6 @@ export type ConfigContextPropsType = {
   hashId?: string;
   hashed?: boolean;
   dark?: boolean;
-  theme?: Theme<any, any>;
 };
 
 /* Creating a context object with the default values. */
@@ -164,10 +161,14 @@ const ProConfigContext = React.createContext<ConfigContextPropsType>({
     locale: 'default',
   },
   valueTypeMap: {},
-  theme: emptyTheme,
   hashed: true,
   dark: false,
-  token: defaultToken as ProAliasToken,
+  token: {
+    ...antdTheme.getDesignToken(),
+    proComponentsCls: '.ant-pro',
+    antCls: '.ant',
+    themeId: 0,
+  },
 });
 
 export const { Consumer: ConfigConsumer } = ProConfigContext;
@@ -216,7 +217,7 @@ const ConfigProviderContainer: React.FC<{
   const { locale, getPrefixCls, ...restConfig } = useContext(
     AntdConfigProvider.ConfigContext,
   );
-  const tokenContext = proTheme.useToken?.();
+  const tokenContext = antdTheme.useToken?.();
   const proProvide = useContext(ProConfigContext);
 
   /**
@@ -236,10 +237,7 @@ const ConfigProviderContainer: React.FC<{
    * 合并一下token，不然导致嵌套 token 失效
    */
   const proLayoutTokenMerge = useMemo(() => {
-    return getLayoutDesignToken(
-      propsToken || {},
-      tokenContext.token || defaultToken,
-    );
+    return getLayoutDesignToken(propsToken || {}, tokenContext.token);
   }, [propsToken, tokenContext.token]);
 
   const proProvideValue = useMemo(() => {
@@ -327,7 +325,6 @@ const ConfigProviderContainer: React.FC<{
             ...proProvideValue!,
             valueTypeMap: valueTypeMap || proProvideValue?.valueTypeMap,
             token,
-            theme: tokenContext.theme as unknown as Theme<any, any>,
             hashed,
             hashId,
           }}
@@ -392,10 +389,10 @@ export const ProConfigProvider: React.FC<{
   const mergeAlgorithm = () => {
     const isDark = dark ?? proProvide.dark;
     if (isDark && !Array.isArray(theme?.algorithm)) {
-      return [proTheme.darkAlgorithm, theme?.algorithm].filter(Boolean);
+      return [antdTheme.darkAlgorithm, theme?.algorithm].filter(Boolean);
     }
     if (isDark && Array.isArray(theme?.algorithm)) {
-      return [proTheme.darkAlgorithm, ...(theme?.algorithm || [])].filter(
+      return [antdTheme.darkAlgorithm, ...(theme?.algorithm || [])].filter(
         Boolean,
       );
     }

packages/provider/src/useStyle/index.ts

@@ -2,13 +2,12 @@ import type { CSSInterpolation, CSSObject } from '@ant-design/cssinjs';
 import { useStyleRegister } from '@ant-design/cssinjs';
 import { TinyColor } from '@ctrl/tinycolor';
 
-import { ConfigProvider as AntdConfigProvider, theme } from 'antd';
+import { ConfigProvider as AntdConfigProvider, theme as antdTheme } from 'antd';
 import type { GlobalToken } from 'antd/lib/theme/interface';
 import type React from 'react';
 import { useContext } from 'react';
 import { ProProvider } from '../index';
 import type { ProTokenType } from '../typing/layoutToken';
-import * as batToken from './token';
 
 /**
  * 把一个颜色设置一下透明度
@@ -37,14 +36,7 @@ export type GenerateStyle<
   ReturnType = CSSInterpolation,
 > = (token: ComponentToken, ...rest: any[]) => ReturnType;
 
-const genTheme = (): any => {
-  if (typeof theme === 'undefined' || !theme) return batToken as any;
-  return theme;
-};
-
-export const proTheme = genTheme() as typeof theme;
-
-export const useToken = proTheme.useToken;
+export const proTheme = antdTheme as typeof antdTheme;
 
 export type UseStyleResult = {
   wrapSSR: (node: React.ReactElement) => React.ReactElement;
@@ -107,8 +99,8 @@ export function useStyle(
 ) {
   let { token = {} as Record<string, any> as ProAliasToken } =
     useContext(ProProvider);
-  const { hashId = '', theme: provideTheme } = useContext(ProProvider);
-  const { token: antdToken } = useToken();
+  const { hashId = '' } = useContext(ProProvider);
+  const { token: antdToken, theme } = antdTheme.useToken();
   const { getPrefixCls } = useContext(AntdConfigProvider.ConfigContext);
 
   // 如果不在 ProProvider 里面，就用 antd 的
@@ -121,7 +113,7 @@ export function useStyle(
   return {
     wrapSSR: useStyleRegister(
       {
-        theme: provideTheme!,
+        theme,
         token,
         hashId,
         path: [componentName],