chore: copy PR umijs#11347

MoeYc · Aug 28, 2023 · 4d76a9d · 4d76a9d
1 parent 702262e
commit 4d76a9d
Show file tree

Hide file tree

Showing 6 changed files with 804 additions and 560 deletions.
diff --git a/docs/docs/docs/max/antd.md b/docs/docs/docs/max/antd.md
@@ -131,7 +131,11 @@ export default {
 
 配置 `antd` 的 `StyleProvider` 组件，该组件用于兼容低版本浏览器，如 IE11。当你的项目配置了 `legacy` 或者 `targets` 包含 `ie` 时，会自动进行降级处理，不需要手动配置。
 
-**注意：该配置项仅 antd v5 及以上可用**
+**注意：**
+
+1. 该配置项仅 antd v5 及以上可用。
+
+2. 降级 CSS 需要依赖 [`@ant-design/cssinjs`](https://ant.design/docs/react/compatible-style-cn) ，若你显示安装了 `antd` ，请安装并确保你的 `@ant-design/cssinjs` 版本与 `antd` 正确对应。
 
 ### 运行时配置
 

diff --git a/examples/with-antd-5/.umirc.ts b/examples/with-antd-5/.umirc.ts
@@ -11,6 +11,10 @@ export default {
         colorPrimary: '#1DA57A',
       },
     },
+    styleProvider: {
+      hashPriority: 'high',
+      legacyTransformer: true,
+    },
     // dark: true,
     compact: true,
     /**

diff --git a/examples/with-antd-5/package.json b/examples/with-antd-5/package.json
@@ -8,8 +8,9 @@
     "start": "npm run dev"
   },
   "dependencies": {
+    "@ant-design/cssinjs": "^1.16.0",
     "@umijs/plugins": "workspace:*",
-    "antd": "^5.3.0",
+    "antd": "^5.8.4",
     "umi": "workspace:*"
   }
 }
diff --git a/packages/plugins/src/antd.ts b/packages/plugins/src/antd.ts
@@ -295,6 +295,7 @@ export type IRuntimeConfig = {
 
   api.addRuntimePlugin(() => {
     if (
+      api.config.antd.styleProvider ||
       api.config.antd.configProvider ||
       (appComponentAvailable && api.config.antd.appConfig)
     ) {

diff --git a/packages/plugins/templates/antd/runtime.ts.tpl b/packages/plugins/templates/antd/runtime.ts.tpl
@@ -103,7 +103,7 @@ export function rootContainer(rawContainer) {
   container = (
     <StyleProvider
       {{#styleProvider.hashPriority}}
-      hashPriority="{{{styleProviderConfig.hashPriority}}}"
+      hashPriority="{{{styleProvider.hashPriority}}}"
       {{/styleProvider.hashPriority}}
       {{#styleProvider.legacyTransformer}}
       transformers={[legacyLogicalPropertiesTransformer]}