@ant-design/pro-components 3.0.1-0 → 3.1.0-0

package/lib/provider/index.js

@@ -116,7 +116,8 @@ var ProConfigContext = /*#__PURE__*/_react.default.createContext({
     proComponentsCls: '.ant-pro',
     antCls: '.ant',
     themeId: 0
-  })
+  }),
+  prefixCls: '.ant-pro'
 });
 var ConfigConsumer = exports.ConfigConsumer = ProConfigContext.Consumer;
 
@@ -198,7 +199,10 @@ var ConfigProviderContainer = function ConfigProviderContainer(props) {
   });
   var _useCacheToken = (0, _cssinjs.useCacheToken)(tokenContext.theme, [tokenContext.token, finalToken !== null && finalToken !== void 0 ? finalToken : {}], {
       salt: salt,
-      override: finalToken
+      override: finalToken,
+      cssVar: {
+        key: 'pro'
+      }
     }),
     _useCacheToken2 = (0, _slicedToArray2.default)(_useCacheToken, 2),
     token = _useCacheToken2[0],
@@ -237,12 +241,13 @@ var ConfigProviderContainer = function ConfigProviderContainer(props) {
   var proConfigContextValue = (0, _react.useMemo)(function () {
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, proProvideValue), {}, {
       valueTypeMap: valueTypeMap || (proProvideValue === null || proProvideValue === void 0 ? void 0 : proProvideValue.valueTypeMap),
-      token: token,
+      token: finalToken,
       theme: tokenContext.theme,
       hashed: hashed,
-      hashId: hashId
+      hashId: hashId,
+      prefixCls: prefixCls
     });
-  }, [proProvideValue, valueTypeMap, token, tokenContext.theme, hashed, hashId]);
+  }, [proProvideValue, valueTypeMap, token, tokenContext.theme, hashed, hashId, prefixCls]);
   var configProviderDom = (0, _react.useMemo)(function () {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.ConfigProvider, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, restConfig), {}, {
       theme: themeConfig,
@@ -322,7 +327,7 @@ function useIntl() {
   var _useContext4 = (0, _react.useContext)(ProConfigContext),
     intl = _useContext4.intl;
   if (intl && intl.locale !== 'default') {
-    return intl || _intl.zhCNIntl;
+    return intl;
   }
   if (locale !== null && locale !== void 0 && locale.locale) {
     return _intl.intlMap[(0, _intl.findIntlKeyByAntdLocaleKey)(locale.locale)] || _intl.zhCNIntl;

package/lib/provider/useStyle/index.d.ts

@@ -25,6 +25,7 @@ export declare const proTheme: {
         theme: import("@ant-design/cssinjs").Theme<import("antd/es/theme/internal").SeedToken, import("antd/es/theme/internal").AliasToken>;
         token: import("antd").GlobalToken;
         hashId: string;
+        cssVar: import("antd").GlobalToken;
     };
     defaultAlgorithm: typeof import("antd/es/theme/themes/default").default;
     darkAlgorithm: import("@ant-design/cssinjs").DerivativeFunc<import("antd/es/theme/internal").SeedToken, import("antd/es/theme/interface").MapToken>;
@@ -67,6 +68,6 @@ export declare const operationUnit: (token: ProAliasToken) => CSSObject;
  * @returns UseStyleResult
  */
 export declare function useStyle(componentName: string, styleFn: (token: ProAliasToken) => CSSInterpolation): {
-    wrapSSR: (node: React.ReactElement<any, string | React.JSXElementConstructor<any>>) => React.JSX.Element;
+    wrapSSR: (node: React.ReactElement) => React.ReactElement<any, string | React.JSXElementConstructor<any>>;
     hashId: string;
 };

package/lib/provider/useStyle/index.js

@@ -75,7 +75,8 @@ function useStyle(componentName, styleFn) {
   var _useContext = (0, _react.useContext)(_index.ProProvider),
     _useContext$token = _useContext.token,
     token = _useContext$token === void 0 ? {} : _useContext$token,
-    hashed = _useContext.hashed;
+    hashed = _useContext.hashed,
+    prefixCls = _useContext.prefixCls;
   var _antdTheme$useToken = _antd.theme.useToken(),
     antdToken = _antdTheme$useToken.token,
     hashId = _antdTheme$useToken.hashId,
@@ -90,18 +91,25 @@ function useStyle(componentName, styleFn) {
   }
   token.proComponentsCls = (_token$proComponentsC = token.proComponentsCls) !== null && _token$proComponentsC !== void 0 ? _token$proComponentsC : ".".concat(getPrefixCls('pro'));
   token.antCls = ".".concat(getPrefixCls());
+
+  // Register styles (side effect only in v2)
+  (0, _cssinjs.useStyleRegister)({
+    theme: theme,
+    token: token,
+    path: [componentName],
+    nonce: csp === null || csp === void 0 ? void 0 : csp.nonce,
+    layer: {
+      name: 'antd-pro'
+    }
+  }, function () {
+    return styleFn(token);
+  });
+
+  // Return identity wrapper and hashId
   return {
-    wrapSSR: (0, _cssinjs.useStyleRegister)({
-      theme: theme,
-      token: token,
-      path: [componentName],
-      nonce: csp === null || csp === void 0 ? void 0 : csp.nonce,
-      layer: {
-        name: 'antd-pro'
-      }
-    }, function () {
-      return styleFn(token);
-    }),
+    wrapSSR: function wrapSSR(node) {
+      return node;
+    },
     hashId: hashed ? hashId : ''
   };
 }