@dtjoy/dt-design 1.0.5 → 1.0.6

package/esm/_util/convertToTooltipProps.d.ts

@@ -0,0 +1,4 @@
+import type { ReactNode } from 'react';
+import { TooltipProps } from 'antd';
+declare const convertToTooltipProps: <P extends TooltipProps>(tooltip: P | ReactNode) => P | null;
+export default convertToTooltipProps;

package/esm/_util/convertToTooltipProps.js

@@ -0,0 +1,15 @@
+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 { isValidElement } from 'react';
+import isNonNullable from "./isNonNullable";
+var convertToTooltipProps = function convertToTooltipProps(tooltip) {
+  if (!isNonNullable(tooltip)) {
+    return null;
+  }
+  if (_typeof(tooltip) === 'object' && ! /*#__PURE__*/isValidElement(tooltip)) {
+    return tooltip;
+  }
+  return {
+    title: tooltip
+  };
+};
+export default convertToTooltipProps;

package/esm/_util/hooks/useZIndex.d.ts

@@ -0,0 +1,8 @@
+export declare type ZIndexContainer = 'Modal' | 'Drawer' | 'Popover' | 'Popconfirm' | 'Tooltip' | 'Tour' | 'FloatButton';
+export declare type ZIndexConsumer = 'SelectLike' | 'Dropdown' | 'DatePicker' | 'Menu' | 'ImagePreview';
+export declare const CONTAINER_MAX_OFFSET: number;
+export declare const containerBaseZIndexOffset: Record<ZIndexContainer, number>;
+export declare const consumerBaseZIndexOffset: Record<ZIndexConsumer, number>;
+declare type ReturnResult = [zIndex: number | undefined, contextZIndex: number];
+export declare const useZIndex: (componentType: ZIndexContainer | ZIndexConsumer, customZIndex?: number) => ReturnResult;
+export {};

package/esm/_util/hooks/useZIndex.js

@@ -0,0 +1,51 @@
+import React from 'react';
+import { devUseWarning } from "../warning";
+import zIndexContext from "../zindexContext";
+var DEFAULT_Z_INDEX_POPUP_BASE = 1000;
+var CONTAINER_OFFSET = 100;
+var CONTAINER_OFFSET_MAX_COUNT = 10;
+export var CONTAINER_MAX_OFFSET = CONTAINER_OFFSET * CONTAINER_OFFSET_MAX_COUNT;
+var CONTAINER_MAX_OFFSET_WITH_CHILDREN = CONTAINER_MAX_OFFSET + CONTAINER_OFFSET;
+export var containerBaseZIndexOffset = {
+  Modal: CONTAINER_OFFSET,
+  Drawer: CONTAINER_OFFSET,
+  Popover: CONTAINER_OFFSET,
+  Popconfirm: CONTAINER_OFFSET,
+  Tooltip: CONTAINER_OFFSET,
+  Tour: CONTAINER_OFFSET,
+  FloatButton: CONTAINER_OFFSET
+};
+export var consumerBaseZIndexOffset = {
+  SelectLike: 50,
+  Dropdown: 50,
+  DatePicker: 50,
+  Menu: 50,
+  ImagePreview: 1
+};
+var isContainerType = function isContainerType(type) {
+  return type in containerBaseZIndexOffset;
+};
+export var useZIndex = function useZIndex(componentType, customZIndex) {
+  var zIndexPopupBase = DEFAULT_Z_INDEX_POPUP_BASE;
+  var parentZIndex = React.useContext(zIndexContext);
+  var isContainer = isContainerType(componentType);
+  var result;
+  if (customZIndex !== undefined) {
+    result = [customZIndex, customZIndex];
+  } else {
+    var _zIndex = parentZIndex !== null && parentZIndex !== void 0 ? parentZIndex : 0;
+    if (isContainer) {
+      _zIndex += (parentZIndex ? 0 : zIndexPopupBase) + containerBaseZIndexOffset[componentType];
+    } else {
+      _zIndex += consumerBaseZIndexOffset[componentType];
+    }
+    result = [customZIndex !== null && customZIndex !== void 0 ? customZIndex : _zIndex, _zIndex];
+  }
+  if (process.env.NODE_ENV !== 'production') {
+    var warning = devUseWarning(componentType);
+    var maxZIndex = zIndexPopupBase + CONTAINER_MAX_OFFSET_WITH_CHILDREN;
+    var currentZIndex = result[0] || 0;
+    warning(customZIndex !== undefined || currentZIndex <= maxZIndex, 'usage', '`zIndex` is over design token `zIndexPopupBase` too much. It may cause unexpected override.');
+  }
+  return result;
+};

package/esm/_util/warning.d.ts

