@oceanbase/design 1.0.0-alpha.8 → 1.0.0

package/es/table/style/index.js

@@ -1,13 +1,92 @@
-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 = ["theme"];
+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; }
+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); }
 import { unit } from '@ant-design/cssinjs';
-import { genComponentStyleHook } from "../../_util/genComponentStyleHook";
+import { prepareComponentToken as antdPrepareComponentTokenImport } from 'antd/es/table/style';
+import { genStyleHooks } from "../../_util/genComponentStyleHook";
+var antdPrepareComponentToken = antdPrepareComponentTokenImport;
+
+/**
+ * `genStyleHooks` 注册名为 `OB-Table`，`@ant-design/cssinjs-utils` 的 getComponentToken 只合并 `token.OB-Table`，
+ * 而 ConfigProvider 的 `theme.components.Table` 挂在 `token.Table` 上。若不合并，自定义 Table 组件 token（含
+ * `localeEnEmbeddedControls`）不会进入样式计算。
+ */
+function prepareComponentToken(token) {
+  var base = antdPrepareComponentToken(token);
+  var tableCfg = token.Table;
+  if (!tableCfg || _typeof(tableCfg) !== 'object' || Array.isArray(tableCfg)) {
+    return base;
+  }
+  var _ref = tableCfg,
+    _nestedTheme = _ref.theme,
+    tableOverrides = _objectWithoutProperties(_ref, _excluded);
+  return _objectSpread(_objectSpread({}, base), tableOverrides);
+}
+
+/**
+ * 单元格是否与全局正文同档（`cellFontSize === token.fontSize`）。
+ */
+var isTableCellBodyFontScale = function isTableCellBodyFontScale(token) {
+  return token.cellFontSize === token.fontSize;
+};
+var getTableCellLineHeight = function getTableCellLineHeight(token) {
+  return isTableCellBodyFontScale(token) ? token.lineHeight : token.lineHeightSM;
+};
+var getTableEmbeddedControlHeight = function getTableEmbeddedControlHeight(token) {
+  return isTableCellBodyFontScale(token) ? token.controlHeight : token.controlHeightSM;
+};
+var genSmallBtnStyle = function genSmallBtnStyle(token) {
+  if (!token.localeEnEmbeddedControls) {
+    return {};
+  }
+  var antCls = token.antCls;
+  var cellLineHeight = getTableCellLineHeight(token);
+  var controlH = getTableEmbeddedControlHeight(token);
+  return _defineProperty({}, "".concat(antCls, "-btn:not(").concat(antCls, "-btn-sm):not(").concat(antCls, "-btn-lg)"), _defineProperty(_defineProperty(_defineProperty({
+    height: controlH,
+    fontSize: token.cellFontSize,
+    lineHeight: cellLineHeight
+  }, "&:not(".concat(antCls, "-btn-icon-only):not(").concat(antCls, "-btn-circle)"), {
+    paddingInline: token.paddingXS
+  }), "&".concat(antCls, "-btn-icon-only"), {
+    width: controlH
+  }), "&".concat(antCls, "-btn-circle"), {
+    minWidth: controlH
+  }));
+};
+
+/** 英文 locale 下分页条与 page size Select 与单元格内嵌控件对齐的样式（与 {@link genSmallBtnStyle} 同开关）。 */
+var genSmallPaginationStyle = function genSmallPaginationStyle(token) {
+  if (!token.localeEnEmbeddedControls) {
+    return {};
+  }
+  var antCls = token.antCls,
+    calc = token.calc;
+  var embeddedControlH = getTableEmbeddedControlHeight(token);
+  return _defineProperty(_defineProperty({
+    fontSize: token.cellFontSize
+  }, "".concat(antCls, "-pagination-item, ").concat(antCls, "-pagination-total-text, ").concat(antCls, "-pagination-prev, ").concat(antCls, "-pagination-next"), {
+    height: embeddedControlH,
+    minWidth: embeddedControlH,
+    lineHeight: unit(calc(embeddedControlH).sub(calc(token.lineWidth).mul(2)).equal())
+  }), "".concat(antCls, "-pagination-options ").concat(antCls, "-select-single"), _defineProperty({
+    height: embeddedControlH
+  }, "".concat(antCls, "-select-selector"), {
+    fontSize: token.cellFontSize,
+    paddingInline: calc(token.paddingXS).sub(token.lineWidth).equal()
+  }));
+};
 export var genTableStyle = function genTableStyle(token) {
-  var _ref;
+  var _ref4;
   var antCls = token.antCls,
     componentCls = token.componentCls,
+    iconCls = token.iconCls,
     colorText = token.colorText,
     colorBgBase = token.colorBgBase,
     colorTextSecondary = token.colorTextSecondary,
@@ -20,77 +99,137 @@ export var genTableStyle = function genTableStyle(token) {
     marginLG = token.marginLG,
     marginXS = token.marginXS,
     calc = token.calc;
-  return _ref = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, "".concat(componentCls, "-wrapper ").concat(componentCls), _defineProperty(_defineProperty(_defineProperty({
+  var cellLineHeight = getTableCellLineHeight(token);
+  return _ref4 = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref4, "".concat(componentCls, "-wrapper ").concat(componentCls), _defineProperty(_defineProperty(_defineProperty({
+    lineHeight: cellLineHeight,
     color: colorText,
     backgroundColor: colorBgBase,
     borderRadius: borderRadiusLG
   }, "".concat(componentCls, "-footer"), {
     borderBottom: "1px solid ".concat(colorBorderSecondary),
     borderRadius: 0
-  }), "".concat(componentCls, "-thead > tr"), _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, 'th', {
+  }), "".concat(componentCls, "-thead > tr"), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, 'th', _defineProperty({
     color: colorTextSecondary,
     fontWeight: token.fontWeight,
     backgroundColor: colorBgBase
-  }), "th".concat(componentCls, "-column-has-sorters"), {
+  }, iconCls, {
+    fontSize: token.fontSize,
+    color: token.colorIcon
+  })), "".concat(componentCls, "-column-title"), {
+    flex: 'initial'
+  }), "".concat(componentCls, "-filter-column"), {
+    justifyContent: 'flex-start'
+  }), "th".concat(componentCls, "-column-has-sorters"), _defineProperty({
+    backgroundColor: colorBgBase
+  }, '&:hover', {
     backgroundColor: colorBgBase
-  }), "th".concat(componentCls, "-column-sort:before"), {
+  })), "".concat(componentCls, "-column-sorters"), _defineProperty({
+    justifyContent: 'flex-start',
+    backgroundColor: colorBgBase
+  }, "&:hover ".concat(componentCls, "-column-sorter"), _defineProperty({}, iconCls, {
+    color: token.colorIconHover
+  }))), "".concat(componentCls, "-filter-trigger"), _defineProperty({
+    color: token.colorIcon
+  }, "&:hover", _defineProperty({}, iconCls, {
+    color: token.colorIconHover
+  }))), "th".concat(componentCls, "-column-sort:before"), {
     backgroundColor: "".concat(colorBorderSecondary, " !important")
   }), "".concat(componentCls, "-cell-scrollbar"), {
     boxShadow: "0 1px 0 1px ".concat(colorBgBase)
-  })), "".concat(componentCls, "-tbody"), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls, "-tbody-virtual-scrollbar ").concat(componentCls, "-tbody-virtual-scrollbar-thumb"), {
+  })), "".concat(componentCls, "-tbody"), _objectSpread(_objectSpread(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls, "-tbody-virtual-scrollbar ").concat(componentCls, "-tbody-virtual-scrollbar-thumb"), {
     background: "".concat(token.colorFillSecondary, " !important")
+  }), "".concat(componentCls, "-row-indent+").concat(iconCls), {
+    marginInlineEnd: token.marginXS
   }), "tr".concat(componentCls, "-expand-row-by-click"), {
     cursor: 'pointer'
   }), "tr > td:has(".concat(componentCls, "-row-expand-icon-expanded)"), _defineProperty({
     borderBottom: 'none'
   }, "& ~ td", {
     borderBottom: 'none'
-  })), "tr > td", {
+  })), "tr > td", _defineProperty(_defineProperty({
     fontWeight: token.fontWeight,
-    transition: "background ".concat(token.motionDurationMid),
-    a: {
-      fontWeight: token.fontWeightStrong
-    }
-  }), "".concat(componentCls, "-placeholder td"), {}), "".concat(componentCls, "-empty-wrapper"), {
-    minHeight: calc(360).sub(calc(token.paddingSM).mul(2).equal()).equal(),
+    transition: "background ".concat(token.motionDurationMid)
+  }, "&".concat(antCls, "-table-column-sort"), {
+    backgroundColor: colorBgBase
+  }), "a", {
+    fontWeight: token.fontWeightStrong,
+    // work for ProTable link style；与单元格字号一致
+    fontSize: token.cellFontSize
+  })), genSmallBtnStyle(token)), {}, _defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls, "-placeholder td"), {}), "".concat(componentCls, "-empty-wrapper"), {
+    minHeight: calc(360).sub(calc(token.paddingXS).mul(2).equal()).equal(),
     display: 'flex',
     justifyContent: 'center',
     alignItems: 'center'
-  }), "tr > td > ".concat(componentCls, "-wrapper:only-child ").concat(componentCls), _defineProperty(_defineProperty(_defineProperty(_defineProperty({
+  }), "tr > td > ".concat(componentCls, "-wrapper:only-child ").concat(componentCls), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
     borderBottom: 'none'
   }, "".concat(componentCls, "-thead > tr > th"), {
     backgroundColor: token.colorFillQuaternary
+  }), "".concat(componentCls, "-tbody > tr > td"), {
+    backgroundColor: token.colorFillQuaternary
+  }), "".concat(componentCls, "-tbody > tr:hover > td"), {
+    backgroundColor: token.colorFillTertiary
   }), "".concat(componentCls, "-thead > tr:first-child > th:first-child"), {
     borderRadius: 0
   }), "".concat(componentCls, "-thead > tr:first-child > th:last-child"), {
     borderRadius: 0
   }), "".concat(componentCls, "-empty-wrapper"), {
     minHeight: 'auto'
-  })))), "".concat(componentCls, "-wrapper ").concat(componentCls).concat(componentCls, "-middle"), _defineProperty({}, "".concat(componentCls, "-tbody"), _defineProperty({}, "".concat(componentCls, "-empty-wrapper"), {
+  }))))), "".concat(componentCls, "-wrapper ").concat(componentCls).concat(componentCls, "-middle"), _defineProperty({}, "".concat(componentCls, "-tbody"), _defineProperty({}, "".concat(componentCls, "-empty-wrapper"), {
     minHeight: calc(260).sub(calc(token.paddingXS).mul(2).equal()).equal()
   }))), "".concat(componentCls, "-wrapper ").concat(componentCls).concat(componentCls, "-small"), _defineProperty({}, "".concat(componentCls, "-tbody"), _defineProperty({}, "".concat(componentCls, "-empty-wrapper"), {
     minHeight: calc(160).sub(calc(token.paddingXXS).mul(2).equal()).equal()
   }))), "".concat(componentCls, "-wrapper ").concat(componentCls).concat(componentCls, "-bordered"), _defineProperty({}, "".concat(componentCls, "-footer"), {
     borderRadius: "0px 0px ".concat(unit(token.borderRadiusLG), " ").concat(unit(token.borderRadiusLG))
+  })), "".concat(componentCls, "-wrapper").concat(componentCls, "-thead-multiple-rows ").concat(componentCls).concat(componentCls, "-bordered"), _defineProperty({}, "".concat(componentCls, "-tbody > tr > td:not(").concat(componentCls, "-cell-last-column)"), {
+    borderInlineEnd: 'none'
   })), "".concat(componentCls, "-wrapper").concat(componentCls, "-inner-bordered ").concat(componentCls, "-bordered"), _defineProperty({}, "".concat(componentCls, "-container"), _defineProperty({
     borderInlineStart: 'none',
     borderTop: 'none'
-  }, "".concat(componentCls, "-thead > tr > th, ").concat(componentCls, "-tbody > tr > td"), _defineProperty({}, '&:last-child', {
+  }, "".concat(componentCls, "-thead > tr > th").concat(componentCls, "-cell-last-column,\n          ").concat(componentCls, "-tbody > tr > td").concat(componentCls, "-cell-last-column"), {
     borderInlineEnd: 'none'
-  })))), "".concat(componentCls, "-wrapper ").concat(componentCls, ":not(").concat(componentCls, "-bordered)"), _defineProperty({}, "".concat(componentCls, "-thead, ").concat(componentCls, "-tbody"), _defineProperty({}, 'td, th', _defineProperty(_defineProperty({}, "&".concat(componentCls, "-row-expand-icon-cell"), {
+  }))), "".concat(componentCls, "-wrapper ").concat(componentCls, ":not(").concat(componentCls, "-bordered)"), _defineProperty({}, "".concat(componentCls, "-thead, ").concat(componentCls, "-tbody"), _defineProperty({}, 'td, th', _defineProperty(_defineProperty({}, "&".concat(componentCls, "-row-expand-icon-cell"), {
     // 设置 paddingRight 即可
     paddingRight: token.paddingXS
-  }), "&".concat(componentCls, "-selection-column, &").concat(componentCls, "-row-expand-icon-cell"), _defineProperty({}, "& + td, & + th", {
+  }), "&".concat(componentCls, "-selection-column, &").concat(componentCls, "-row-expand-icon-cell"), _defineProperty({}, "& + td:not([data-ob-user-col]), & + th:not([data-ob-user-col]),\n              & + td[data-ob-user-col=\"0\"], & + th[data-ob-user-col=\"0\"]", {
     paddingLeft: token.paddingXS
-  }))))), "".concat(componentCls, "-wrapper:not(").concat(componentCls, "-expandable):not(").concat(componentCls, "-has-footer) ").concat(componentCls, ":not(").concat(componentCls, "-bordered):not(").concat(componentCls, "-empty)"), {
+  }))))), "".concat(componentCls, "-wrapper:not(").concat(componentCls, "-has-footer):not(").concat(componentCls, "-inner-bordered) ").concat(componentCls).concat(componentCls, "-bordered"), _defineProperty({}, "".concat(componentCls, "-container"), {
+    borderRadius: token.borderRadiusLG
+  })), "".concat(componentCls, "-wrapper:not(").concat(componentCls, "-inner-bordered) ").concat(componentCls).concat(componentCls, "-bordered"), _defineProperty({}, "".concat(componentCls, "-container"), _defineProperty(_defineProperty({}, '&::before, &::after', {
+    borderStartStartRadius: token.borderRadiusMD,
+    borderStartEndRadius: token.borderRadiusMD
+  }), "".concat(componentCls, "-content"), {
+    borderStartStartRadius: token.borderRadiusLG,
+    borderStartEndRadius: token.borderRadiusLG
+  }))), "".concat(componentCls, "-wrapper").concat(componentCls, "-virtual:not(").concat(componentCls, "-has-footer):not(").concat(componentCls, "-inner-bordered) ").concat(componentCls).concat(componentCls, "-bordered"), _defineProperty(_defineProperty({}, "".concat(componentCls, "-tbody-virtual-holder"), {
+    borderEndStartRadius: token.borderRadiusLG,
+    borderEndEndRadius: token.borderRadiusLG,
+    borderBottom: "1px solid ".concat(token.colorBorderSecondary)
+  }), "".concat(componentCls, "-tbody-virtual::after"), {
+    borderBottom: 'none'
+  })), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref4, "".concat(componentCls, "-wrapper:not(").concat(componentCls, "-has-footer):not(").concat(componentCls, "-has-rowspan-first):not(").concat(componentCls, "-has-rowspan-last):not(").concat(componentCls, "-has-rowspan-both):not(").concat(componentCls, "-virtual):not(").concat(componentCls, "-inner-bordered) ").concat(componentCls).concat(componentCls, "-bordered"), _defineProperty({}, "".concat(componentCls, "-tbody"), _defineProperty(_defineProperty({}, "tr:last-child > *:first-child", {
+    borderEndStartRadius: token.borderRadiusLG
+  }), "tr:last-child > *:last-child", {
+    borderEndEndRadius: token.borderRadiusLG
+  }))), "".concat(componentCls, "-wrapper:is(").concat(componentCls, "-has-rowspan-first, ").concat(componentCls, "-has-rowspan-both):not(").concat(componentCls, "-has-footer):not(").concat(componentCls, "-virtual):not(").concat(componentCls, "-inner-bordered) ").concat(componentCls).concat(componentCls, "-bordered"), _defineProperty({}, "".concat(componentCls, "-tbody"), _defineProperty({}, "tr:nth-last-child(2) > td[rowspan=\"2\"]:first-child,\n            tr:nth-last-child(3) > td[rowspan=\"3\"]:first-child,\n            tr:nth-last-child(4) > td[rowspan=\"4\"]:first-child,\n            tr:nth-last-child(5) > td[rowspan=\"5\"]:first-child,\n            tr:nth-last-child(6) > td[rowspan=\"6\"]:first-child,\n            tr:nth-last-child(7) > td[rowspan=\"7\"]:first-child,\n            tr:nth-last-child(8) > td[rowspan=\"8\"]:first-child,\n            tr:nth-last-child(9) > td[rowspan=\"9\"]:first-child,\n            tr:nth-last-child(10) > td[rowspan=\"10\"]:first-child,\n            tr:last-child > td[rowspan]:first-child", {
+    borderEndStartRadius: token.borderRadiusLG
+  }))), "".concat(componentCls, "-wrapper:is(").concat(componentCls, "-has-rowspan-last, ").concat(componentCls, "-has-rowspan-both):not(").concat(componentCls, "-has-footer):not(").concat(componentCls, "-virtual):not(").concat(componentCls, "-inner-bordered) ").concat(componentCls).concat(componentCls, "-bordered"), _defineProperty({}, "".concat(componentCls, "-tbody"), _defineProperty({}, "tr:nth-last-child(2) > td[rowspan=\"2\"]".concat(componentCls, "-cell-last-column,\n            tr:nth-last-child(3) > td[rowspan=\"3\"]").concat(componentCls, "-cell-last-column,\n            tr:nth-last-child(4) > td[rowspan=\"4\"]").concat(componentCls, "-cell-last-column,\n            tr:nth-last-child(5) > td[rowspan=\"5\"]").concat(componentCls, "-cell-last-column,\n            tr:nth-last-child(6) > td[rowspan=\"6\"]").concat(componentCls, "-cell-last-column,\n            tr:nth-last-child(7) > td[rowspan=\"7\"]").concat(componentCls, "-cell-last-column,\n            tr:nth-last-child(8) > td[rowspan=\"8\"]").concat(componentCls, "-cell-last-column,\n            tr:nth-last-child(9) > td[rowspan=\"9\"]").concat(componentCls, "-cell-last-column,\n            tr:nth-last-child(10) > td[rowspan=\"10\"]").concat(componentCls, "-cell-last-column,\n            tr:last-child > td[rowspan]").concat(componentCls, "-cell-last-column"), {
+    borderEndEndRadius: token.borderRadiusLG
+  }))), "".concat(componentCls, "-wrapper").concat(componentCls, "-has-rowspan-first:not(").concat(componentCls, "-has-footer):not(").concat(componentCls, "-virtual):not(").concat(componentCls, "-inner-bordered) ").concat(componentCls).concat(componentCls, "-bordered"), _defineProperty({}, "".concat(componentCls, "-tbody"), _defineProperty({}, "tr:last-child > td".concat(componentCls, "-cell-last-column"), {
+    borderEndEndRadius: token.borderRadiusLG
+  }))), "".concat(componentCls, "-wrapper").concat(componentCls, "-has-rowspan-last:not(").concat(componentCls, "-has-footer):not(").concat(componentCls, "-virtual):not(").concat(componentCls, "-inner-bordered) ").concat(componentCls).concat(componentCls, "-bordered"), _defineProperty({}, "".concat(componentCls, "-tbody"), _defineProperty({}, "tr:last-child > *:first-child", {
+    borderEndStartRadius: token.borderRadiusLG
+  }))), "".concat(componentCls, "-wrapper:not(").concat(componentCls, "-expandable):not(").concat(componentCls, "-has-footer):not(").concat(componentCls, "-no-pagination) ").concat(componentCls, ":not(").concat(componentCls, "-bordered):not(").concat(componentCls, "-empty)"), {
     borderBottomLeftRadius: 0,
     borderBottomRightRadius: 0
-  }), "".concat(componentCls, "-wrapper").concat(componentCls, "-expandable"), _defineProperty(_defineProperty({}, "".concat(componentCls), _defineProperty({}, "".concat(componentCls, "-tbody"), _defineProperty(_defineProperty({}, "".concat(componentCls, "-expanded-row > td"), _defineProperty(_defineProperty({}, "& > *:not(".concat(componentCls, "-wrapper):not(").concat(componentCls, "-expanded-row-fixed)"), {
+  }), "".concat(componentCls, "-wrapper").concat(componentCls, "-expandable"), _defineProperty(_defineProperty({}, "".concat(componentCls), _defineProperty({}, "".concat(componentCls, "-tbody"), _defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls, "-expanded-row > td"), _defineProperty(_defineProperty({}, "& > *:not(".concat(componentCls, "-wrapper):not(").concat(componentCls, "-expanded-row-fixed)"), {
     marginLeft: calc(token.marginXL).add(calc(token.lineWidth).mul(2).equal()).equal()
   }), "& > *".concat(componentCls, "-expanded-row-fixed"), {
-    paddingLeft: calc(token.marginXL).add(calc(token.lineWidth).mul(2).equal()).add(token.padding).equal()
+    paddingLeft: calc(token.marginXL).add(calc(token.lineWidth).mul(2).equal()).add(token.padding).equal(),
+    margin: "-".concat(unit(token.marginXS), " -").concat(unit(token.margin))
   })), "tr > td > ".concat(componentCls, "-wrapper:only-child ").concat(componentCls), {
     marginLeft: calc(token.margin).add(calc(token.lineWidth).mul(2).equal()).equal()
+  }), "tr > td > ".concat(componentCls, "-expanded-row-fixed > ").concat(componentCls, "-wrapper:only-child ").concat(componentCls), {
+    marginLeft: -token.padding
   }))), "".concat(componentCls, "-middle, ").concat(componentCls, "-small"), _defineProperty({}, "".concat(componentCls, "-tbody"), _defineProperty({}, "tr > td > ".concat(componentCls, "-wrapper:only-child ").concat(componentCls), {
     marginLeft: calc(token.margin).add(calc(token.lineWidth).mul(2).equal()).add(token.margin).equal()
   })))), "".concat(componentCls, "-wrapper").concat(componentCls, "-expandable").concat(componentCls, "-selectable"), _defineProperty(_defineProperty({}, "".concat(componentCls), _defineProperty({}, "".concat(componentCls, "-tbody"), _defineProperty(_defineProperty({}, "".concat(componentCls, "-expanded-row > td"), _defineProperty(_defineProperty({}, "& > *:not(".concat(componentCls, "-wrapper):not(").concat(componentCls, "-expanded-row-fixed)"), {
@@ -104,29 +243,24 @@ export var genTableStyle = function genTableStyle(token) {
   })))), "".concat(componentCls, "-wrapper ").concat(antCls, "-spin-blur"), _defineProperty({}, "".concat(componentCls, "-tbody"), _defineProperty({}, "".concat(componentCls, "-placeholder"), {
     // hide empty when Table loading
     visibility: 'hidden'
-  }))), _defineProperty(_defineProperty(_defineProperty(_ref, "".concat(componentCls, "-wrapper"), _defineProperty({}, "".concat(componentCls, "-pagination"), _defineProperty(_defineProperty({}, "&".concat(antCls, "-pagination"), {
-    padding: "".concat(unit(padding), " 0"),
-    margin: '0 !important'
-  }), "".concat(componentCls, "-batch-operation-bar"), _defineProperty({
+  }))), "".concat(componentCls, "-wrapper"), _defineProperty({}, "".concat(componentCls, "-pagination"), _defineProperty(_defineProperty({}, "&".concat(antCls, "-pagination"), _objectSpread(_defineProperty({
+    padding: "".concat(unit(token.paddingSM), " 0"),
+    margin: 0
+  }, "".concat(componentCls, "-wrapper").concat(componentCls, "-has-bordered &"), {
+    marginInlineEnd: marginLG
+  }), genSmallPaginationStyle(token))), "".concat(componentCls, "-batch-operation-bar"), _objectSpread(_defineProperty({
     position: 'absolute',
     left: 0,
     display: 'inline-block',
     marginRight: marginLG
-  }, "".concat(componentCls, "-batch-operation-selection"), _defineProperty({
-    color: colorTextSecondary,
-    fontWeight: token.fontWeightStrong
-  }, "".concat(componentCls, "-batch-operation-selection-count"), {
-    margin: "0 ".concat(unit(marginXS)),
-    color: colorLink
-  }))))), "".concat(antCls, "-popover").concat(componentCls, "-batch-operation-selection-popover"), _defineProperty({}, "".concat(antCls, "-popover-inner"), {
+  }, "".concat(componentCls, "-batch-operation-selection"), {}), genSmallBtnStyle(token))))), _defineProperty(_defineProperty(_ref4, "".concat(antCls, "-popover").concat(componentCls, "-batch-operation-selection-popover"), _defineProperty({}, "".concat(antCls, "-popover-inner"), {
     padding: 0
   })), "".concat(antCls, "-popover, ").concat(antCls, "-tooltip"), _defineProperty({}, "".concat(componentCls, " ").concat(componentCls, "-tbody"), _defineProperty({}, "".concat(componentCls, "-empty-wrapper"), {
     minHeight: 'auto'
   })));
 };
-export default (function (prefixCls) {
-  var useStyle = genComponentStyleHook('Table', function (token) {
-    return [genTableStyle(token)];
-  });
-  return useStyle(prefixCls);
-});
+
+// 经 genComponentStyleHook 注册为 ['Table','oceanbase']：合并 components.Table，且不与 antd 主 Table 样式钩子冲突。
+export default genStyleHooks('Table', function (token) {
+  return [genTableStyle(token)];
+}, prepareComponentToken);

package/es/tabs/TabPane.js

@@ -1,2 +1,3 @@
+"use client";
 import { Tabs as AntTabs } from 'antd';
 export default AntTabs.TabPane;

package/es/tabs/hooks/useLegacyItems.js

@@ -1,3 +1,4 @@
+"use client";
 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 = ["tab"];
 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; }

package/es/tabs/index.js

@@ -1,3 +1,4 @@
+"use client";
 var _excluded = ["children", "divider", "items", "type", "tabPosition", "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; }
@@ -5,6 +6,12 @@ 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); }
+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 _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, { useCallback, useContext } from 'react';
@@ -37,7 +44,8 @@ var Tabs = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     getPrefixCls = _useContext.getPrefixCls;
   var prefixCls = getPrefixCls('tabs', customizePrefixCls);
   var _useStyle = useStyle(prefixCls),
