@oceanbase/design 1.0.0-alpha.2 → 1.0.0-alpha.3

package/es/_util/genComponentStyleHook.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
 import type { CSSObject } from '@ant-design/cssinjs';
 import type { ComponentTokenMap } from 'antd/es/theme/interface';
-import type { FullToken, GenerateStyle } from 'antd/es/theme/internal';
-import type { GlobalToken } from 'antd/es/theme/interface';
+import type { GlobalToken, FullToken, GenerateStyle } from '../theme/interface';
+export declare const genSelectCommonStyle: (token: FullToken<'Select' | 'TreeSelect' | 'Cascader'>) => CSSObject;
 export type ComponentName = keyof ComponentTokenMap;
 export declare function genComponentStyleHook(componentName: ComponentName, styleFn: GenerateStyle<FullToken<ComponentName>>, getDefaultToken?: Partial<FullToken<ComponentName>> | ((token: GlobalToken) => Partial<FullToken<ComponentName>>)): (prefixCls: string) => {
     wrapSSR: (node: React.ReactNode) => React.ReactElement<any, string | React.JSXElementConstructor<any>>;

package/es/_util/genComponentStyleHook.js

@@ -1,15 +1,28 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { genComponentStyleHook as antGenComponentStyleHook } from 'antd/es/theme/internal';
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { genComponentStyleHook as antGenComponentStyleHook } from "../theme/internal";
 import theme from "../theme";
+
+// work for Select, TreeSelect, Cascader
+export var genSelectCommonStyle = function genSelectCommonStyle(token) {
+  var antCls = token.antCls;
+  var selectComponentCls = "".concat(antCls, "-select");
+  return _defineProperty({}, "".concat(selectComponentCls).concat(selectComponentCls, "-multiple"), _defineProperty({}, "".concat(selectComponentCls, "-selection-item"), {
+    borderRadius: token.borderRadius
+  }));
+};
 export function genComponentStyleHook(componentName, styleFn, getDefaultToken) {
   return function (prefixCls) {
     var useStyle = antGenComponentStyleHook("OB-".concat(componentName), function (token) {
-      return [styleFn(token)];
+      return [genSelectCommonStyle(token), styleFn(token)];
     }, getDefaultToken, {
       resetStyle: false,
       // antd style order is -999 and -998

package/es/alert/style/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import type { FullToken, GenerateStyle } from 'antd/es/theme/internal';
+import type { FullToken, GenerateStyle } from '../../theme/interface';
 export type AlertToken = FullToken<'Alert'>;
 export declare const genAlertStyle: GenerateStyle<AlertToken>;
 declare const _default: (prefixCls: string) => {

package/es/app/index.d.ts

@@ -1 +1,9 @@
+import React from 'react';
+import { App as AntApp } from 'antd';
+import type { AppProps } from 'antd/es/app';
 export * from 'antd/es/app';
+export type AppType = React.FC<AppProps> & {
+    useApp: typeof AntApp.useApp;
+};
+declare const App: AppType;
+export default App;

package/es/app/index.js

@@ -1 +1,36 @@
-export * from 'antd/es/app';
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["prefixCls", "className"];
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import React, { useContext } from 'react';
+import { App as AntApp } from 'antd';
+import classNames from 'classnames';
+import ConfigProvider from "../config-provider";
+import useStyle from "./style";
+import { jsx as _jsx } from "react/jsx-runtime";
+export * from 'antd/es/app';
+var App = function App(_ref) {
+  var customizePrefixCls = _ref.prefixCls,
+    className = _ref.className,
+    restProps = _objectWithoutProperties(_ref, _excluded);
+  var _useContext = useContext(ConfigProvider.ConfigContext),
+    getPrefixCls = _useContext.getPrefixCls;
+  var prefixCls = getPrefixCls('app', customizePrefixCls);
+  var _useStyle = useStyle(prefixCls),
+    wrapSSR = _useStyle.wrapSSR;
+  var appCls = classNames(className);
+  return wrapSSR( /*#__PURE__*/_jsx(AntApp, _objectSpread({
+    prefixCls: customizePrefixCls,
+    className: appCls
+  }, restProps)));
+};
+App.useApp = AntApp.useApp;
+if (process.env.NODE_ENV !== 'production') {
+  App.displayName = AntApp.displayName;
+}
+export default App;

package/es/app/style/index.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="react" />
+import type { FullToken, GenerateStyle } from '../../theme/interface';
+export type AppToken = FullToken<'App'>;
+export declare const genAppStyle: GenerateStyle<AppToken>;
+declare const _default: (prefixCls: string) => {
+    wrapSSR: (node: import("react").ReactNode) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
+    hashId: string;
+};
+export default _default;

package/es/{_util/genStyle.js → app/style/index.js}

@@ -2,15 +2,14 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-export var genCompactStyle = function genCompactStyle(componentCls) {
-  var subComponentCls = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-  return _defineProperty(_defineProperty(_defineProperty({}, "&".concat(componentCls, "-compact-item:not(").concat(componentCls, "-compact-last-item)").concat(componentCls, "-compact-first-item ").concat(subComponentCls), {
-    borderStartEndRadius: 0,
-    borderEndEndRadius: 0
-  }), "&".concat(componentCls, "-compact-item:not(").concat(componentCls, "-compact-first-item):not(").concat(componentCls, "-compact-last-item) ").concat(subComponentCls), {
-    borderRadius: 0
-  }), "&".concat(componentCls, "-compact-item:not(").concat(componentCls, "-compact-first-item)").concat(componentCls, "-compact-last-item ").concat(subComponentCls), {
-    borderStartStartRadius: 0,
-    borderEndStartRadius: 0
+import { genComponentStyleHook } from "../../_util/genComponentStyleHook";
+export var genAppStyle = function genAppStyle(token) {
+  var componentCls = token.componentCls;
+  return _defineProperty({}, "".concat(componentCls), {});
+};
+export default (function (prefixCls) {
+  var useStyle = genComponentStyleHook('App', function (token) {
+    return [genAppStyle(token)];
   });
-};
+  return useStyle(prefixCls);
+});

package/es/badge/style/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import type { FullToken, GenerateStyle } from 'antd/es/theme/internal';
+import type { FullToken, GenerateStyle } from '../../theme/interface';
 export type BadgeToken = FullToken<'Badge'>;
 export declare const genBadgeStyle: GenerateStyle<BadgeToken>;
 declare const _default: (prefixCls: string) => {

package/es/button/style/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import type { FullToken, GenerateStyle } from 'antd/es/theme/internal';
+import type { FullToken, GenerateStyle } from '../../theme/interface';
 export type ButtonToken = FullToken<'Button'>;
 export declare const genButtonStyle: GenerateStyle<ButtonToken>;
 declare const _default: (prefixCls: string, isAliyun?: boolean) => {

package/es/card/style/index.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import type { CSSObject } from '@ant-design/cssinjs';
-import type { FullToken, GenerateStyle } from 'antd/es/theme/internal';
+import type { FullToken, GenerateStyle } from '../../theme/interface';
 export type CardToken = FullToken<'Card'> & {
     tabsComponentCls: string;
     tabsPrefixCls: string;

package/es/card/style/index.js

@@ -30,11 +30,11 @@ export var genCardStyle = function genCardStyle(token) {
   var tableComponentCls = "".concat(antCls, "-table");
   return _ref2 = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref2, "".concat(componentCls), _defineProperty(_defineProperty({}, "".concat(componentCls, ":not(").concat(componentCls, "-bordered):not(").concat(componentCls, "-type-inner)"), {
     boxShadow: 'none'
-  }), "".concat(componentCls), _defineProperty({
+  }), "".concat(componentCls).concat(componentCls, "-bordered"), _defineProperty({
     borderRadius: token.borderRadiusLG - 2
-  }, "".concat(componentCls), _defineProperty({
+  }, "".concat(componentCls).concat(componentCls, "-bordered"), _defineProperty({
     borderRadius: token.borderRadius
-  }, "".concat(componentCls), {
+  }, "".concat(componentCls).concat(componentCls, "-bordered"), {
     borderRadius: token.borderRadiusSM
   })))), "".concat(componentCls).concat(componentCls, "-no-divider"), _defineProperty({}, "".concat(componentCls, "-head"), _defineProperty({
     // should not remove border-bottom to avoid tabs inkbar display correctly

package/es/checkbox/style/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import type { FullToken, GenerateStyle } from 'antd/es/theme/internal';
+import type { FullToken, GenerateStyle } from '../../theme/interface';
 export type CheckboxToken = FullToken<'Checkbox'>;
 export declare const genCheckboxStyle: GenerateStyle<CheckboxToken>;
 declare const _default: (prefixCls: string) => {

package/es/config-provider/context.d.ts

@@ -1 +1,12 @@
+import type { ThemeConfig as AntThemeConfig, MappingAlgorithm } from 'antd';
+import type { AliasToken, OverrideToken } from '../theme/interface';
 export * from 'antd/es/config-provider/context';
+type ComponentsConfig = {
+    [key in keyof OverrideToken]?: OverrideToken[key] & {
+        algorithm?: boolean | MappingAlgorithm | MappingAlgorithm[];
+    };
+};
+export interface ThemeConfig extends AntThemeConfig {
+    token?: Partial<AliasToken>;
+    components?: ComponentsConfig;
+}

package/es/config-provider/context.js

@@ -1 +1,2 @@
-export * from 'antd/es/config-provider/context';
+export * from 'antd/es/config-provider/context';
+export {};

package/es/config-provider/index.js

@@ -1,22 +1,23 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var _excluded = ["children", "theme", "locale", "navigate", "hideOnSinglePage", "card", "collapse", "form", "spin", "table", "tabs", "styleProviderProps", "appProps"];
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React from 'react';
-import { App, ConfigProvider as AntConfigProvider } from 'antd';
+import { ConfigProvider as AntConfigProvider } from 'antd';
 import { StyleProvider } from '@ant-design/cssinjs';
 import StyleContext from '@ant-design/cssinjs/es/StyleContext';
 import { CaretRightOutlined } from '@oceanbase/icons';
 import aliyunTheme from '@oceanbase/aliyun-theme';
 import { merge } from 'lodash';
+import App from "../app";
 import StaticFunction from "../static-function";
 import themeConfig from "../theme";
-import defaultTheme, { fontFamilyEn } from "../theme/default";
+import defaultTheme, { fontFamilyEn, fontWeightEn, fontWeightStrongEn } from "../theme/default";
 import darkTheme from "../theme/dark";
 import DefaultRenderEmpty from "./DefaultRenderEmpty";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -31,22 +32,25 @@ var ExtendedConfigContext = /*#__PURE__*/React.createContext({
   hideOnSinglePage: false,
   injectStaticFunction: true
 });
-var ConfigProvider = function ConfigProvider(_ref) {
-  var _mergedTheme$token, _parentContext$pagina;
-  var children = _ref.children,
-    theme = _ref.theme,
-    locale = _ref.locale,
-    navigate = _ref.navigate,
-    hideOnSinglePage = _ref.hideOnSinglePage,
-    card = _ref.card,
-    collapse = _ref.collapse,
-    form = _ref.form,
-    spin = _ref.spin,
-    table = _ref.table,
-    tabs = _ref.tabs,
-    styleProviderProps = _ref.styleProviderProps,
-    appProps = _ref.appProps,
-    restProps = _objectWithoutProperties(_ref, _excluded);
+var getLocaleTokenValue = function getLocaleTokenValue(locale, tokenKey, tokenValue, tokenValueEn) {
+  return tokenValue !== defaultTheme.token[tokenKey] ? _defineProperty({}, tokenKey, tokenValue) : ['en', 'en-gb'].includes(locale.locale) ? _defineProperty({}, tokenKey, tokenValueEn) : {};
+};
+var ConfigProvider = function ConfigProvider(_ref3) {
+  var _mergedTheme$token, _mergedTheme$token2, _mergedTheme$token3, _parentContext$pagina;
+  var children = _ref3.children,
+    theme = _ref3.theme,
+    locale = _ref3.locale,
+    navigate = _ref3.navigate,
+    hideOnSinglePage = _ref3.hideOnSinglePage,
+    card = _ref3.card,
+    collapse = _ref3.collapse,
+    form = _ref3.form,
+    spin = _ref3.spin,
+    table = _ref3.table,
+    tabs = _ref3.tabs,
+    styleProviderProps = _ref3.styleProviderProps,
+    appProps = _ref3.appProps,
+    restProps = _objectWithoutProperties(_ref3, _excluded);
   // inherit from parent ConfigProvider
   var parentContext = React.useContext(AntConfigProvider.ConfigContext);
   var parentExtendedContext = React.useContext(ExtendedConfigContext);
@@ -58,6 +62,9 @@ var ConfigProvider = function ConfigProvider(_ref) {
   var _themeConfig$useToken = themeConfig.useToken(),
     token = _themeConfig$useToken.token;
   var fontFamily = ((_mergedTheme$token = mergedTheme.token) === null || _mergedTheme$token === void 0 ? void 0 : _mergedTheme$token.fontFamily) || token.fontFamily;
+  // @ts-ignore
+  var fontWeight = ((_mergedTheme$token2 = mergedTheme.token) === null || _mergedTheme$token2 === void 0 ? void 0 : _mergedTheme$token2.fontWeight) || token.fontWeight;
+  var fontWeightStrong = ((_mergedTheme$token3 = mergedTheme.token) === null || _mergedTheme$token3 === void 0 ? void 0 : _mergedTheme$token3.fontWeightStrong) || token.fontWeightStrong;
 
   // inherit from parent StyleProvider
   var parentStyleContext = React.useContext(StyleContext);
@@ -67,8 +74,8 @@ var ConfigProvider = function ConfigProvider(_ref) {
     locale: mergedLocale,
     card: merge({}, parentContext.card, card),
     collapse: merge({}, {
-      expandIcon: function expandIcon(_ref2) {
-        var isActive = _ref2.isActive;
+      expandIcon: function expandIcon(_ref4) {
+        var isActive = _ref4.isActive;
         return /*#__PURE__*/_jsx(CaretRightOutlined, {
           rotate: isActive ? 90 : 0
         });
@@ -81,15 +88,7 @@ var ConfigProvider = function ConfigProvider(_ref) {
     table: merge({}, parentContext.table, table),
     tabs: merge({}, parentContext.tabs, tabs),
     theme: merge({}, mergedTheme, {
-      token:
-      // custom fontFamily
-      fontFamily !== defaultTheme.token.fontFamily ? {
-        fontFamily: fontFamily
-      } :
-      // use fontFamilyEn for en
-      ['en', 'en-gb'].includes(mergedLocale.locale) ? {
-        fontFamily: fontFamilyEn
-      } : {}
+      token: _objectSpread(_objectSpread(_objectSpread({}, getLocaleTokenValue(mergedLocale, 'fontFamily', fontFamily, fontFamilyEn)), getLocaleTokenValue(mergedLocale, 'fontWeight', fontWeight, fontWeightEn)), getLocaleTokenValue(mergedLocale, 'fontWeightStrong', fontWeightStrong, fontWeightStrongEn))
     }),
     renderEmpty: parentContext.renderEmpty || function (componentName) {
       return /*#__PURE__*/_jsx(DefaultRenderEmpty, {

package/es/descriptions/hooks/useItems.d.ts

@@ -5,17 +5,17 @@ export default function useItems(items?: DescriptionsItemType[], children?: Reac
     key?: React.Key;
     label?: React.ReactNode;
     span?: number | "filled" | {
-        xxl?: number;
-        xl?: number;
-        lg?: number;
-        md?: number;
-        sm?: number;
         xs?: number;
+        sm?: number;
+        md?: number;
+        lg?: number;
+        xl?: number;
+        xxl?: number;
     };
     style?: React.CSSProperties;
-    className?: string;
     classNames?: Partial<Record<"label" | "content", string>>;
     styles?: Partial<Record<"label" | "content", React.CSSProperties>>;
+    className?: string;
     labelStyle?: React.CSSProperties;
     contentStyle?: React.CSSProperties;
 }[];

package/es/descriptions/style/index.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import type { CSSObject } from '@ant-design/cssinjs';
-import type { FullToken, GenerateStyle } from 'antd/es/theme/internal';
+import type { FullToken, GenerateStyle } from '../../theme/interface';
 import type { DescriptionsProps } from '..';
 export type DescriptionsToken = FullToken<'Alert'> & {
     typographyPrefixCls: string;

package/es/drawer/index.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["locale", "children", "onOk", "onClose", "onCancel", "okText", "cancelText", "okButtonProps", "confirmLoading", "footer", "footerExtra", "rootClassName", "bodyStyle", "styles", "prefixCls"];
+var _excluded = ["locale", "children", "loading", "onOk", "onClose", "onCancel", "okText", "cancelText", "okButtonProps", "confirmLoading", "footer", "footerExtra", "rootClassName", "bodyStyle", "styles", "prefixCls"];
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -28,6 +28,7 @@ export * from 'antd/es/drawer';
 var Drawer = function Drawer(_ref) {
   var customLocale = _ref.locale,
     children = _ref.children,
+    loading = _ref.loading,
     onOk = _ref.onOk,
     onClose = _ref.onClose,
     onCancel = _ref.onCancel,
@@ -58,16 +59,17 @@ var Drawer = function Drawer(_ref) {
   useSize(contentElment);
   // useScroll for re-render when scroll
   var scroll = useScroll(contentElment);
-  var isScroll = (contentElment === null || contentElment === void 0 ? void 0 : contentElment.scrollHeight) !== (contentElment === null || contentElment === void 0 ? void 0 : contentElment.clientHeight);
+  var isScroll = !loading && (contentElment === null || contentElment === void 0 ? void 0 : contentElment.scrollHeight) !== (contentElment === null || contentElment === void 0 ? void 0 : contentElment.clientHeight);
   // start scroll
-  var isStartScroll = scroll.top > 0;
+  var isStartScroll = !loading && scroll.top > 0;
   // Determine if an element has been totally scrolled
   // ref: https://developer.mozilla.org/en-US/docs/Web/API/Element/scrollHeight#determine_if_an_element_has_been_totally_scrolled
-  var isTotalScroll = Math.abs(((contentElment === null || contentElment === void 0 ? void 0 : contentElment.scrollHeight) || 0) - ((contentElment === null || contentElment === void 0 ? void 0 : contentElment.clientHeight) || 0) - ((contentElment === null || contentElment === void 0 ? void 0 : contentElment.scrollTop) || 0)) < 1;
+  var isTotalScroll = !loading && Math.abs(((contentElment === null || contentElment === void 0 ? void 0 : contentElment.scrollHeight) || 0) - ((contentElment === null || contentElment === void 0 ? void 0 : contentElment.clientHeight) || 0) - ((contentElment === null || contentElment === void 0 ? void 0 : contentElment.scrollTop) || 0)) < 1;
   var handleCancel = onCancel || onClose;
   var showFooter = !!(footer || onOk) && footer !== false && footer !== null;
-  var drawerCls = classNames(prefixCls, _defineProperty({}, "".concat(prefixCls, "-with-footer"), showFooter), rootClassName);
+  var drawerCls = classNames(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-loading"), loading), "".concat(prefixCls, "-with-footer"), showFooter), rootClassName);
   return wrapSSR( /*#__PURE__*/_jsxs(AntDrawer, _objectSpread(_objectSpread({
+    loading: loading,
     destroyOnClose: true,
     onClose: handleCancel,
     rootClassName: drawerCls,

package/es/drawer/style/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import type { FullToken, GenerateStyle } from 'antd/es/theme/internal';
+import type { FullToken, GenerateStyle } from '../../theme/interface';
 export type DrawerToken = FullToken<'Drawer'>;
 export declare const genDrawerStyle: GenerateStyle<DrawerToken>;
 declare const _default: (prefixCls: string) => {

package/es/drawer/style/index.js

@@ -4,11 +4,13 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { genComponentStyleHook } from "../../_util/genComponentStyleHook";
 export var genDrawerStyle = function genDrawerStyle(token) {
-  var componentCls = token.componentCls;
+  var componentCls = token.componentCls,
+    antCls = token.antCls;
+  var contentPadding = "".concat(token.paddingXS, "px ").concat(token.paddingLG, "px ").concat(token.paddingLG, "px ").concat(token.paddingLG, "px");
   var boxShadowBottom = '0 2px 4px 0 rgba(54,69,99,0.04), 0 1px 6px -1px rgba(54,69,99,0.04), 0 1px 2px 0 rgba(54,69,99,0.06)';
   var boxShadowTop = '0 -2px 4px 0 rgba(54,69,99,0.04), 0 -1px 6px -1px rgba(54,69,99,0.04), 0 -1px 2px 0 rgba(54,69,99,0.06)';
-  return _defineProperty(_defineProperty({}, "".concat(componentCls), _defineProperty({}, "".concat(componentCls, "-content"), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls, "-header"), {
-    padding: '16px 24px',
+  return _defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls), _defineProperty({}, "".concat(componentCls, "-content"), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls, "-header"), {
+    padding: "".concat(token.padding, "px ").concat(token.paddingLG, "px"),
     borderBottom: 'none',
     transition: "box-shadow ".concat(token.motionDurationMid),
     // ensure header box-shadow cover body content
@@ -20,11 +22,11 @@ export var genDrawerStyle = function genDrawerStyle(token) {
     display: 'flex',
     flexDirection: 'column'
   }), "".concat(componentCls, "-body-content"), {
-    padding: '8px 24px 24px 24px',
+    padding: contentPadding,
     overflow: 'auto'
   }), "".concat(componentCls, "-footer-container"), _defineProperty({
     position: 'sticky',
-    padding: '16px 24px',
+    padding: "".concat(token.padding, "px ").concat(token.paddingLG, "px"),
     transition: "box-shadow ".concat(token.motionDurationMid),
     // ensure footer box-shadow cover body content
     zIndex: 10
@@ -35,8 +37,10 @@ export var genDrawerStyle = function genDrawerStyle(token) {
     alignItems: 'center'
   })), "".concat(componentCls, "-footer-container-shadow"), {
     boxShadow: boxShadowTop
-  }))), "".concat(componentCls).concat(componentCls, "-with-footer"), _defineProperty({}, "".concat(componentCls, "-content"), _defineProperty({}, "".concat(componentCls, "-body-content"), {
-    padding: '8px 24px 8px 24px'
+  }))), "".concat(componentCls).concat(componentCls, "-loading"), _defineProperty({}, "".concat(componentCls, "-body > ").concat(antCls, "-skeleton"), {
+    padding: contentPadding
+  })), "".concat(componentCls).concat(componentCls, "-with-footer"), _defineProperty({}, "".concat(componentCls, "-content"), _defineProperty({}, "".concat(componentCls, "-body-content"), {
+    padding: "".concat(token.paddingXS, "px ").concat(token.paddingLG, "px")
   })));
 };
 export default (function (prefixCls) {

package/es/empty/index.js

@@ -56,7 +56,7 @@ var Empty = function Empty(props) {
   var _useStyle = useStyle(prefixCls),
     wrapSSR = _useStyle.wrapSSR;
   var isHorizontal = layout === 'horizontal';
-  var emptyCls = classNames(prefixCls, _defineProperty(_defineProperty({}, "".concat(prefixCls, "-horizontal"), isHorizontal), "".concat(prefixCls, "-small"), image === defaultEmptyImg || image === simpleEmptyImg), className);
+  var emptyCls = classNames(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-horizontal"), isHorizontal), "".concat(prefixCls, "-small"), image === defaultEmptyImg || image === simpleEmptyImg), className);
   return wrapSSR( /*#__PURE__*/_jsx(AntEmpty, _objectSpread(_objectSpread({
     image: image,
     description: /*#__PURE__*/_jsxs(_Fragment, {

package/es/empty/style/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import type { FullToken, GenerateStyle } from 'antd/es/theme/internal';
+import type { FullToken, GenerateStyle } from '../../theme/interface';
 export type EmptyToken = FullToken<'Badge'>;
 export declare const genEmptyStyle: GenerateStyle<EmptyToken>;
 declare const _default: (prefixCls: string) => {

package/es/form/FormItem.d.ts

@@ -4,7 +4,7 @@ import type { FormItemProps as AntFormItemProps } from 'antd/es/form';
 import type { TooltipProps } from '../tooltip';
 declare const AntFormItem: (<Values = any>(props: AntFormItemProps<Values>) => React.ReactElement<any, string | React.JSXElementConstructor<any>>) & {
     useStatus: () => {
-        status?: "" | "error" | "warning" | "success" | "validating";
+        status?: "" | "success" | "warning" | "error" | "validating";
         errors: React.ReactNode[];
         warnings: React.ReactNode[];
     };

package/es/form/style/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import type { FullToken, GenerateStyle } from 'antd/es/theme/internal';
+import type { FullToken, GenerateStyle } from '../../theme/interface';
 export type FormToken = FullToken<'Form'>;
 export declare const genFormStyle: GenerateStyle<FormToken>;
 declare const _default: (prefixCls: string) => {

package/es/index.d.ts

@@ -13,6 +13,8 @@ export { default as Typography } from './typography';
 export type { TypographyProps } from './typography';
 export { default as Card } from './card';
 export type { CardProps } from './card';
+export { default as App } from './app';
+export type { AppProps } from './app';
 export { default as ConfigProvider } from './config-provider';
 export type { ConfigProviderProps, ConfigConsumerProps, ThemeConfig } from './config-provider';
 export { default as Descriptions } from './descriptions';
@@ -68,8 +70,8 @@ export { default as Lottie } from './lottie';
 export type { LottieProps, LottieRef } from './lottie';
 export { default as theme } from './theme';
 declare const useToken: () => {
-    theme: import("@ant-design/cssinjs").Theme<import("antd/es/theme/internal").SeedToken, import("antd/es/theme/internal").AliasToken>;
-    token: import("antd").GlobalToken;
+    theme: import("@ant-design/cssinjs").Theme<import("antd/lib/theme/interface/seeds").SeedToken, import("./theme/interface").AliasToken>;
+    token: import("./theme/interface").GlobalToken;
     hashId: string;
 };
 export { useToken };

package/es/index.js

@@ -7,6 +7,7 @@ export { default as Space } from "./space";
 export { Col, Row } from "./grid";
 export { default as Typography } from "./typography";
 export { default as Card } from "./card";
+export { default as App } from "./app";
 export { default as ConfigProvider } from "./config-provider";
 export { default as Descriptions } from "./descriptions";
 export { default as Empty } from "./empty";

package/es/modal/style/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import type { FullToken, GenerateStyle } from 'antd/es/theme/internal';
+import type { FullToken, GenerateStyle } from '../../theme/interface';
 export type ModalToken = FullToken<'Modal'>;
 export declare const genModalStyle: GenerateStyle<ModalToken>;
 declare const _default: (prefixCls: string) => {

package/es/radio/style/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import type { FullToken, GenerateStyle } from 'antd/es/theme/internal';
+import type { FullToken, GenerateStyle } from '../../theme/interface';
 export type RadioToken = FullToken<'Radio'>;
 export declare const genRadioStyle: GenerateStyle<RadioToken>;
 declare const _default: (prefixCls: string) => {

package/es/result/index.d.ts

@@ -8,10 +8,10 @@ export type ResultStatusType = AntResultStatusType | 'processing';
 export interface ResultProps extends Omit<AntResultProps, 'status'> {
     status?: ResultStatusType;
 }
-export interface ResultType extends React.FC<ResultProps> {
+export type ResultType = React.FC<ResultProps> & {
     PRESENTED_IMAGE_403: typeof Image403;
     PRESENTED_IMAGE_404: typeof Image404;
     PRESENTED_IMAGE_500: typeof Image500;
-}
+};
 declare const Result: ResultType;
 export default Result;

package/es/result/index.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["status", "prefixCls"];
+var _excluded = ["prefixCls", "className", "status"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -22,15 +22,16 @@ import useStyle from "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
 export * from 'antd/es/result';
 var Result = function Result(_ref) {
-  var status = _ref.status,
-    customizePrefixCls = _ref.prefixCls,
+  var customizePrefixCls = _ref.prefixCls,
+    className = _ref.className,
+    status = _ref.status,
     restProps = _objectWithoutProperties(_ref, _excluded);
   var _useContext = useContext(ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
   var prefixCls = getPrefixCls('result', customizePrefixCls);
   var _useStyle = useStyle(prefixCls),
     wrapSSR = _useStyle.wrapSSR;
-  var resultCls = classNames(prefixCls);
+  var resultCls = classNames(className);
   var statusMap = {
     success: /*#__PURE__*/_jsx(Success, {}),
     error: /*#__PURE__*/_jsx(Error, {}),

package/es/result/style/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import type { FullToken, GenerateStyle } from 'antd/es/theme/internal';
+import type { FullToken, GenerateStyle } from '../../theme/interface';
 export type ResultToken = FullToken<'Result'>;
 export declare const genResultStyle: GenerateStyle<ResultToken>;
 declare const _default: (prefixCls: string) => {

package/es/select/style/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import type { FullToken, GenerateStyle } from 'antd/es/theme/internal';
+import type { FullToken, GenerateStyle } from '../../theme/interface';
 export type SelectToken = FullToken<'Select'>;
 export declare const genSelectStyle: GenerateStyle<SelectToken>;
 declare const _default: (prefixCls: string) => {