@@ -0,0 +1,31 @@
+import * as React from 'react';
+export declare function noop(): void;
+export declare function resetWarned(): void;
+declare type Warning = (valid: boolean, component: string, message?: string) => void;
+declare const warning: Warning;
+declare type BaseTypeWarning = (valid: boolean, 
+/**
+ * - deprecated: Some API will be removed in future but still support now.
+ * - usage: Some API usage is not correct.
+ * - breaking: Breaking change like API is removed.
+ */
+type: 'deprecated' | 'usage' | 'breaking', message?: string) => void;
+declare type TypeWarning = BaseTypeWarning & {
+    deprecated: (valid: boolean, oldProp: string, newProp: string, message?: string) => void;
+};
+export interface WarningContextProps {
+    /**
+     * @descCN 设置警告等级，设置 `false` 时会将废弃相关信息聚合为单条信息。
+     * @descEN Set the warning level. When set to `false`, discard related information will be aggregated into a single message.
+     * @since 5.10.0
+     */
+    strict?: boolean;
+}
+export declare const WarningContext: React.Context<WarningContextProps>;
+/**
+ * This is a hook but we not named as `useWarning`
+ * since this is only used in development.
+ * We should always wrap this in `if (process.env.NODE_ENV !== 'production')` condition
+ */
+export declare const devUseWarning: (component: string) => TypeWarning;
+export default warning;

package/esm/_util/warning.js

@@ -0,0 +1,63 @@
+import * as React from 'react';
+import rcWarning from 'rc-util/lib/warning';
+export function noop() {}
+var rcResetWarned = rcWarning.resetWarned;
+var deprecatedWarnList = null;
+export function resetWarned() {
+  deprecatedWarnList = null;
+  rcResetWarned();
+}
+var _warning = noop;
+if (process.env.NODE_ENV !== 'production') {
+  _warning = function _warning(valid, component, message) {
+    rcWarning(valid, "[antd: ".concat(component, "] ").concat(message));
+
+    // StrictMode will inject console which will not throw warning in React 17.
+    if (process.env.NODE_ENV === 'test') {
+      resetWarned();
+    }
+  };
+}
+var warning = _warning;
+export var WarningContext = /*#__PURE__*/React.createContext({});
+
+/**
+ * This is a hook but we not named as `useWarning`
+ * since this is only used in development.
+ * We should always wrap this in `if (process.env.NODE_ENV !== 'production')` condition
+ */
+export var devUseWarning = process.env.NODE_ENV !== 'production' ? function (component) {
+  var _React$useContext = React.useContext(WarningContext),
+    strict = _React$useContext.strict;
+  var typeWarning = function typeWarning(valid, type, message) {
+    if (!valid) {
+      if (strict === false && type === 'deprecated') {
+        var existWarning = deprecatedWarnList;
+        if (!deprecatedWarnList) {
+          deprecatedWarnList = {};
+        }
+        deprecatedWarnList[component] = deprecatedWarnList[component] || [];
+        if (!deprecatedWarnList[component].includes(message || '')) {
+          deprecatedWarnList[component].push(message || '');
+        }
+
+        // Warning for the first time
+        if (!existWarning) {
+          console.warn('[antd] There exists deprecated usage in your code:', deprecatedWarnList);
+        }
+      } else {
+        warning(valid, component, message);
+      }
+    }
+  };
+  typeWarning.deprecated = function (valid, oldProp, newProp) {
+    var message = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';
+    typeWarning(valid, 'deprecated', "`".concat(oldProp, "` is deprecated. Please use `").concat(newProp, "` instead.").concat(message ? " ".concat(message) : ''));
+  };
+  return typeWarning;
+} : function () {
+  var noopWarning = function noopWarning() {};
+  noopWarning.deprecated = noop;
+  return noopWarning;
+};
+export default warning;

package/esm/_util/zindexContext.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const zIndexContext: React.Context<number | undefined>;
+export default zIndexContext;

package/esm/_util/zindexContext.js

@@ -0,0 +1,6 @@
+import React from 'react';
+var zIndexContext = /*#__PURE__*/React.createContext(undefined);
+if (process.env.NODE_ENV !== 'production') {
+  zIndexContext.displayName = 'zIndexContext';
+}
+export default zIndexContext;

package/esm/blockHeader/index.d.ts

@@ -1,8 +1,9 @@
 import React, { ReactNode } from 'react';
 import './style';
 import { LabelTooltipType } from '../_util';
+import type { CollapsibleProps } from '../collapsible';
 export declare type SizeType = 'small' | 'middle' | 'large';
