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

package/es/provider/index.js

@@ -1,8 +1,3 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-var _excluded = ["locale", "getPrefixCls"],
-  _excluded2 = ["locale", "theme"];
 import { useCacheToken } from '@ant-design/cssinjs';
 import { ConfigProvider as AntdConfigProvider, theme as antdTheme } from 'antd';
 import zh_CN from 'antd/lib/locale/zh_CN';
@@ -18,9 +13,9 @@ import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export * from "./intl";
 export * from "./useStyle";
-var omitUndefined = function omitUndefined(obj) {
-  var newObj = {};
-  Object.keys(obj || {}).forEach(function (key) {
+const omitUndefined = obj => {
+  const newObj = {};
+  Object.keys(obj || {}).forEach(key => {
     if (obj[key] !== undefined) {
       newObj[key] = obj[key];
     }
@@ -37,9 +32,8 @@ var omitUndefined = function omitUndefined(obj) {
  * 如果是，则返回 false。否则，直接返回 true 表示需要打开。
  * @returns
  */
-export var isNeedOpenHash = function isNeedOpenHash() {
-  var _process$env$NODE_ENV, _process$env$NODE_ENV2;
-  if (typeof process !== 'undefined' && (((_process$env$NODE_ENV = process.env.NODE_ENV) === null || _process$env$NODE_ENV === void 0 ? void 0 : _process$env$NODE_ENV.toUpperCase()) === 'TEST' || ((_process$env$NODE_ENV2 = process.env.NODE_ENV) === null || _process$env$NODE_ENV2 === void 0 ? void 0 : _process$env$NODE_ENV2.toUpperCase()) === 'DEV')) {
+export const isNeedOpenHash = () => {
+  if (typeof process !== 'undefined' && (process.env.NODE_ENV?.toUpperCase() === 'TEST' || process.env.NODE_ENV?.toUpperCase() === 'DEV')) {
     return false;
   }
   return true;
@@ -70,33 +64,37 @@ export var isNeedOpenHash = function isNeedOpenHash() {
  */
 
 /* Creating a context object with the default values. */
-var ProConfigContext = /*#__PURE__*/React.createContext({
-  intl: _objectSpread(_objectSpread({}, zhCNIntl), {}, {
+const ProConfigContext = /*#__PURE__*/React.createContext({
+  intl: {
+    ...zhCNIntl,
     locale: 'default'
-  }),
+  },
   valueTypeMap: {},
   hashed: true,
   dark: false,
-  token: _objectSpread(_objectSpread({}, antdTheme.getDesignToken()), {}, {
+  token: {
+    ...antdTheme.getDesignToken(),
     proComponentsCls: '.ant-pro',
     antCls: '.ant',
     themeId: 0
-  }),
+  },
   prefixCls: '.ant-pro'
 });
-var ConfigConsumer = ProConfigContext.Consumer;
+export const {
+  Consumer: ConfigConsumer
+} = ProConfigContext;
 
 /**
  * 组件解除挂载后清空一下 cache
  * @date 2022-11-28
  * @returns null
  */
-export { ConfigConsumer };
-var CacheClean = function CacheClean() {
-  var _useSWRConfig = useSWRConfig(),
-    cache = _useSWRConfig.cache;
-  useEffect(function () {
-    return function () {
+const CacheClean = () => {
+  const {
+    cache
+  } = useSWRConfig();
+  useEffect(() => {
+    return () => {
       // is a map
       // @ts-ignore
       cache.clear();
@@ -111,22 +109,23 @@ var CacheClean = function CacheClean() {
  * @param props
  * @returns
  */
-var ConfigProviderContainer = function ConfigProviderContainer(props) {
-  var _antdTheme$useToken;
-  var children = props.children,
-    dark = props.dark,
-    valueTypeMap = props.valueTypeMap,
-    _props$autoClearCache = props.autoClearCache,
-    autoClearCache = _props$autoClearCache === void 0 ? false : _props$autoClearCache,
-    propsToken = props.token,
-    prefixCls = props.prefixCls,
-    intl = props.intl;
-  var _useContext = useContext(AntdConfigProvider.ConfigContext),
-    locale = _useContext.locale,
-    getPrefixCls = _useContext.getPrefixCls,
-    restConfig = _objectWithoutProperties(_useContext, _excluded);
-  var tokenContext = (_antdTheme$useToken = antdTheme.useToken) === null || _antdTheme$useToken === void 0 ? void 0 : _antdTheme$useToken.call(antdTheme);
-  var proProvide = useContext(ProConfigContext);
+const ConfigProviderContainer = props => {
+  const {
+    children,
+    dark,
+    valueTypeMap,
+    autoClearCache = false,
+    token: propsToken,
+    prefixCls,
+    intl
+  } = props;
+  const {
+    locale,
+    getPrefixCls,
+    ...restConfig
+  } = useContext(AntdConfigProvider.ConfigContext);
+  const tokenContext = antdTheme.useToken?.();
+  const proProvide = useContext(ProConfigContext);
 
   /**
    * pro 的 类
@@ -134,53 +133,51 @@ var ConfigProviderContainer = function ConfigProviderContainer(props) {
    * @example .ant-pro
    */
 
-  var proComponentsCls = prefixCls ? ".".concat(prefixCls) : ".".concat(getPrefixCls(), "-pro");
-  var antCls = '.' + getPrefixCls();
-  var salt = "".concat(proComponentsCls);
+  const proComponentsCls = prefixCls ? `.${prefixCls}` : `.${getPrefixCls()}-pro`;
+  const antCls = '.' + getPrefixCls();
+  const salt = `${proComponentsCls}`;
   /**
    * 合并一下token，不然导致嵌套 token 失效
    */
-  var proLayoutTokenMerge = useMemo(function () {
+  const proLayoutTokenMerge = useMemo(() => {
     return getLayoutDesignToken(propsToken || {}, tokenContext.token);
   }, [propsToken, tokenContext.token]);
-  var proProvideValue = useMemo(function () {
-    var _proProvide$intl;
-    var localeName = locale === null || locale === void 0 ? void 0 : locale.locale;
-    var key = findIntlKeyByAntdLocaleKey(localeName);
+  const proProvideValue = useMemo(() => {
+    const localeName = locale?.locale;
+    const key = findIntlKeyByAntdLocaleKey(localeName);
     // antd 的 key 存在的时候以 antd 的为主
-    var resolvedIntl = intl !== null && intl !== void 0 ? intl : localeName && ((_proProvide$intl = proProvide.intl) === null || _proProvide$intl === void 0 ? void 0 : _proProvide$intl.locale) === 'default' ? intlMap[key] : proProvide.intl || intlMap[key];
-    return _objectSpread(_objectSpread({}, proProvide), {}, {
-      dark: dark !== null && dark !== void 0 ? dark : proProvide.dark,
+    const resolvedIntl = intl ?? (localeName && proProvide.intl?.locale === 'default' ? intlMap[key] : proProvide.intl || intlMap[key]);
+    return {
+      ...proProvide,
+      dark: dark ?? proProvide.dark,
       token: merge(proProvide.token, tokenContext.token, {
-        proComponentsCls: proComponentsCls,
-        antCls: antCls,
+        proComponentsCls,
+        antCls,
         themeId: tokenContext.theme.id,
         layout: proLayoutTokenMerge
       }),
       intl: resolvedIntl || zhCNIntl
-    });
-  }, [locale === null || locale === void 0 ? void 0 : locale.locale, proProvide, dark, tokenContext.token, tokenContext.theme.id, proComponentsCls, antCls, proLayoutTokenMerge, intl]);
-  var finalToken = _objectSpread(_objectSpread({}, proProvideValue.token || {}), {}, {
-    proComponentsCls: proComponentsCls
+    };
+  }, [locale?.locale, proProvide, dark, tokenContext.token, tokenContext.theme.id, proComponentsCls, antCls, proLayoutTokenMerge, intl]);
+  const finalToken = {
+    ...(proProvideValue.token || {}),
+    proComponentsCls
+  };
+  const [token, nativeHashId] = useCacheToken(tokenContext.theme, [tokenContext.token, finalToken ?? {}], {
+    salt,
+    override: finalToken,
+    cssVar: {
+      key: 'pro'
+    }
   });
-  var _useCacheToken = useCacheToken(tokenContext.theme, [tokenContext.token, finalToken !== null && finalToken !== void 0 ? finalToken : {}], {
-      salt: salt,
-      override: finalToken,
-      cssVar: {
-        key: 'pro'
-      }
-    }),
-    _useCacheToken2 = _slicedToArray(_useCacheToken, 2),
-    token = _useCacheToken2[0],
-    nativeHashId = _useCacheToken2[1];
-  var hashed = useMemo(function () {
+  const hashed = useMemo(() => {
     if (props.hashed === false) {
       return false;
     }
     if (proProvide.hashed === false) return false;
     return true;
   }, [proProvide.hashed, props.hashed]);
-  var hashId = useMemo(function () {
+  const hashId = useMemo(() => {
     if (props.hashed === false) {
       return '';
     }
@@ -195,27 +192,30 @@ var ConfigProviderContainer = function ConfigProviderContainer(props) {
       return nativeHashId;
     }
   }, [nativeHashId, proProvide.hashed, props.hashed]);
-  useEffect(function () {
-    dayjs.locale((locale === null || locale === void 0 ? void 0 : locale.locale) || 'zh-cn');
-  }, [locale === null || locale === void 0 ? void 0 : locale.locale]);
-  var themeConfig = useMemo(function () {
-    return _objectSpread(_objectSpread({}, restConfig.theme), {}, {
+  useEffect(() => {
+    dayjs.locale(locale?.locale || 'zh-cn');
+  }, [locale?.locale]);
+  const themeConfig = useMemo(() => {
+    return {
+      ...restConfig.theme,
       hashId: hashId,
       hashed: hashed && isNeedOpenHash()
-    });
+    };
   }, [restConfig.theme, hashId, hashed, isNeedOpenHash()]);
-  var proConfigContextValue = useMemo(function () {
-    return _objectSpread(_objectSpread({}, proProvideValue), {}, {
-      valueTypeMap: valueTypeMap || (proProvideValue === null || proProvideValue === void 0 ? void 0 : proProvideValue.valueTypeMap),
+  const proConfigContextValue = useMemo(() => {
+    return {
+      ...proProvideValue,
+      valueTypeMap: valueTypeMap || proProvideValue?.valueTypeMap,
       token: finalToken,
       theme: tokenContext.theme,
-      hashed: hashed,
-      hashId: hashId,
-      prefixCls: prefixCls
-    });
+      hashed,
+      hashId,
+      prefixCls
+    };
   }, [proProvideValue, valueTypeMap, token, tokenContext.theme, hashed, hashId, prefixCls]);
-  var configProviderDom = useMemo(function () {
-    return /*#__PURE__*/_jsx(AntdConfigProvider, _objectSpread(_objectSpread({}, restConfig), {}, {
+  const configProviderDom = useMemo(() => {
+    return /*#__PURE__*/_jsx(AntdConfigProvider, {
+      ...restConfig,
       theme: themeConfig,
       children: /*#__PURE__*/_jsx(ProConfigContext.Provider, {
         value: proConfigContextValue,
@@ -223,16 +223,14 @@ var ConfigProviderContainer = function ConfigProviderContainer(props) {
           children: [autoClearCache && /*#__PURE__*/_jsx(CacheClean, {}), children]
         })
       })
-    }));
+    });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [restConfig, themeConfig, proConfigContextValue, autoClearCache, children]);
   if (!autoClearCache) return configProviderDom;
   return /*#__PURE__*/_jsx(SWRConfig, {
     value: {
-      provider: function provider() {
-        return new Map();
-      }
+      provider: () => new Map()
     },
     children: configProviderDom
   });
@@ -243,40 +241,47 @@ var ConfigProviderContainer = function ConfigProviderContainer(props) {
  * @param props
  * @returns
  */
-export var ProConfigProvider = function ProConfigProvider(props) {
-  var needDeps = props.needDeps,
-    dark = props.dark,
-    token = props.token;
-  var proProvide = useContext(ProConfigContext);
-  var _useContext2 = useContext(AntdConfigProvider.ConfigContext),
-    locale = _useContext2.locale,
-    theme = _useContext2.theme,
-    rest = _objectWithoutProperties(_useContext2, _excluded2);
+export const ProConfigProvider = props => {
+  const {
+    needDeps,
+    dark,
+    token
+  } = props;
+  const proProvide = useContext(ProConfigContext);
+  const {
+    locale,
+    theme,
+    ...rest
+  } = useContext(AntdConfigProvider.ConfigContext);
 
   // 是不是不需要渲染 provide
-  var isNullProvide = needDeps && proProvide.hashId !== undefined && Object.keys(props).sort().join('-') === 'children-needDeps';
+  const isNullProvide = needDeps && proProvide.hashId !== undefined && Object.keys(props).sort().join('-') === 'children-needDeps';
   if (isNullProvide) return /*#__PURE__*/_jsx(_Fragment, {
     children: props.children
   });
-  var mergeAlgorithm = function mergeAlgorithm() {
-    var isDark = dark !== null && dark !== void 0 ? dark : proProvide.dark;
+  const mergeAlgorithm = () => {
+    const isDark = dark ?? proProvide.dark;
     if (isDark) {
-      return [theme === null || theme === void 0 ? void 0 : theme.algorithm, antdTheme.darkAlgorithm].flat(1).filter(Boolean);
+      return [theme?.algorithm, antdTheme.darkAlgorithm].flat(1).filter(Boolean);
     }
-    return theme === null || theme === void 0 ? void 0 : theme.algorithm;
+    return theme?.algorithm;
   };
   // 自动注入 antd 的配置
-  var configProvider = _objectSpread(_objectSpread({}, rest), {}, {
+  const configProvider = {
+    ...rest,
     locale: locale || zh_CN,
-    theme: omitUndefined(_objectSpread(_objectSpread({}, theme), {}, {
+    theme: omitUndefined({
+      ...theme,
       algorithm: mergeAlgorithm()
-    }))
-  });
-  return /*#__PURE__*/_jsx(AntdConfigProvider, _objectSpread(_objectSpread({}, configProvider), {}, {
-    children: /*#__PURE__*/_jsx(ConfigProviderContainer, _objectSpread(_objectSpread({}, props), {}, {
+    })
+  };
+  return /*#__PURE__*/_jsx(AntdConfigProvider, {
+    ...configProvider,
+    children: /*#__PURE__*/_jsx(ConfigProviderContainer, {
+      ...props,
       token: token
-    }))
-  }));
+    })
+  });
 };
 
 /**
@@ -288,18 +293,20 @@ export var ProConfigProvider = function ProConfigProvider(props) {
  * @returns The return value of the function is the intl object.
  */
 export function useIntl() {
-  var _useContext3 = useContext(AntdConfigProvider.ConfigContext),
-    locale = _useContext3.locale;
-  var _useContext4 = useContext(ProConfigContext),
-    intl = _useContext4.intl;
+  const {
+    locale
+  } = useContext(AntdConfigProvider.ConfigContext);
+  const {
+    intl
+  } = useContext(ProConfigContext);
   if (intl && intl.locale !== 'default') {
     return intl;
   }
-  if (locale !== null && locale !== void 0 && locale.locale) {
+  if (locale?.locale) {
     return intlMap[findIntlKeyByAntdLocaleKey(locale.locale)] || zhCNIntl;
   }
   return zhCNIntl;
 }
 ProConfigContext.displayName = 'ProProvider';
-export var ProProvider = ProConfigContext;
+export const ProProvider = ProConfigContext;
 export default ProConfigContext;

package/es/provider/intl.js

@@ -38,56 +38,54 @@ import zhTW from "./locale/zh_TW";
  * @param locale
  * @param localeMap
  */
-export var createIntl = function createIntl(locale, localeMap) {
-  return {
-    getMessage: function getMessage(id, defaultMessage) {
-      var msg = get(localeMap, id.replace(/\[(\d+)\]/g, '.$1').split('.')) || '';
-      if (msg) return msg;
-      var localKey = locale.replace('_', '-');
-      if (localKey === 'zh-CN') {
-        return defaultMessage;
-      }
-      // eslint-disable-next-line @typescript-eslint/no-use-before-define
-      var intl = intlMap['zh-CN'];
-      return intl ? intl.getMessage(id, defaultMessage) : defaultMessage;
-    },
-    locale: locale
-  };
-};
-var mnMNIntl = createIntl('mn_MN', mnMN);
-var arEGIntl = createIntl('ar_EG', arEG);
-var zhCNIntl = createIntl('zh_CN', zhCN);
-var enUSIntl = createIntl('en_US', enUS);
-var enGBIntl = createIntl('en_GB', enGB);
-var viVNIntl = createIntl('vi_VN', viVN);
-var itITIntl = createIntl('it_IT', itIT);
-var jaJPIntl = createIntl('ja_JP', jaJP);
-var esESIntl = createIntl('es_ES', esES);
-var caESIntl = createIntl('ca_ES', caES);
-var ruRUIntl = createIntl('ru_RU', ruRU);
-var srRSIntl = createIntl('sr_RS', srRS);
-var msMYIntl = createIntl('ms_MY', msMY);
-var zhTWIntl = createIntl('zh_TW', zhTW);
-var zhHKIntl = createIntl('zh_HK', zhHK);
-var frFRIntl = createIntl('fr_FR', frFR);
-var ptBRIntl = createIntl('pt_BR', ptBR);
-var koKRIntl = createIntl('ko_KR', koKR);
-var idIDIntl = createIntl('id_ID', idID);
-var deDEIntl = createIntl('de_DE', deDE);
-var faIRIntl = createIntl('fa_IR', faIR);
-var trTRIntl = createIntl('tr_TR', trTR);
-var plPLIntl = createIntl('pl_PL', plPL);
-var hrHRIntl = createIntl('hr_', hrHR);
-var thTHIntl = createIntl('th_TH', thTH);
-var csCZIntl = createIntl('cs_cz', csCZ);
-var skSKIntl = createIntl('sk_SK', skSK);
-var heILIntl = createIntl('he_IL', heIL);
-var ukUAIntl = createIntl('uk_UA', ukUA);
-var uzUZIntl = createIntl('uz_UZ', uzUZ);
-var nlNLIntl = createIntl('nl_NL', nlNL);
-var roROIntl = createIntl('ro_RO', roRO);
-var svSEIntl = createIntl('sv_SE', svSE);
-var intlMap = {
+export const createIntl = (locale, localeMap) => ({
+  getMessage: (id, defaultMessage) => {
+    const msg = get(localeMap, id.replace(/\[(\d+)\]/g, '.$1').split('.')) || '';
+    if (msg) return msg;
+    const localKey = locale.replace('_', '-');
+    if (localKey === 'zh-CN') {
+      return defaultMessage;
+    }
+    // eslint-disable-next-line @typescript-eslint/no-use-before-define
+    const intl = intlMap['zh-CN'];
+    return intl ? intl.getMessage(id, defaultMessage) : defaultMessage;
+  },
+  locale
+});
+const mnMNIntl = createIntl('mn_MN', mnMN);
+const arEGIntl = createIntl('ar_EG', arEG);
+const zhCNIntl = createIntl('zh_CN', zhCN);
+const enUSIntl = createIntl('en_US', enUS);
+const enGBIntl = createIntl('en_GB', enGB);
+const viVNIntl = createIntl('vi_VN', viVN);
+const itITIntl = createIntl('it_IT', itIT);
+const jaJPIntl = createIntl('ja_JP', jaJP);
+const esESIntl = createIntl('es_ES', esES);
+const caESIntl = createIntl('ca_ES', caES);
+const ruRUIntl = createIntl('ru_RU', ruRU);
+const srRSIntl = createIntl('sr_RS', srRS);
+const msMYIntl = createIntl('ms_MY', msMY);
+const zhTWIntl = createIntl('zh_TW', zhTW);
+const zhHKIntl = createIntl('zh_HK', zhHK);
+const frFRIntl = createIntl('fr_FR', frFR);
+const ptBRIntl = createIntl('pt_BR', ptBR);
+const koKRIntl = createIntl('ko_KR', koKR);
+const idIDIntl = createIntl('id_ID', idID);
+const deDEIntl = createIntl('de_DE', deDE);
+const faIRIntl = createIntl('fa_IR', faIR);
+const trTRIntl = createIntl('tr_TR', trTR);
+const plPLIntl = createIntl('pl_PL', plPL);
+const hrHRIntl = createIntl('hr_', hrHR);
+const thTHIntl = createIntl('th_TH', thTH);
+const csCZIntl = createIntl('cs_cz', csCZ);
+const skSKIntl = createIntl('sk_SK', skSK);
+const heILIntl = createIntl('he_IL', heIL);
+const ukUAIntl = createIntl('uk_UA', ukUA);
+const uzUZIntl = createIntl('uz_UZ', uzUZ);
+const nlNLIntl = createIntl('nl_NL', nlNL);
+const roROIntl = createIntl('ro_RO', roRO);
+const svSEIntl = createIntl('sv_SE', svSE);
+const intlMap = {
   'mn-MN': mnMNIntl,
   'ar-EG': arEGIntl,
   'zh-CN': zhCNIntl,
@@ -122,17 +120,17 @@ var intlMap = {
   'ro-RO': roROIntl,
   'sv-SE': svSEIntl
 };
-var intlMapKeys = Object.keys(intlMap);
+const intlMapKeys = Object.keys(intlMap);
 
 /**
  * 根据 antd 的 key 来找到的 locale 插件的 key
  *
  * @param localeKey
  */
-export var findIntlKeyByAntdLocaleKey = function findIntlKeyByAntdLocaleKey(localeKey) {
-  var localeName = (localeKey || 'zh-CN').toLocaleLowerCase();
-  return intlMapKeys.find(function (intlKey) {
-    var LowerCaseKey = intlKey.toLocaleLowerCase();
+export const findIntlKeyByAntdLocaleKey = localeKey => {
+  const localeName = (localeKey || 'zh-CN').toLocaleLowerCase();
+  return intlMapKeys.find(intlKey => {
+    const LowerCaseKey = intlKey.toLocaleLowerCase();
     return LowerCaseKey.includes(localeName);
   });
 };

package/es/provider/typing/layoutToken.js

@@ -1,23 +1,23 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { setAlpha } from "../useStyle";
-export var getLayoutDesignToken = function getLayoutDesignToken(designTokens, antdToken) {
-  var _finalDesignTokens$si, _finalDesignTokens$he, _finalDesignTokens$he2, _finalDesignTokens$he3, _finalDesignTokens$pa, _finalDesignTokens$pa2;
-  var finalDesignTokens = _objectSpread({}, designTokens);
-  var defaultColorBgHeader = setAlpha(antdToken.colorBgElevated, 0.6);
-  return _objectSpread(_objectSpread({
-    bgLayout: "linear-gradient(".concat(antdToken.colorBgContainer, ", ").concat(antdToken.colorBgLayout, " 28%)"),
+export const getLayoutDesignToken = (designTokens, antdToken) => {
+  const finalDesignTokens = {
+    ...designTokens
+  };
+  const defaultColorBgHeader = setAlpha(antdToken.colorBgElevated, 0.6);
+  return {
+    bgLayout: `linear-gradient(${antdToken.colorBgContainer}, ${antdToken.colorBgLayout} 28%)`,
     colorTextAppListIcon: antdToken.colorTextSecondary,
-    appListIconHoverBgColor: finalDesignTokens === null || finalDesignTokens === void 0 || (_finalDesignTokens$si = finalDesignTokens.sider) === null || _finalDesignTokens$si === void 0 ? void 0 : _finalDesignTokens$si.colorBgMenuItemSelected,
+    appListIconHoverBgColor: finalDesignTokens?.sider?.colorBgMenuItemSelected,
     colorBgAppListIconHover: setAlpha(antdToken.colorTextBase, 0.04),
-    colorTextAppListIconHover: antdToken.colorTextBase
-  }, finalDesignTokens), {}, {
-    header: _objectSpread({
+    colorTextAppListIconHover: antdToken.colorTextBase,
+    ...finalDesignTokens,
+    header: {
       colorBgHeader: defaultColorBgHeader,
       colorBgScrollHeader: setAlpha(antdToken.colorBgElevated, 0.8),
       colorHeaderTitle: antdToken.colorText,
       colorBgMenuItemHover: setAlpha(antdToken.colorTextBase, 0.03),
       colorBgMenuItemSelected: 'transparent',
-      colorBgMenuElevated: ((_finalDesignTokens$he = finalDesignTokens === null || finalDesignTokens === void 0 || (_finalDesignTokens$he2 = finalDesignTokens.header) === null || _finalDesignTokens$he2 === void 0 ? void 0 : _finalDesignTokens$he2.colorBgHeader) !== null && _finalDesignTokens$he !== void 0 ? _finalDesignTokens$he : defaultColorBgHeader) !== defaultColorBgHeader ? (_finalDesignTokens$he3 = finalDesignTokens.header) === null || _finalDesignTokens$he3 === void 0 ? void 0 : _finalDesignTokens$he3.colorBgHeader : antdToken.colorBgElevated,
+      colorBgMenuElevated: (finalDesignTokens?.header?.colorBgHeader ?? defaultColorBgHeader) !== defaultColorBgHeader ? finalDesignTokens.header?.colorBgHeader : antdToken.colorBgElevated,
       colorTextMenuSelected: setAlpha(antdToken.colorTextBase, 0.95),
       colorBgRightActionsItemHover: setAlpha(antdToken.colorTextBase, 0.03),
       colorTextRightActionsItem: antdToken.colorTextTertiary,
@@ -25,9 +25,10 @@ export var getLayoutDesignToken = function getLayoutDesignToken(designTokens, an
       colorTextMenu: antdToken.colorTextSecondary,
       colorTextMenuSecondary: antdToken.colorTextTertiary,
       colorTextMenuTitle: antdToken.colorText,
-      colorTextMenuActive: antdToken.colorText
-    }, finalDesignTokens.header),
-    sider: _objectSpread({
+      colorTextMenuActive: antdToken.colorText,
+      ...finalDesignTokens.header
+    },
+    sider: {
       paddingInlineLayoutMenu: 8,
       paddingBlockLayoutMenu: 0,
       colorBgCollapsedButton: antdToken.colorBgElevated,
@@ -43,13 +44,15 @@ export var getLayoutDesignToken = function getLayoutDesignToken(designTokens, an
       colorTextMenu: antdToken.colorTextSecondary,
       colorTextMenuSecondary: antdToken.colorTextTertiary,
       colorTextMenuTitle: antdToken.colorText,
-      colorTextSubMenuSelected: setAlpha(antdToken.colorTextBase, 0.95)
-    }, finalDesignTokens.sider),
-    pageContainer: _objectSpread({
+      colorTextSubMenuSelected: setAlpha(antdToken.colorTextBase, 0.95),
+      ...finalDesignTokens.sider
+    },
+    pageContainer: {
       colorBgPageContainer: 'transparent',
-      paddingInlinePageContainerContent: ((_finalDesignTokens$pa = finalDesignTokens.pageContainer) === null || _finalDesignTokens$pa === void 0 ? void 0 : _finalDesignTokens$pa.paddingInlinePageContainerContent) || 40,
-      paddingBlockPageContainerContent: ((_finalDesignTokens$pa2 = finalDesignTokens.pageContainer) === null || _finalDesignTokens$pa2 === void 0 ? void 0 : _finalDesignTokens$pa2.paddingBlockPageContainerContent) || 32,
-      colorBgPageContainerFixed: antdToken.colorBgElevated
-    }, finalDesignTokens.pageContainer)
-  });
+      paddingInlinePageContainerContent: finalDesignTokens.pageContainer?.paddingInlinePageContainerContent || 40,
+      paddingBlockPageContainerContent: finalDesignTokens.pageContainer?.paddingBlockPageContainerContent || 32,
+      colorBgPageContainerFixed: antdToken.colorBgElevated,
+      ...finalDesignTokens.pageContainer
+    }
+  };
 };