@hsu-react/ui 2.4.5 → 2.4.6

package/es/config-provider/index.js

@@ -1,4 +1,10 @@
 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; }
 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; }
@@ -13,6 +19,26 @@ import { toAntdComponents, toAntdTheme } from "../styles/tokens";
 import { FeedbackHolder } from "../feedback";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * Merge the library's per-component tokens with the consumer's, one level deeper than a spread.
+ *
+ * Spreading the two maps replaces a whole component block: an app that only wants
+ * `Button.primaryColor` would silently lose the library's `Button.*Shadow: none` and get antd's
+ * stock 2px shadow back under every button — no error, and nothing in the app's own theme to
+ * explain it. Merging per component means an app overrides *tokens*, not blocks.
+ */
+var mergeComponents = function mergeComponents(base, extra) {
+  if (!extra) return base;
+  var merged = _objectSpread({}, base);
+  for (var _i = 0, _Object$entries = Object.entries(extra); _i < _Object$entries.length; _i++) {
+    var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
+      name = _Object$entries$_i[0],
+      tokens = _Object$entries$_i[1];
+    merged[name] = _objectSpread(_objectSpread({}, merged[name]), tokens);
+  }
+  return merged;
+};
+
 /**
  * Hsu UI global configuration: permissions, the request implementation, and the design tokens.
  *
@@ -56,7 +82,7 @@ var ConfigProvider = function ConfigProvider(_ref) {
         dark: isDark,
         primaryColor: primaryColor
       })), theme === null || theme === void 0 ? void 0 : theme.token),
-      components: _objectSpread(_objectSpread({}, toAntdComponents()), theme === null || theme === void 0 ? void 0 : theme.components)
+      components: mergeComponents(toAntdComponents(), theme === null || theme === void 0 ? void 0 : theme.components)
     });
   }, [isDark, primaryColor, theme]);
 

package/lib/config-provider/index.js

@@ -15,6 +15,28 @@ var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+/**
+ * Merge the library's per-component tokens with the consumer's, one level deeper than a spread.
+ *
+ * Spreading the two maps replaces a whole component block: an app that only wants
+ * `Button.primaryColor` would silently lose the library's `Button.*Shadow: none` and get antd's
+ * stock 2px shadow back under every button — no error, and nothing in the app's own theme to
+ * explain it. Merging per component means an app overrides *tokens*, not blocks.
+ */
+const mergeComponents = (base, extra) => {
+  if (!extra) return base;
+  const merged = {
+    ...base
+  };
+  for (const [name, tokens] of Object.entries(extra)) {
+    merged[name] = {
+      ...merged[name],
+      ...tokens
+    };
+  }
+  return merged;
+};
+
 /**
  * Hsu UI global configuration: permissions, the request implementation, and the design tokens.
  *
@@ -57,10 +79,7 @@ const ConfigProvider = ({
       }),
       ...theme?.token
     },
-    components: {
-      ...(0, _tokens.toAntdComponents)(),
-      ...theme?.components
-    }
+    components: mergeComponents((0, _tokens.toAntdComponents)(), theme?.components)
   }), [isDark, primaryColor, theme]);
 
   // Written onto <html> rather than a wrapper element: this provider usually sits at the very top

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hsu-react/ui",
-  "version": "2.4.5",
+  "version": "2.4.6",
   "description": "一套基于 React + Ant Design 的中后台业务组件库",
   "license": "MIT",
   "type": "module",

package/src/config-provider/index.tsx

@@ -44,6 +44,28 @@ export interface ConfigProviderProps {
   children?: React.ReactNode;
 }
 
+/**
+ * Merge the library's per-component tokens with the consumer's, one level deeper than a spread.
+ *
+ * Spreading the two maps replaces a whole component block: an app that only wants
+ * `Button.primaryColor` would silently lose the library's `Button.*Shadow: none` and get antd's
+ * stock 2px shadow back under every button — no error, and nothing in the app's own theme to
+ * explain it. Merging per component means an app overrides *tokens*, not blocks.
+ */
+const mergeComponents = (
+  base: ThemeConfig["components"],
+  extra: ThemeConfig["components"]
+): ThemeConfig["components"] => {
+  if (!extra) return base;
+
+  const merged = { ...base } as Record<string, object | undefined>;
+  for (const [name, tokens] of Object.entries(extra)) {
+    merged[name] = { ...merged[name], ...tokens };
+  }
+
+  return merged as ThemeConfig["components"];
+};
+
 /**
  * Hsu UI global configuration: permissions, the request implementation, and the design tokens.
  *
@@ -82,7 +104,7 @@ const ConfigProvider: React.FC<ConfigProviderProps> = ({
       algorithm: isDark ? antdTheme.darkAlgorithm : antdTheme.defaultAlgorithm,
       ...theme,
       token: { ...toAntdTheme({ dark: isDark, primaryColor }), ...theme?.token },
-      components: { ...toAntdComponents(), ...theme?.components },
+      components: mergeComponents(toAntdComponents(), theme?.components),
     }),
     [isDark, primaryColor, theme]
   );