-export interface IBlockHeaderProps {
+export interface IBlockHeaderProps extends CollapsibleProps {
     /** 标题 */
     title: ReactNode;
     /** 标题前的图标，默认是一个色块 */

package/esm/blockHeader/index.js

@@ -1,4 +1,5 @@
 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 = ["title", "description", "tooltip", "size", "spaceBottom", "className", "contentClassName", "style", "contentStyle", "background", "defaultExpand", "addonAfter", "expand", "children", "addonBefore", "onExpand", "titleStyle"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 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; }
@@ -11,6 +12,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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, { useState } from 'react';
 import { QuestionCircleOutlined, UpOutlined } from '@ant-design/icons';
 import { Tooltip } from 'antd';
@@ -53,7 +56,8 @@ var BlockHeader = function BlockHeader(props) {
       className: "addon-before--default"
     }) : _props$addonBefore,
     onExpand = props.onExpand,
-    titleStyle = props.titleStyle;
+    titleStyle = props.titleStyle,
+    rest = _objectWithoutProperties(props, _excluded);
   var _useState = useState(defaultExpand),
     _useState2 = _slicedToArray(_useState, 2),
     internalExpand = _useState2[0],
@@ -106,9 +110,9 @@ var BlockHeader = function BlockHeader(props) {
       'collapse__icon--up': currentExpand,
       'collapse__icon--down': !currentExpand
     })
-  }))), /*#__PURE__*/React.createElement(Collapsible, {
+  }))), /*#__PURE__*/React.createElement(Collapsible, _extends({
     isOpen: !currentExpand
-  }, /*#__PURE__*/React.createElement("div", {
+  }, rest), /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(prefixCls, "__content"), contentClassName, _defineProperty({}, "".concat(prefixCls, "__content--active"), currentExpand || !showCollapse)),
     style: contentStyle
   }, children)));

package/esm/button/index.d.ts

@@ -6,5 +6,5 @@ declare type ButtonType = AntdButtonType | 'secondary' | 'tertiary';
 export interface ButtonProps extends Omit<AntdButtonProps, 'type'> {
     type?: ButtonType;
 }
-export default function Button({ className, icon, children, size, type, ...rest }: ButtonProps): React.JSX.Element;
-export {};
+declare const _default: React.ForwardRefExoticComponent<ButtonProps & React.RefAttributes<HTMLElement>>;
+export default _default;

package/esm/button/index.js

@@ -1,29 +1,21 @@
-var _excluded = ["className", "icon", "children", "size", "type"];
+var _excluded = ["className", "size", "type"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 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 from 'react';
 import { Button as AntdButton } from 'antd';
-import { globalConfig } from 'antd/es/config-provider';
 import classNames from 'classnames';
 import "./style";
-export default function Button(_ref) {
+function Button(_ref) {
   var className = _ref.className,
-    icon = _ref.icon,
-    children = _ref.children,
     _ref$size = _ref.size,
     size = _ref$size === void 0 ? 'middle' : _ref$size,
     type = _ref.type,
     rest = _objectWithoutProperties(_ref, _excluded);
-  var prefixCls = globalConfig().getPrefixCls('btn');
-  var typeClassName = type ? "".concat(prefixCls, "--").concat(type) : '';
   return /*#__PURE__*/React.createElement(AntdButton, _extends({
-    className: classNames(prefixCls, className, typeClassName),
+    className: classNames(className),
     size: size,
     type: type
-  }, rest), icon && /*#__PURE__*/React.createElement("span", {
-    className: "".concat(prefixCls, "__icon ").concat(prefixCls, "__icon--").concat(size)
-  }, icon), children && /*#__PURE__*/React.createElement("span", {
-    className: "".concat(prefixCls, "__text ").concat(prefixCls, "__text--").concat(size)
-  }, children));
-}
+  }, rest));
+}
+export default Button;

package/esm/button/style/index.less

@@ -3,132 +3,57 @@
 
 @btn-prefix-cls: ~'@{ant-prefix}-btn';
 
