@digitalc/dxp-ui 0.0.6-alpha.14 → 0.0.6-alpha.16

package/es/components/Form/designTokens.d.ts

@@ -7,7 +7,7 @@ declare const useDesignFormTokens: () => {
     lineHeight: number;
     labelHeight: any;
     labelColor: any;
-    labelFontFamily: string;
+    fontFamily: string;
     labelFontSize: any;
     fontSize: any;
     itemMarginBottom: number;
@@ -22,7 +22,7 @@ declare const useDesignFormHorizontalTokens: () => {
     labelHeight: any;
     labelColor: any;
     lineHeight: number;
-    labelFontFamily: string;
+    fontFamily: string;
     labelFontSize: any;
     fontSize: any;
     itemMarginBottom: number;

package/es/components/Form/designTokens.js

@@ -17,7 +17,7 @@ var useDesignFormTokens = function useDesignFormTokens() {
     // label高
     labelColor: getToken('colorInputTextLabel'),
     // label文本颜色
-    labelFontFamily: "".concat(getToken('fontFamilySecondaryRegular'), "-Regular"),
+    fontFamily: "".concat(getToken('fontFamilySecondaryRegular'), "-Regular"),
     labelFontSize: getToken('fontSizeMobileContentC14'),
     fontSize: getToken('fontSizeMobileContentC14'),
     // 字体大小
@@ -44,7 +44,7 @@ var useDesignFormHorizontalTokens = function useDesignFormHorizontalTokens() {
     // label文本颜色
     lineHeight: 24 / getToken('fontSizeMobileContentC14'),
     // 行高
-    labelFontFamily: "".concat(getToken('fontFamilySecondaryRegular'), "-Regular"),
+    fontFamily: "".concat(getToken('fontFamilySecondaryRegular'), "-Regular"),
     labelFontSize: getToken('fontSizeMobileContentC14'),
     fontSize: getToken('fontSizeMobileContentC14'),
     // 字体大小

package/es/components/Input/designTokens.d.ts

@@ -24,6 +24,8 @@ declare const useDesignTokens: () => {
     colorInputTextPlaceholder: any;
     fontSize: any;
     colorBgContainerDisabled: any;
+    fontFamily: string;
+    colorTextDisabled: any;
 };
 declare const useStyleToken: () => {
     [x: string]: any;

package/es/components/Input/designTokens.js

@@ -53,7 +53,10 @@ var useDesignTokens = function useDesignTokens() {
     // placeholder文本颜色
     fontSize: getToken('fontSizeMobileContentC14'),
     // 字体大小
-    colorBgContainerDisabled: getToken('colorInputBackgroundHaze') // 背景颜色
+    colorBgContainerDisabled: getToken('colorInputBackgroundHaze'),
+    // 背景颜色
+    fontFamily: "".concat(getToken('fontFamilySecondaryRegular'), "-Regular"),
+    colorTextDisabled: getToken('colorInputTextActive') // 禁用文本颜色
   };
   return designTokens;
 };

package/es/style/themes/font-local.css

@@ -26,28 +26,3 @@
   font-weight: normal;
   font-style: normal;
 }
-
-@font-face {
-  font-family: 'SF Pro Text-Regular';
-  src: url('../../fonts/SF/SF-Pro-Text-Regular.ttf') format('opentype'),
-    url('../../fonts/SF/SF-Pro-Text-Regular.otf') format('opentype');
-  font-weight: normal;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'SF Pro Text-SemiBold';
-  src:
-    url('../../fonts/SF/SF-Pro-Text-Semibold.otf') format('opentype'),
-    url('../../fonts/SF/SF-Pro-Text-SemiboldItalic.otf') format('opentype');
-  font-weight: normal;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'SF Pro Text-Bold';
-  src:
-    url('../../fonts/SF/SF-Pro-Text-Bold.otf') format('opentype');
-  font-weight: normal;
-  font-style: normal;
-}

package/es/style/themes/fonts-optimized.css

@@ -35,30 +35,6 @@
   font-display: swap;
 }
 
-@font-face {
-  font-family: 'SF Pro Text-Regular';
-  src: url('../../fonts/optimized/SF-Pro-Text-Regular.woff2') format('woff2');
-  font-weight: normal;
-  font-style: normal;
-  font-display: swap;
-}
-
-@font-face {
-  font-family: 'SF Pro Text-SemiBold';
-  src: url('../../fonts/optimized/SF-Pro-Text-Semibold.woff2') format('woff2');
-  font-weight: normal;
-  font-style: normal;
-  font-display: swap;
-}
-
-@font-face {
-  font-family: 'SF Pro Text-Bold';
-  src: url('../../fonts/optimized/SF-Pro-Text-Bold.woff2') format('woff2');
-  font-weight: normal;
-  font-style: normal;
-  font-display: swap;
-}
-
 /* 方案二：使用CDN引用字体（推荐生产环境使用） */
 /*
 @font-face {

package/es/utils/TokenContext.js

@@ -1,6 +1,9 @@
+import "antd/es/config-provider/style";
+import _ConfigProvider from "antd/es/config-provider";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { createContext, useContext, useState, useEffect, useMemo, useCallback } from 'react';
 import { TokenManager } from "./";
+import { cssClasses } from "../constants";
 
 // 定义TokenContext的类型
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -62,9 +65,17 @@ export var TokenProvider = function TokenProvider(_ref) {
       tokenVersion: tokenVersion
     };
   }, [getToken, tokenVersion]);
-  return /*#__PURE__*/_jsx(TokenContext.Provider, {
-    value: value,
-    children: children
+  return /*#__PURE__*/_jsx(_ConfigProvider, {
+    prefixCls: cssClasses.PREFIX,
+    theme: {
+      token: {
+        fontFamily: "".concat(value.getToken('fontFamilyPrimaryRegular'), "-Regular")
+      }
+    },
+    children: /*#__PURE__*/_jsx(TokenContext.Provider, {
+      value: value,
+      children: children
+    })
   });
 };
 

package/es/utils/fontLoader.js

@@ -217,12 +217,12 @@ function loadCdnFonts() {
 
   // 设置字体显示方式
   var fontDisplay = currentConfig.fontDisplay || 'swap';
-  style.textContent = "\n    @font-face {\n      font-family: 'Poppins-Bold';\n      src: url('".concat(cdnBasePath, "/Poppins-Bold.woff2') format('woff2');\n      font-weight: normal;\n      font-style: normal;\n      font-display: ").concat(fontDisplay, ";\n    }\n\n    @font-face {\n      font-family: 'Roboto-Regular';\n      src: url('").concat(cdnBasePath, "/Roboto-Regular.woff2') format('woff2');\n      font-weight: normal;\n      font-style: normal;\n      font-display: ").concat(fontDisplay, ";\n    }\n\n    @font-face {\n      font-family: 'Roboto-Bold';\n      src: url('").concat(cdnBasePath, "/Roboto-Bold.woff2') format('woff2');\n      font-weight: normal;\n      font-style: normal;\n      font-display: ").concat(fontDisplay, ";\n    }\n\n    @font-face {\n      font-family: 'Roboto-SemiBold';\n      src: url('").concat(cdnBasePath, "/Roboto-SemiBold.woff2') format('woff2');\n      font-weight: normal;\n      font-style: normal;\n      font-display: ").concat(fontDisplay, ";\n    }\n\n    @font-face {\n      font-family: 'SF Pro Text-Regular';\n      src: url('").concat(cdnBasePath, "/SF-Pro-Text-Regular.woff2') format('woff2');\n      font-weight: normal;\n      font-style: normal;\n      font-display: ").concat(fontDisplay, ";\n    }\n\n    @font-face {\n      font-family: 'SF Pro Text-SemiBold';\n      src: url('").concat(cdnBasePath, "/SF-Pro-Text-Semibold.woff2') format('woff2');\n      font-weight: normal;\n      font-style: normal;\n      font-display: ").concat(fontDisplay, ";\n    }\n  ");
+  style.textContent = "\n    @font-face {\n      font-family: 'Poppins-Bold';\n      src: url('".concat(cdnBasePath, "/Poppins-Bold.woff2') format('woff2');\n      font-weight: normal;\n      font-style: normal;\n      font-display: ").concat(fontDisplay, ";\n    }\n\n    @font-face {\n      font-family: 'Roboto-Regular';\n      src: url('").concat(cdnBasePath, "/Roboto-Regular.woff2') format('woff2');\n      font-weight: normal;\n      font-style: normal;\n      font-display: ").concat(fontDisplay, ";\n    }\n\n    @font-face {\n      font-family: 'Roboto-Bold';\n      src: url('").concat(cdnBasePath, "/Roboto-Bold.woff2') format('woff2');\n      font-weight: normal;\n      font-style: normal;\n      font-display: ").concat(fontDisplay, ";\n    }\n\n    @font-face {\n      font-family: 'Roboto-SemiBold';\n      src: url('").concat(cdnBasePath, "/Roboto-SemiBold.woff2') format('woff2');\n      font-weight: normal;\n      font-style: normal;\n      font-display: ").concat(fontDisplay, ";\n    }\n  ");
   document.head.appendChild(style);
 
   // 如果启用了预加载，添加预加载链接
   if (currentConfig.preload) {
-    var fontFiles = ['Poppins-Bold.woff2', 'Roboto-Regular.woff2', 'Roboto-Bold.woff2', 'Roboto-SemiBold.woff2', 'SF-Pro-Text-Regular.woff2', 'SF-Pro-Text-Semibold.woff2'];
+    var fontFiles = ['Poppins-Bold.woff2', 'Roboto-Regular.woff2', 'Roboto-Bold.woff2', 'Roboto-SemiBold.woff2'];
     fontFiles.forEach(function (file) {
       var preloadLink = document.createElement('link');
       preloadLink.rel = 'preload';

package/lib/components/Form/designTokens.d.ts

@@ -7,7 +7,7 @@ declare const useDesignFormTokens: () => {
     lineHeight: number;
     labelHeight: any;
     labelColor: any;
-    labelFontFamily: string;
+    fontFamily: string;
     labelFontSize: any;
     fontSize: any;
     itemMarginBottom: number;
@@ -22,7 +22,7 @@ declare const useDesignFormHorizontalTokens: () => {
     labelHeight: any;
     labelColor: any;
     lineHeight: number;
-    labelFontFamily: string;
+    fontFamily: string;
     labelFontSize: any;
     fontSize: any;
     itemMarginBottom: number;

package/lib/components/Form/designTokens.js

@@ -42,7 +42,7 @@ var useDesignFormTokens = () => {
     // label高
     labelColor: getToken("colorInputTextLabel"),
     // label文本颜色
-    labelFontFamily: `${getToken("fontFamilySecondaryRegular")}-Regular`,
+    fontFamily: `${getToken("fontFamilySecondaryRegular")}-Regular`,
     labelFontSize: getToken("fontSizeMobileContentC14"),
     fontSize: getToken("fontSizeMobileContentC14"),
     // 字体大小
@@ -69,7 +69,7 @@ var useDesignFormHorizontalTokens = () => {
     // label文本颜色
     lineHeight: 24 / getToken("fontSizeMobileContentC14"),
     // 行高
-    labelFontFamily: `${getToken("fontFamilySecondaryRegular")}-Regular`,
+    fontFamily: `${getToken("fontFamilySecondaryRegular")}-Regular`,
     labelFontSize: getToken("fontSizeMobileContentC14"),
     fontSize: getToken("fontSizeMobileContentC14"),
     // 字体大小

package/lib/components/Input/designTokens.d.ts

@@ -24,6 +24,8 @@ declare const useDesignTokens: () => {
     colorInputTextPlaceholder: any;
     fontSize: any;
     colorBgContainerDisabled: any;
+    fontFamily: string;
+    colorTextDisabled: any;
 };
 declare const useStyleToken: () => {
     [x: string]: any;

package/lib/components/Input/designTokens.js

@@ -78,8 +78,11 @@ var useDesignTokens = () => {
     // placeholder文本颜色
     fontSize: getToken("fontSizeMobileContentC14"),
     // 字体大小
-    colorBgContainerDisabled: getToken("colorInputBackgroundHaze")
+    colorBgContainerDisabled: getToken("colorInputBackgroundHaze"),
     // 背景颜色
+    fontFamily: `${getToken("fontFamilySecondaryRegular")}-Regular`,
+    colorTextDisabled: getToken("colorInputTextActive")
+    // 禁用文本颜色
   };
   return designTokens;
 };

package/lib/style/themes/font-local.css

@@ -26,28 +26,3 @@
   font-weight: normal;
   font-style: normal;
 }
-
-@font-face {
-  font-family: 'SF Pro Text-Regular';
-  src: url('../../fonts/SF/SF-Pro-Text-Regular.ttf') format('opentype'),
-    url('../../fonts/SF/SF-Pro-Text-Regular.otf') format('opentype');
-  font-weight: normal;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'SF Pro Text-SemiBold';
-  src:
-    url('../../fonts/SF/SF-Pro-Text-Semibold.otf') format('opentype'),
-    url('../../fonts/SF/SF-Pro-Text-SemiboldItalic.otf') format('opentype');
-  font-weight: normal;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'SF Pro Text-Bold';
-  src:
-    url('../../fonts/SF/SF-Pro-Text-Bold.otf') format('opentype');
-  font-weight: normal;
-  font-style: normal;
-}

package/lib/style/themes/fonts-optimized.css

@@ -35,30 +35,6 @@
   font-display: swap;
 }
 
-@font-face {
-  font-family: 'SF Pro Text-Regular';
-  src: url('../../fonts/optimized/SF-Pro-Text-Regular.woff2') format('woff2');
-  font-weight: normal;
-  font-style: normal;
-  font-display: swap;
-}
-
-@font-face {
-  font-family: 'SF Pro Text-SemiBold';
-  src: url('../../fonts/optimized/SF-Pro-Text-Semibold.woff2') format('woff2');
-  font-weight: normal;
-  font-style: normal;
-  font-display: swap;
-}
-
-@font-face {
-  font-family: 'SF Pro Text-Bold';
-  src: url('../../fonts/optimized/SF-Pro-Text-Bold.woff2') format('woff2');
-  font-weight: normal;
-  font-style: normal;
-  font-display: swap;
-}
-
 /* 方案二：使用CDN引用字体（推荐生产环境使用） */
 /*
 @font-face {

package/lib/utils/TokenContext.js

@@ -36,7 +36,9 @@ __export(TokenContext_exports, {
 });
 module.exports = __toCommonJS(TokenContext_exports);
 var import_react = __toESM(require("react"));
+var import_antd = require("antd");
 var import_utils = require("./");
+var import_constants = require("../constants");
 var defaultValue = {
   getToken: (tokenName) => import_utils.TokenManager.tokenKey(tokenName),
   tokenVersion: 0
@@ -67,7 +69,18 @@ var TokenProvider = ({ children, getToken }) => {
     getToken: getToken || defaultValue.getToken,
     tokenVersion
   }), [getToken, tokenVersion]);
-  return /* @__PURE__ */ import_react.default.createElement(TokenContext.Provider, { value }, children);
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_antd.ConfigProvider,
+    {
+      prefixCls: import_constants.cssClasses.PREFIX,
+      theme: {
+        token: {
+          fontFamily: `${value.getToken("fontFamilyPrimaryRegular")}-Regular`
+        }
+      }
+    },
+    /* @__PURE__ */ import_react.default.createElement(TokenContext.Provider, { value }, children)
+  );
 };
 var useDynamicTokens = () => {
   const context = (0, import_react.useContext)(TokenContext);

package/lib/utils/fontLoader.js

@@ -203,22 +203,6 @@ function loadCdnFonts(cdnBasePath = "") {
       font-style: normal;
       font-display: ${fontDisplay};
     }
-
-    @font-face {
-      font-family: 'SF Pro Text-Regular';
-      src: url('${cdnBasePath}/SF-Pro-Text-Regular.woff2') format('woff2');
-      font-weight: normal;
-      font-style: normal;
-      font-display: ${fontDisplay};
-    }
-
-    @font-face {
-      font-family: 'SF Pro Text-SemiBold';
-      src: url('${cdnBasePath}/SF-Pro-Text-Semibold.woff2') format('woff2');
-      font-weight: normal;
-      font-style: normal;
-      font-display: ${fontDisplay};
-    }
   `;
   document.head.appendChild(style);
   if (currentConfig.preload) {
@@ -226,9 +210,7 @@ function loadCdnFonts(cdnBasePath = "") {
       "Poppins-Bold.woff2",
       "Roboto-Regular.woff2",
       "Roboto-Bold.woff2",
-      "Roboto-SemiBold.woff2",
-      "SF-Pro-Text-Regular.woff2",
-      "SF-Pro-Text-Semibold.woff2"
+      "Roboto-SemiBold.woff2"
     ];
     fontFiles.forEach((file) => {
       const preloadLink = document.createElement("link");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitalc/dxp-ui",
-  "version": "0.0.6-alpha.14",
+  "version": "0.0.6-alpha.16",
   "description": "A UI library of Digitalc Design React Component",
   "type": "module",
   "keywords": [