优化黑色主题

MeIsAnan · Mar 31, 2023 · 971b870 · 971b870
1 parent c5799a8
commit 971b870
Show file tree

Hide file tree

Showing 3 changed files with 911 additions and 566 deletions.
diff --git a/packages/provider/src/index.tsx b/packages/provider/src/index.tsx
@@ -243,7 +243,7 @@ const ConfigProviderContainer: React.FC<{
   };
 
   const [token, nativeHashId] = useCacheToken<ProAliasToken>(
-    tokenContext.theme,
+    tokenContext.theme as unknown as Theme<any, any>,
     [tokenContext.token, finalToken ?? {}],
     {
       salt,
@@ -279,7 +279,7 @@ const ConfigProviderContainer: React.FC<{
             ...proProvideValue!,
             valueTypeMap: valueTypeMap || proProvideValue?.valueTypeMap,
             token,
-            theme: tokenContext.theme,
+            theme: tokenContext.theme as unknown as Theme<any, any>,
             hashed: props.hashed,
             hashId,
           }}

diff --git a/packages/provider/src/useStyle/index.ts b/packages/provider/src/useStyle/index.ts
@@ -106,10 +106,17 @@ export function useStyle(
   componentName: string,
   styleFn: (token: ProAliasToken) => CSSInterpolation,
 ) {
-  const { token = {} as ProAliasToken, hashId = '', theme } = useContext(ProProvider);
+  let { token = {} as ProAliasToken, hashId = '', theme } = useContext(ProProvider);
+  const { token: antdToken } = useToken();
   const { getPrefixCls } = useContext(AntdConfigProvider.ConfigContext);
+
   token.antCls = `.${getPrefixCls()}`;
-  token.proComponentsCls = token.proComponentsCls ?? `.${getPrefixCls('pro')}`;
+
+  // 如果不在 ProProvider 里面，就用 antd 的
+  if (!token.layout) {
+    token = { ...antdToken } as any;
+    token.proComponentsCls = token.proComponentsCls ?? `.${getPrefixCls('pro')}`;
+  }
 
   return {
     wrapSSR: useStyleRegister(