-.@{btn-prefix-cls} {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-
-    // 引用中尺寸配置（核心：先调用混入，再取值）
-    .btn-size-middle();
-    padding: @padding;
-
-    // 图标样式
-    &__icon {
-        display: inline-flex;
-        align-items: center;
-        justify-content: center;
-        font-size: inherit;
-        line-height: 0;
-
-        .dtstack-icon {
-            font-size: inherit;
-        }
-
-        // 小尺寸图标
-        &--small {
-            .btn-size-small();
-            font-size: @icon-font-size;
-        }
-        // 中尺寸图标
-        &--middle {
-            .btn-size-middle();
-            font-size: @icon-font-size;
-        }
-        // 大尺寸图标
-        &--large {
-            .btn-size-large();
-            font-size: @icon-font-size;
-        }
-
-        // 图标与文字间距
-        & + .@{btn-prefix-cls}__text {
-            &--small {
-                .btn-size-small();
-                margin-left: @icon-text-margin;
-            }
-            &--middle {
-                .btn-size-middle();
-                margin-left: @icon-text-margin;
-            }
-            &--large {
-                .btn-size-large();
-                margin-left: @icon-text-margin;
-            }
-        }
-    }
-
-    // 文字样式
-    &__text {
-        display: inline-block;
-
-        &--small {
-            .btn-size-small();
-            font-size: @text-font-size;
-        }
-        &--middle {
-            .btn-size-middle();
-            font-size: @text-font-size;
-        }
-        &--large {
-            .btn-size-large();
-            font-size: @text-font-size;
-        }
-    }
-
-    // 尺寸变体
-    &-sm {
-        .btn-size-small();
-        padding: @padding;
-    }
-    &-lg {
-        .btn-size-large();
-        padding: @padding;
-    }
-
-    // 主要按钮
-    &-primary {
-        .btn-disabled-primary();
-        .generate-btn-disabled(@bg, @color, @border);
-
-        &:hover,
-        &:focus {
-            background-color: #225fdb;
-        }
-    }
-
-    // 次要按钮
-    &-secondary {
-        border-color: @primary-color;
-        color: @primary-color;
-
-        &:hover,
-        &:focus {
-            background-color: fade(@primary-color, 10%);
-        }
-
-        .btn-disabled-secondary-tertiary();
-        .generate-btn-disabled(@bg, @color, @border);
-    }
-
-    // 三级按钮
-    &-tertiary {
-        background-color: #f3f3f3;
-        border-color: @border-color-base;
-
-        &:hover,
-        &:focus {
-            background-color: fade(@primary-color, 10%);
-            border-color: @primary-color;
-            color: @primary-color;
-        }
+.ant-btn {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+  padding:  0;
+
+  .apply-btn-size(4px 16px; 14px; 16px; 8px);
+
+  &-sm {
+    .apply-btn-size(2px 12px; 12px; 12px; 2px);
+  }
+
+  &-lg {
+    .apply-btn-size(3px 40px; 14px; 18px; 8px);
+  }
+
+  &-circle {
+    padding-inline: 0;
+    border-radius: 50%;
+  }
+
+
+  // 主按钮
+  &-primary {
+    .btn-hover-variant(#fff; #225fdb; #225fdb);
+    .generate-btn-disabled(@disabled-color; #f9f9f9; @disabled-color);
+  }
+
+  // 次按钮
+  &-secondary {
+    color: @primary-color;
+    border-color: @primary-color;
+
+    .btn-hover-variant(@primary-color; fade(@primary-color, 10%); @primary-color);
+    .generate-btn-disabled(@primary-color-disabled; @disabled-color; @border-color-base);
+  }
+
+  // 三级按钮
+  &-tertiary {
+    background-color: #f3f3f3;
+    border-color: @border-color-base;
+
+    .btn-hover-variant(@primary-color; fade(@primary-color, 10%); @primary-color);
+    .generate-btn-disabled(@primary-color-disabled; @disabled-color; @border-color-base);
+  }
+
+  // 默认按钮
+  &-default {
+    .generate-btn-disabled(transparent; @disabled-color; @border-color-base);
+  }
+}
 
-        .btn-disabled-secondary-tertiary();
-        .generate-btn-disabled(@bg, @color, @border);
-    }
 
-    // 默认按钮
-    &-default {
-        .btn-disabled-default();
-        .generate-btn-disabled(@bg, @color, @border);
-    }
-}

package/esm/button/style/mixin.less

@@ -1,47 +1,39 @@
-.btn-size-small() {
-    @padding: 2px 12px;
-    @icon-font-size: 12px;
-    @text-font-size: 12px;
-    @icon-text-margin: 2px;
-}
-.btn-size-middle() {
-    @padding: 4px 16px;
-    @icon-font-size: 16px;
-    @text-font-size: 14px;
-    @icon-text-margin: 8px;
-}
-.btn-size-large() {
-    @padding: 3px 40px;
-    @icon-font-size: 18px;
-    @text-font-size: 14px;
-    @icon-text-margin: 8px;
-}
+// ===================== 按钮尺寸处理 =====================
+.apply-btn-size(@padding; @font-size; @icon-size: 16px; @gap: 8px) {
+  padding: @padding;
+  font-size: @font-size;
 
-// 禁用状态配置（同样用混入）
-.btn-disabled-primary() {
-    @bg: @disabled-color;
-    @color: #F9F9F9;
-    @border: @disabled-color;
-}
-.btn-disabled-secondary-tertiary() {
-    @bg: @primary-color-disabled;
-    @color: @disabled-color;
-    @border: @border-color-base;
+  .anticon {
+    font-size: @icon-size;
+    + span {
+      margin-left: @gap;
+    }
+  }
 }
-.btn-disabled-default() {
-    @bg: transparent;
-    @color: @disabled-color;
-    @border: @border-color-base;
+
+// ===================== 禁用状态生成器 =====================
+// 参数: 背景色, 文字颜色, 边框颜色
+.generate-btn-disabled(@bg; @color; @border) {
+  &[disabled],
+  &[disabled]:hover,
+  &[disabled]:active,
+  &[disabled]:focus {
+    color: @color;
+    background: @bg;
+    border-color: @border;
+    cursor: not-allowed;
+    opacity: 1;
+    box-shadow: none;
+    text-shadow: none;
+  }
 }
 
-// ===================== 工具混入 =====================
-.generate-btn-disabled(@bg, @color, @border) {
-    &[disabled],
-    &[disabled]:hover {
-        background: @bg;
-        color: @color;
-        border-color: @border;
-        cursor: not-allowed;
-        opacity: 1;
-    }
+// ===================== 交互状态快捷配置 =====================
+.btn-hover-variant(@color; @bg; @border) {
+  &:hover,
+  &:focus {
+    color: @color;
+    background: @bg;
+    border-color: @border;
+  }
 }

package/lib/_util/convertToTooltipProps.d.ts

@@ -0,0 +1,4 @@
+import type { ReactNode } from 'react';
+import { TooltipProps } from 'antd';
+declare const convertToTooltipProps: <P extends TooltipProps>(tooltip: P | ReactNode) => P | null;
+export default convertToTooltipProps;

package/lib/_util/convertToTooltipProps.js

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = require("react");
+var _isNonNullable = _interopRequireDefault(require("./isNonNullable"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const convertToTooltipProps = tooltip => {
+  if (!(0, _isNonNullable.default)(tooltip)) {
+    return null;
+  }
+  if (typeof tooltip === 'object' && ! /*#__PURE__*/(0, _react.isValidElement)(tooltip)) {
+    return tooltip;
+  }
+  return {
+    title: tooltip
+  };
+};
+var _default = exports.default = convertToTooltipProps;

package/lib/_util/hooks/useZIndex.d.ts

@@ -0,0 +1,8 @@
+export declare type ZIndexContainer = 'Modal' | 'Drawer' | 'Popover' | 'Popconfirm' | 'Tooltip' | 'Tour' | 'FloatButton';
+export declare type ZIndexConsumer = 'SelectLike' | 'Dropdown' | 'DatePicker' | 'Menu' | 'ImagePreview';
+export declare const CONTAINER_MAX_OFFSET: number;
+export declare const containerBaseZIndexOffset: Record<ZIndexContainer, number>;
+export declare const consumerBaseZIndexOffset: Record<ZIndexConsumer, number>;
+declare type ReturnResult = [zIndex: number | undefined, contextZIndex: number];
+export declare const useZIndex: (componentType: ZIndexContainer | ZIndexConsumer, customZIndex?: number) => ReturnResult;
+export {};

package/lib/_util/hooks/useZIndex.js

@@ -0,0 +1,59 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useZIndex = exports.containerBaseZIndexOffset = exports.consumerBaseZIndexOffset = exports.CONTAINER_MAX_OFFSET = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _warning = require("../warning");
+var _zindexContext = _interopRequireDefault(require("../zindexContext"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const DEFAULT_Z_INDEX_POPUP_BASE = 1000;
+const CONTAINER_OFFSET = 100;
+const CONTAINER_OFFSET_MAX_COUNT = 10;
+const CONTAINER_MAX_OFFSET = exports.CONTAINER_MAX_OFFSET = CONTAINER_OFFSET * CONTAINER_OFFSET_MAX_COUNT;
+const CONTAINER_MAX_OFFSET_WITH_CHILDREN = CONTAINER_MAX_OFFSET + CONTAINER_OFFSET;
+const containerBaseZIndexOffset = exports.containerBaseZIndexOffset = {
+  Modal: CONTAINER_OFFSET,
+  Drawer: CONTAINER_OFFSET,
+  Popover: CONTAINER_OFFSET,
+  Popconfirm: CONTAINER_OFFSET,
+  Tooltip: CONTAINER_OFFSET,
+  Tour: CONTAINER_OFFSET,
+  FloatButton: CONTAINER_OFFSET
+};
+const consumerBaseZIndexOffset = exports.consumerBaseZIndexOffset = {
+  SelectLike: 50,
+  Dropdown: 50,
+  DatePicker: 50,
+  Menu: 50,
+  ImagePreview: 1
+};
+const isContainerType = type => {
+  return type in containerBaseZIndexOffset;
+};
+const useZIndex = (componentType, customZIndex) => {
+  const zIndexPopupBase = DEFAULT_Z_INDEX_POPUP_BASE;
+  const parentZIndex = _react.default.useContext(_zindexContext.default);
+  const isContainer = isContainerType(componentType);
+  let result;
+  if (customZIndex !== undefined) {
+    result = [customZIndex, customZIndex];
+  } else {
+    let zIndex = parentZIndex ?? 0;
+    if (isContainer) {
+      zIndex += (parentZIndex ? 0 : zIndexPopupBase) + containerBaseZIndexOffset[componentType];
+    } else {
+      zIndex += consumerBaseZIndexOffset[componentType];
+    }
+    result = [customZIndex ?? zIndex, zIndex];
+  }
+  if (process.env.NODE_ENV !== 'production') {
+    const warning = (0, _warning.devUseWarning)(componentType);
+    const maxZIndex = zIndexPopupBase + CONTAINER_MAX_OFFSET_WITH_CHILDREN;
+    const currentZIndex = result[0] || 0;
+    warning(customZIndex !== undefined || currentZIndex <= maxZIndex, 'usage', '`zIndex` is over design token `zIndexPopupBase` too much. It may cause unexpected override.');
+  }
+  return result;
+};
+exports.useZIndex = useZIndex;

package/lib/_util/warning.d.ts

@@ -0,0 +1,31 @@
+import * as React from 'react';
+export declare function noop(): void;
+export declare function resetWarned(): void;
+declare type Warning = (valid: boolean, component: string, message?: string) => void;
+declare const warning: Warning;
+declare type BaseTypeWarning = (valid: boolean, 
+/**
+ * - deprecated: Some API will be removed in future but still support now.
+ * - usage: Some API usage is not correct.
+ * - breaking: Breaking change like API is removed.
+ */
+type: 'deprecated' | 'usage' | 'breaking', message?: string) => void;
+declare type TypeWarning = BaseTypeWarning & {
+    deprecated: (valid: boolean, oldProp: string, newProp: string, message?: string) => void;
+};
+export interface WarningContextProps {
+    /**
+     * @descCN 设置警告等级，设置 `false` 时会将废弃相关信息聚合为单条信息。
+     * @descEN Set the warning level. When set to `false`, discard related information will be aggregated into a single message.
+     * @since 5.10.0
+     */
+    strict?: boolean;
+}
+export declare const WarningContext: React.Context<WarningContextProps>;
+/**
+ * This is a hook but we not named as `useWarning`
+ * since this is only used in development.
+ * We should always wrap this in `if (process.env.NODE_ENV !== 'production')` condition
+ */
+export declare const devUseWarning: (component: string) => TypeWarning;
+export default warning;

package/lib/_util/warning.js

@@ -0,0 +1,76 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.devUseWarning = exports.default = exports.WarningContext = void 0;
+exports.noop = noop;
+exports.resetWarned = resetWarned;
+var React = _interopRequireWildcard(require("react"));
+var _warning2 = _interopRequireDefault(require("rc-util/lib/warning"));
+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; }
+function noop() {}
+const {
+  resetWarned: rcResetWarned
+} = _warning2.default;
+let deprecatedWarnList = null;
+function resetWarned() {
+  deprecatedWarnList = null;
+  rcResetWarned();
+}
+let _warning = noop;
+if (process.env.NODE_ENV !== 'production') {
+  _warning = (valid, component, message) => {
+    (0, _warning2.default)(valid, `[antd: ${component}] ${message}`);
+
+    // StrictMode will inject console which will not throw warning in React 17.
+    if (process.env.NODE_ENV === 'test') {
+      resetWarned();
+    }
+  };
+}
+const warning = _warning;
+const WarningContext = exports.WarningContext = /*#__PURE__*/React.createContext({});
+
+/**
+ * This is a hook but we not named as `useWarning`
+ * since this is only used in development.
+ * We should always wrap this in `if (process.env.NODE_ENV !== 'production')` condition
+ */
+const devUseWarning = exports.devUseWarning = process.env.NODE_ENV !== 'production' ? component => {
+  const {
+    strict
+  } = React.useContext(WarningContext);
+  const typeWarning = (valid, type, message) => {
+    if (!valid) {
+      if (strict === false && type === 'deprecated') {
+        const existWarning = deprecatedWarnList;
+        if (!deprecatedWarnList) {
+          deprecatedWarnList = {};
+        }
+        deprecatedWarnList[component] = deprecatedWarnList[component] || [];
+        if (!deprecatedWarnList[component].includes(message || '')) {
+          deprecatedWarnList[component].push(message || '');
+        }
+
+        // Warning for the first time
+        if (!existWarning) {
+          console.warn('[antd] There exists deprecated usage in your code:', deprecatedWarnList);
+        }
+      } else {
+        warning(valid, component, message);
+      }
+    }
+  };
+  typeWarning.deprecated = (valid, oldProp, newProp, message = '') => {
+    typeWarning(valid, 'deprecated', `\`${oldProp}\` is deprecated. Please use \`${newProp}\` instead.${message ? ` ${message}` : ''}`);
+  };
+  return typeWarning;
+} : () => {
+  const noopWarning = () => {};
+  noopWarning.deprecated = noop;
+  return noopWarning;
+};
+var _default = exports.default = warning;

package/lib/_util/zindexContext.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const zIndexContext: React.Context<number | undefined>;
+export default zIndexContext;

package/lib/_util/zindexContext.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireDefault(require("react"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const zIndexContext = /*#__PURE__*/_react.default.createContext(undefined);
+if (process.env.NODE_ENV !== 'production') {
+  zIndexContext.displayName = 'zIndexContext';
+}
+var _default = exports.default = zIndexContext;

package/lib/blockHeader/index.d.ts

@@ -1,8 +1,9 @@
 import React, { ReactNode } from 'react';
 import './style';
 import { LabelTooltipType } from '../_util';
+import type { CollapsibleProps } from '../collapsible';
 export declare type SizeType = 'small' | 'middle' | 'large';
-export interface IBlockHeaderProps {
+export interface IBlockHeaderProps extends CollapsibleProps {
     /** 标题 */
     title: ReactNode;
     /** 标题前的图标，默认是一个色块 */

package/lib/blockHeader/index.js

@@ -41,7 +41,8 @@ const BlockHeader = function (props) {
       className: "addon-before--default"
     }),
     onExpand,
-    titleStyle
+    titleStyle,
+    ...rest
   } = props;
   const [internalExpand, setInternalExpand] = (0, _react.useState)(defaultExpand);
   const currentExpand = isControlled(props) ? expand : internalExpand;
@@ -96,9 +97,9 @@ const BlockHeader = function (props) {
       'collapse__icon--up': currentExpand,
       'collapse__icon--down': !currentExpand
     })
-  }))), /*#__PURE__*/_react.default.createElement(_collapsible.default, {
+  }))), /*#__PURE__*/_react.default.createElement(_collapsible.default, _extends({
     isOpen: !currentExpand
-  }, /*#__PURE__*/_react.default.createElement("div", {
+  }, rest), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(`${prefixCls}__content`, contentClassName, {
       [`${prefixCls}__content--active`]: currentExpand || !showCollapse
     }),

package/lib/button/index.d.ts

@@ -6,5 +6,5 @@ declare type ButtonType = AntdButtonType | 'secondary' | 'tertiary';
 export interface ButtonProps extends Omit<AntdButtonProps, 'type'> {
     type?: ButtonType;
 }
-export default function Button({ className, icon, children, size, type, ...rest }: ButtonProps): React.JSX.Element;
-export {};
+declare const _default: React.ForwardRefExoticComponent<ButtonProps & React.RefAttributes<HTMLElement>>;
+export default _default;

package/lib/button/index.js

@@ -3,31 +3,23 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = Button;
+exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _antd = require("antd");
-var _configProvider = require("antd/es/config-provider");
 var _classnames = _interopRequireDefault(require("classnames"));
 require("./style");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function Button({
   className,
-  icon,
-  children,
   size = 'middle',
   type,
   ...rest
 }) {
-  const prefixCls = (0, _configProvider.globalConfig)().getPrefixCls('btn');
-  const typeClassName = type ? `${prefixCls}--${type}` : '';
   return /*#__PURE__*/_react.default.createElement(_antd.Button, _extends({
-    className: (0, _classnames.default)(prefixCls, className, typeClassName),
+    className: (0, _classnames.default)(className),
     size: size,
     type: type
-  }, rest), icon && /*#__PURE__*/_react.default.createElement("span", {
-    className: `${prefixCls}__icon ${prefixCls}__icon--${size}`
-  }, icon), children && /*#__PURE__*/_react.default.createElement("span", {
-    className: `${prefixCls}__text ${prefixCls}__text--${size}`
-  }, children));
-}
+  }, rest));
+}
+var _default = exports.default = Button;

package/lib/button/style/index.less

@@ -3,132 +3,57 @@
 
 @btn-prefix-cls: ~'@{ant-prefix}-btn';
 
-.@{btn-prefix-cls} {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-
-    // 引用中尺寸配置（核心：先调用混入，再取值）
-    .btn-size-middle();
-    padding: @padding;
-
-    // 图标样式
-    &__icon {
-        display: inline-flex;
-        align-items: center;
-        justify-content: center;
-        font-size: inherit;
-        line-height: 0;
-
-        .dtstack-icon {
-            font-size: inherit;
-        }
-
-        // 小尺寸图标
-        &--small {
-            .btn-size-small();
-            font-size: @icon-font-size;
-        }
-        // 中尺寸图标
-        &--middle {
-            .btn-size-middle();
-            font-size: @icon-font-size;
-        }
-        // 大尺寸图标
-        &--large {
-            .btn-size-large();
-            font-size: @icon-font-size;
-        }
-
-        // 图标与文字间距
-        & + .@{btn-prefix-cls}__text {
-            &--small {
-                .btn-size-small();
-                margin-left: @icon-text-margin;
-            }
-            &--middle {
-                .btn-size-middle();
-                margin-left: @icon-text-margin;
-            }
-            &--large {
-                .btn-size-large();
-                margin-left: @icon-text-margin;
-            }
-        }
-    }
-
-    // 文字样式
-    &__text {
-        display: inline-block;
-
-        &--small {
-            .btn-size-small();
-            font-size: @text-font-size;
-        }
-        &--middle {
-            .btn-size-middle();
-            font-size: @text-font-size;
-        }
-        &--large {
-            .btn-size-large();
-            font-size: @text-font-size;
-        }
-    }
-
-    // 尺寸变体
-    &-sm {
-        .btn-size-small();
-        padding: @padding;
-    }
-    &-lg {
-        .btn-size-large();
-        padding: @padding;
-    }
-
-    // 主要按钮
-    &-primary {
-        .btn-disabled-primary();
-        .generate-btn-disabled(@bg, @color, @border);
-
-        &:hover,
-        &:focus {
-            background-color: #225fdb;
-        }
-    }
-
-    // 次要按钮
-    &-secondary {
-        border-color: @primary-color;
-        color: @primary-color;
-
-        &:hover,
-        &:focus {
-            background-color: fade(@primary-color, 10%);
-        }
-
-        .btn-disabled-secondary-tertiary();
-        .generate-btn-disabled(@bg, @color, @border);
-    }
-
-    // 三级按钮
-    &-tertiary {
-        background-color: #f3f3f3;
-        border-color: @border-color-base;
-
-        &:hover,
-        &:focus {
-            background-color: fade(@primary-color, 10%);
-            border-color: @primary-color;
-            color: @primary-color;
-        }
+.ant-btn {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+  padding:  0;
+
+  .apply-btn-size(4px 16px; 14px; 16px; 8px);
+
+  &-sm {
+    .apply-btn-size(2px 12px; 12px; 12px; 2px);
+  }
+
+  &-lg {
+    .apply-btn-size(3px 40px; 14px; 18px; 8px);
+  }
+
+  &-circle {
+    padding-inline: 0;
+    border-radius: 50%;
+  }
+
+
+  // 主按钮
+  &-primary {
+    .btn-hover-variant(#fff; #225fdb; #225fdb);
+    .generate-btn-disabled(@disabled-color; #f9f9f9; @disabled-color);
+  }
+
+  // 次按钮
+  &-secondary {
+    color: @primary-color;
+    border-color: @primary-color;
+
+    .btn-hover-variant(@primary-color; fade(@primary-color, 10%); @primary-color);
+    .generate-btn-disabled(@primary-color-disabled; @disabled-color; @border-color-base);
+  }
+
+  // 三级按钮
+  &-tertiary {
+    background-color: #f3f3f3;
+    border-color: @border-color-base;
+
+    .btn-hover-variant(@primary-color; fade(@primary-color, 10%); @primary-color);
+    .generate-btn-disabled(@primary-color-disabled; @disabled-color; @border-color-base);
+  }
+
+  // 默认按钮
+  &-default {
+    .generate-btn-disabled(transparent; @disabled-color; @border-color-base);
+  }
+}
 
-        .btn-disabled-secondary-tertiary();
-        .generate-btn-disabled(@bg, @color, @border);
-    }
 
-    // 默认按钮
-    &-default {
-        .btn-disabled-default();
-        .generate-btn-disabled(@bg, @color, @border);
-    }
-}

package/lib/button/style/mixin.less

@@ -1,47 +1,39 @@
-.btn-size-small() {
-    @padding: 2px 12px;
-    @icon-font-size: 12px;
-    @text-font-size: 12px;
-    @icon-text-margin: 2px;
-}
-.btn-size-middle() {
-    @padding: 4px 16px;
-    @icon-font-size: 16px;
-    @text-font-size: 14px;
-    @icon-text-margin: 8px;
-}
-.btn-size-large() {
-    @padding: 3px 40px;
-    @icon-font-size: 18px;
-    @text-font-size: 14px;
-    @icon-text-margin: 8px;
-}
+// ===================== 按钮尺寸处理 =====================
+.apply-btn-size(@padding; @font-size; @icon-size: 16px; @gap: 8px) {
+  padding: @padding;
+  font-size: @font-size;
 
-// 禁用状态配置（同样用混入）
-.btn-disabled-primary() {
-    @bg: @disabled-color;
-    @color: #F9F9F9;
-    @border: @disabled-color;
-}
-.btn-disabled-secondary-tertiary() {
-    @bg: @primary-color-disabled;
-    @color: @disabled-color;
-    @border: @border-color-base;
+  .anticon {
+    font-size: @icon-size;
+    + span {
+      margin-left: @gap;
+    }
+  }
 }
-.btn-disabled-default() {
-    @bg: transparent;
-    @color: @disabled-color;
-    @border: @border-color-base;
+
+// ===================== 禁用状态生成器 =====================
+// 参数: 背景色, 文字颜色, 边框颜色
+.generate-btn-disabled(@bg; @color; @border) {
+  &[disabled],
+  &[disabled]:hover,
+  &[disabled]:active,
+  &[disabled]:focus {
+    color: @color;
+    background: @bg;
+    border-color: @border;
+    cursor: not-allowed;
+    opacity: 1;
+    box-shadow: none;
+    text-shadow: none;
+  }
 }
 
-// ===================== 工具混入 =====================
-.generate-btn-disabled(@bg, @color, @border) {
-    &[disabled],
-    &[disabled]:hover {
-        background: @bg;
-        color: @color;
-        border-color: @border;
-        cursor: not-allowed;
-        opacity: 1;
-    }
+// ===================== 交互状态快捷配置 =====================
+.btn-hover-variant(@color; @bg; @border) {
+  &:hover,
+  &:focus {
+    color: @color;
+    background: @bg;
+    border-color: @border;
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dtjoy/dt-design",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "react-component",
   "repository": "https://github.com/ZhaoFxxkSky/dt-design",
   "main": "lib/index.js",