-    wrapSSR = _useStyle.wrapSSR;
+    _useStyle2 = _slicedToArray(_useStyle, 1),
+    wrapCSSVar = _useStyle2[0];
   var tabsCls = classNames(className, _defineProperty({}, "".concat(prefixCls, "-no-divider"), !divider));
   var isHorizontal = !tabPosition || tabPosition === 'top' || tabPosition === 'bottom';
   var dividerList = (items === null || items === void 0 ? void 0 : items.filter(function (item) {
@@ -81,7 +89,7 @@ var Tabs = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     }
     return item;
   });
-  return wrapSSR( /*#__PURE__*/_jsx(AntTabs, _objectSpread({
+  return wrapCSSVar( /*#__PURE__*/_jsx(AntTabs, _objectSpread({
     ref: ref,
     items: newItems,
     type: type,

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

@@ -3,8 +3,5 @@ import type { CSSObject } from '@ant-design/cssinjs';
 import type { FullToken } from '../../theme/interface';
 export type TabsToken = FullToken<'Tabs'>;
 export declare const genTabsStyle: (token: Partial<TabsToken>) => CSSObject;
-declare const _default: (prefixCls: string) => {
-    wrapSSR: (node: import("react").ReactNode) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
-    hashId: string;
-};
+declare const _default: (prefixCls: string, rootCls?: string) => readonly [(node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>, string, string];
 export default _default;

package/es/tabs/style/index.js

@@ -2,7 +2,7 @@ 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); }
-import { genComponentStyleHook } from "../../_util/genComponentStyleHook";
+import { genStyleHooks } from "../../_util/genComponentStyleHook";
 export var genTabsStyle = function genTabsStyle(token) {
   var antCls = token.antCls,
     componentCls = token.componentCls,
@@ -14,7 +14,9 @@ export var genTabsStyle = function genTabsStyle(token) {
     border: 'none'
   }))), "&".concat(componentCls, "-left, &").concat(componentCls, "-right"), _defineProperty({}, "".concat(componentCls, "-tab[data-node-key^=divider-]"), {
     paddingBlock: 0
-  })), "".concat(componentCls, "-tab"), _defineProperty(_defineProperty({}, "".concat(componentCls, "-tab-tag"), {
+  })), "".concat(componentCls, "-tab"), _defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls, "-tab-btn:hover"), {
+    textShadow: '0 0 0.25px currentcolor'
+  }), "".concat(componentCls, "-tab-tag"), {
     color: colorTextSecondary,
     fontSize: 12,
     borderRadius: 12,
@@ -45,9 +47,6 @@ export var genTabsStyle = function genTabsStyle(token) {
     borderRadius: '1px'
   }));
 };
