@lobehub/ui 1.151.6 → 1.152.0

package/es/ThemeProvider/index.d.ts

@@ -1,8 +1,12 @@
 import { ThemeProviderProps as AntdThemeProviderProps, CustomStylishParams, CustomTokenParams } from 'antd-style';
 import { CSSProperties } from 'react';
 import { NeutralColors, PrimaryColors } from "../styles";
-export interface ThemeProviderProps extends Omit<AntdThemeProviderProps<any>, 'theme'> {
+export interface ThemeProviderProps extends AntdThemeProviderProps<any> {
     className?: string;
+    /**
+     * @description Webfont loader css strings
+     */
+    customFonts?: string[];
     customStylish?: (theme: CustomStylishParams) => {
         [key: string]: any;
     };
@@ -16,13 +20,9 @@ export interface ThemeProviderProps extends Omit<AntdThemeProviderProps<any>, 't
     customToken?: (theme: CustomTokenParams) => {
         [key: string]: any;
     };
+    enableCustomFonts?: boolean;
     enableGlobalStyle?: boolean;
-    enableWebfonts?: boolean;
     style?: CSSProperties;
-    /**
-     * @description Webfont loader css strings
-     */
-    webfonts?: string[];
 }
 declare const ThemeProvider: import("react").NamedExoticComponent<ThemeProviderProps>;
 export default ThemeProvider;

package/es/ThemeProvider/index.js

@@ -2,9 +2,10 @@
 
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["children", "customStylish", "customToken", "enableWebfonts", "enableGlobalStyle", "webfonts", "customTheme", "className", "style"];
+var _excluded = ["children", "customStylish", "customToken", "enableCustomFonts", "enableGlobalStyle", "customFonts", "customTheme", "className", "style", "theme"];
 import { App } from 'antd';
 import { ThemeProvider as AntdThemeProvider, StyleProvider } from 'antd-style';
+import { merge } from 'lodash-es';
 import { memo, useCallback } from 'react';
 import { useCdnFn } from "../ConfigProvider";
 import FontLoader from "../FontLoader";
@@ -18,18 +19,19 @@ var ThemeProvider = /*#__PURE__*/memo(function (_ref) {
   var children = _ref.children,
     customStylish = _ref.customStylish,
     customToken = _ref.customToken,
-    _ref$enableWebfonts = _ref.enableWebfonts,
-    enableWebfonts = _ref$enableWebfonts === void 0 ? true : _ref$enableWebfonts,
+    _ref$enableCustomFont = _ref.enableCustomFonts,
+    enableCustomFonts = _ref$enableCustomFont === void 0 ? true : _ref$enableCustomFont,
     _ref$enableGlobalStyl = _ref.enableGlobalStyle,
     enableGlobalStyle = _ref$enableGlobalStyl === void 0 ? true : _ref$enableGlobalStyl,
-    webfonts = _ref.webfonts,
+    customFonts = _ref.customFonts,
     _ref$customTheme = _ref.customTheme,
     customTheme = _ref$customTheme === void 0 ? {} : _ref$customTheme,
     className = _ref.className,
     style = _ref.style,
+    antdTheme = _ref.theme,
     res = _objectWithoutProperties(_ref, _excluded);
   var genCdnUrl = useCdnFn();
-  var webfontUrls = webfonts || [genCdnUrl({
+  var webfontUrls = customFonts || [genCdnUrl({
     path: 'css/index.css',
     pkg: '@lobehub/webfont-mono',
     version: '1.0.0'
@@ -53,14 +55,15 @@ var ThemeProvider = /*#__PURE__*/memo(function (_ref) {
     return _objectSpread(_objectSpread({}, lobeCustomToken(theme)), customToken === null || customToken === void 0 ? void 0 : customToken(theme));
   }, [customToken]);
   var theme = useCallback(function (appearance) {
-    return createLobeAntdTheme({
+    var lobeTheme = createLobeAntdTheme({
       appearance: appearance,
       neutralColor: customTheme.neutralColor,
       primaryColor: customTheme.primaryColor
     });
-  }, [customTheme.primaryColor, customTheme.neutralColor]);
+    return merge(lobeTheme, antdTheme);
+  }, [customTheme.primaryColor, customTheme.neutralColor, antdTheme]);
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [enableWebfonts && (webfontUrls === null || webfontUrls === void 0 ? void 0 : webfontUrls.length) > 0 && webfontUrls.map(function (webfont) {
+    children: [enableCustomFonts && (webfontUrls === null || webfontUrls === void 0 ? void 0 : webfontUrls.length) > 0 && webfontUrls.map(function (webfont) {
       return /*#__PURE__*/_jsx(FontLoader, {
         url: webfont
       }, webfont);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/ui",
-  "version": "1.151.6",
+  "version": "1.152.0",
   "description": "Lobe UI is an open-source UI component library for building AIGC web apps",
   "keywords": [
     "lobehub",