-export default (function (prefixCls) {
-  var useStyle = genComponentStyleHook('Tabs', function (token) {
-    return [genTabsStyle(token)];
-  });
-  return useStyle(prefixCls);
+export default genStyleHooks('Tabs', function (token) {
+  return [genTabsStyle(token)];
 });

package/es/tag/index.js

@@ -1,10 +1,17 @@
+"use client";
 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", "prefixCls", "icon", "className", "ellipsis", "pill"];
+var _excluded = ["children", "prefixCls", "icon", "color", "closable", "ellipsis", "pill", "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 _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 _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';
@@ -21,7 +28,8 @@ var Tag = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var children = _ref.children,
     customizePrefixCls = _ref.prefixCls,
     icon = _ref.icon,
-    className = _ref.className,
+    colorProp = _ref.color,
+    closable = _ref.closable,
     _ref$ellipsis = _ref.ellipsis,
     ellipsis = _ref$ellipsis === void 0 ? {
       tooltip: {
@@ -29,23 +37,30 @@ var Tag = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       }
     } : _ref$ellipsis,
     pill = _ref.pill,
+    className = _ref.className,
     restProps = _objectWithoutProperties(_ref, _excluded);
   var _useContext = useContext(ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
   var prefixCls = getPrefixCls('tag', customizePrefixCls);
   var _useStyle = useStyle(prefixCls),
-    wrapSSR = _useStyle.wrapSSR;
+    _useStyle2 = _slicedToArray(_useStyle, 1),
+    wrapCSSVar = _useStyle2[0];
+  var isCritical = colorProp === 'critical';
   var ellipsisConfig = getEllipsisConfig(ellipsis, children);
-  var tagCls = classNames(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-ellipsis"), !!ellipsisConfig), "".concat(prefixCls, "-pill"), pill), className);
+  var tagCls = classNames(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-closable"), !!closable), "".concat(prefixCls, "-ellipsis"), !!ellipsisConfig), "".concat(prefixCls, "-pill"), pill), "".concat(prefixCls, "-critical"), isCritical), className);
   var realIcon = icon ? /*#__PURE__*/_jsx("span", {
     className: "".concat(prefixCls, "-icon"),
     children: icon
   }) : null;
-  return wrapSSR( /*#__PURE__*/_jsx(AntTag, _objectSpread(_objectSpread({
+  return wrapCSSVar( /*#__PURE__*/_jsx(AntTag, _objectSpread(_objectSpread({
     ref: ref,
     prefixCls: customizePrefixCls,
     className: tagCls,
     icon: ellipsisConfig ? null : icon
+    // treat critical as preset status, avoid being treated as custom color
+    ,
+    color: isCritical ? undefined : colorProp,
+    closable: closable
   }, restProps), {}, {
     children: ellipsisConfig ? /*#__PURE__*/_jsxs(Typography.Text, {
       ellipsis: ellipsisConfig,

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

@@ -3,8 +3,5 @@ import type { CSSObject } from '@ant-design/cssinjs';
 import type { FullToken } from '../../theme/interface';
 export type TagToken = FullToken<'Tag'>;
 export declare const genTagStyle: (token: TagToken) => CSSObject;
-declare const _default: (prefixCls: string) => {
-    wrapSSR: (node: import("react").ReactNode) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
-    hashId: string;
-};
+declare const _default: (prefixCls: string, rootCls?: string) => readonly [(node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>, string, string];
 export default _default;

package/es/tag/style/index.js

@@ -2,38 +2,60 @@ 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); }
+import { unit } from '@ant-design/cssinjs';
 import { mergeToken } from 'antd/es/theme/internal';
-import { genComponentStyleHook } from "../../_util/genComponentStyleHook";
+import { genStyleHooks } from "../../_util/genComponentStyleHook";
 var genTagPresetStatusStyle = function genTagPresetStatusStyle(token, status) {
   var colorMap = {
     success: token.colorSuccessText,
     processing: token.colorInfoText,
+    warning: token.colorWarningText,
     error: token.colorErrorText,
-    warning: token.colorWarningText
+    critical: token.colorFuchsiaText
   };
-  return _defineProperty({}, "".concat(token.componentCls).concat(token.componentCls, "-").concat(status), {
-    color: colorMap[status]
-  });
+  var bgMap = {
+    success: token.colorSuccessBg,
+    processing: token.colorInfoBg,
+    warning: token.colorWarningBg,
+    error: token.colorErrorBg,
+    critical: token.colorFuchsiaBg
+  };
+  var borderMap = {
+    success: token.colorSuccessBorder,
+    processing: token.colorInfoBorder,
+    warning: token.colorWarningBorder,
+    error: token.colorErrorBorder,
+    critical: token.colorFuchsiaBorder
+  };
+  return _defineProperty({}, "".concat(token.componentCls).concat(token.componentCls, "-").concat(status), _defineProperty({
+    color: colorMap[status],
+    background: bgMap[status],
+    borderColor: borderMap[status]
+  }, "&".concat(token.componentCls, "-borderless"), {
+    borderColor: 'transparent'
+  }));
 };
 export var genTagStyle = function genTagStyle(token) {
   var antCls = token.antCls,
-    componentCls = token.componentCls,
-    iconCls = token.iconCls;
+    iconCls = token.iconCls,
+    componentCls = token.componentCls;
+  var typographyComponentCls = "".concat(antCls, "-typography");
   return _defineProperty({}, "".concat(componentCls), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
     paddingInline: token.paddingXS,
     fontSize: token.fontSizeSM
-  }, "&:not(".concat(componentCls, "-pill)"), {
-    fontWeight: token.fontWeightStrong
-  }), "".concat(componentCls, "-close-icon").concat(iconCls), {
+  }, "".concat(componentCls, "-close-icon").concat(iconCls), {
     marginInlineStart: token.marginXXS
   }), "".concat(antCls, "-typography"), _defineProperty({}, "".concat(componentCls, "-icon"), {
     marginInlineEnd: token.marginXXS
   })), '&-ellipsis', {
     maxWidth: '100%',
-    textOverflow: 'ellipsis',
-    overflow: 'hidden',
     verticalAlign: 'bottom'
-  }), '&-checkable', {
+  }), '&-closable&-ellipsis', _defineProperty({
+    verticalAlign: 'bottom'
+  }, "".concat(typographyComponentCls), {
+    // maxWidth should match (close icon left margin + tag right padding)
+    maxWidth: "calc(100% - ".concat(unit(token.marginSM), ")")
+  })), '&-checkable', {
     borderColor: 'transparent'
   }), '&-hidden', {
     display: 'none'
@@ -41,14 +63,14 @@ export var genTagStyle = function genTagStyle(token) {
     borderColor: 'transparent'
   }), '&-pill', {
     borderRadius: 100,
-    lineHeight: token.lineHeight,
-    marginInlineEnd: token.marginXXS
+    marginInlineEnd: token.marginXXS,
+    borderColor: token.colorBorderSecondary,
+    color: token.colorTextSecondary,
+    // pill tag use smaller line-height
+    lineHeight: unit(token.fontHeightSM)
   }));
 };
-export default (function (prefixCls) {
-  var useStyle = genComponentStyleHook('Tag', function (token) {
-    var tagToken = mergeToken(token, {});
-    return [genTagStyle(tagToken), genTagPresetStatusStyle(tagToken, 'success'), genTagPresetStatusStyle(tagToken, 'error'), genTagPresetStatusStyle(tagToken, 'processing'), genTagPresetStatusStyle(tagToken, 'warning')];
-  });
-  return useStyle(prefixCls);
+export default genStyleHooks('Tag', function (token) {
+  var tagToken = mergeToken(token, {});
+  return [genTagStyle(tagToken), genTagPresetStatusStyle(tagToken, 'success'), genTagPresetStatusStyle(tagToken, 'error'), genTagPresetStatusStyle(tagToken, 'processing'), genTagPresetStatusStyle(tagToken, 'warning'), genTagPresetStatusStyle(tagToken, 'critical')];
 });