doui-react 1.0.2 → 2.0.1

package/es/radio/component/use-radio.d.ts

@@ -1,23 +1,25 @@
 /// <reference types="react" />
 import { RadioProps } from "..";
-import { RadioChangeEvent } from 'antd/lib/radio/interface';
+import { RadioChangeEvent } from 'antd/es/radio/interface';
 export declare function useRadio({ onChange, ...props }: RadioProps): {
     options: any[];
     onChange: (e: RadioChangeEvent) => void;
     defaultValue?: any;
     value: any;
-    size?: import("antd/lib/button").ButtonSize;
-    disabled?: import("antd/lib/config-provider/DisabledContext").DisabledType;
+    size?: import("antd/es/button").ButtonSize;
+    disabled?: boolean | undefined;
     onMouseEnter?: import("react").MouseEventHandler<HTMLDivElement> | undefined;
     onMouseLeave?: import("react").MouseEventHandler<HTMLDivElement> | undefined;
     name?: string | undefined;
     children?: import("react").ReactNode;
     id?: string | undefined;
-    optionType?: import("antd/lib/radio/interface").RadioGroupOptionType | undefined;
-    buttonStyle?: import("antd/lib/radio/interface").RadioGroupButtonStyle | undefined;
+    optionType?: import("antd/es/radio/interface").RadioGroupOptionType | undefined;
+    buttonStyle?: import("antd/es/radio/interface").RadioGroupButtonStyle | undefined;
     onFocus?: import("react").FocusEventHandler<HTMLDivElement> | undefined;
     onBlur?: import("react").FocusEventHandler<HTMLDivElement> | undefined;
+    block?: boolean | undefined;
     prefixCls?: string | undefined;
     className?: string | undefined;
+    rootClassName?: string | undefined;
     style?: import("react").CSSProperties | undefined;
 };

package/es/radio/component/utils.js

@@ -5,7 +5,7 @@ import { highlightTextPropKeys } from "../../select/component/constant";
 import _ from 'lodash';
 export function parseHighlightTextAndRestProps(props) {
   var highlightTextProps = _.pick(props, highlightTextPropKeys);
-  var restProps = _.omit(props, [].concat(_toConsumableArray(highlightTextPropKeys), ['__callback__', 'showAll', 'isNoMatchSearchText', 'shouldRerenderOptions', '__filterNotExistValue__']));
+  var restProps = _.omit(props, [].concat(_toConsumableArray(highlightTextPropKeys), ['__callback__', '__callbackDeps__', 'showAll', 'isNoMatchSearchText', 'shouldRerenderOptions', '__filterNotExistValue__']));
   return {
     highlightTextProps: highlightTextProps,
     restProps: restProps

package/es/radio/type/index.d.ts

@@ -2,9 +2,9 @@ import { BaseComponentProps, BaseFlexProps } from "../../api";
 import { BaseSelectProps } from "../../select";
 import { TextProps } from "../../text";
 import { RadioGroupProps } from 'antd';
-import { CheckboxProps as AntdCheckboxProps } from 'antd/lib/checkbox/Checkbox';
+import { CheckboxProps as AntdCheckboxProps } from 'antd/es/checkbox/Checkbox';
 import { ReactNode } from 'react';
-export interface BaseBoxProps extends Omit<AntdCheckboxProps, 'onChange'>, TextProps, BaseComponentProps {
+export interface BaseBoxProps extends Omit<AntdCheckboxProps, 'onChange' | 'onBlur' | 'onFocus'>, Omit<TextProps, 'onBlur' | 'onFocus'>, BaseComponentProps {
     children?: ReactNode;
     text?: ReactNode;
     /**

package/es/select/component/use-select-options.d.ts

@@ -3,7 +3,7 @@ interface DisplayValueProps extends Pick<BaseSelectProps, 'value' | 'options'> {
     filterNotExistValue?: boolean;
 }
 export declare function getDisplayValue({ value, options, filterNotExistValue }: DisplayValueProps): any;
-export declare function useSelectOptions<T = any>({ value, loading, options, __callback__, shouldRerenderOptions, __filterNotExistValue__: filterNotExistValue, ...props }: BaseSelectProps): T & {
+export declare function useSelectOptions<T = any>({ value, loading, options, __callback__, __callbackDeps__, shouldRerenderOptions, __filterNotExistValue__: filterNotExistValue, ...props }: BaseSelectProps): T & {
     value: any;
     options: import("..").SelectOptions | undefined;
     displayOptions: any[];

package/es/select/component/use-select-options.js

@@ -1,6 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "loading", "options", "__callback__", "shouldRerenderOptions", "__filterNotExistValue__"];
+var _excluded = ["value", "loading", "options", "__callback__", "__callbackDeps__", "shouldRerenderOptions", "__filterNotExistValue__"];
 import { useFormContext } from "../../form";
 import { isValueNotExistInOptions } from "../../form/component/utils";
 import { useDeepMemo } from "../../hooks";
@@ -36,6 +37,8 @@ export function useSelectOptions(_ref2) {
     loading = _ref2.loading,
     options = _ref2.options,
     __callback__ = _ref2.__callback__,
+    _ref2$__callbackDeps_ = _ref2.__callbackDeps__,
+    __callbackDeps__ = _ref2$__callbackDeps_ === void 0 ? [] : _ref2$__callbackDeps_,
     shouldRerenderOptions = _ref2.shouldRerenderOptions,
     filterNotExistValue = _ref2.__filterNotExistValue__,
     props = _objectWithoutProperties(_ref2, _excluded);
@@ -61,7 +64,7 @@ export function useSelectOptions(_ref2) {
     };
     __callback__ === null || __callback__ === void 0 || __callback__(params);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [memoValue, memoOptions, finalLoading]);
+  }, [memoValue, memoOptions, finalLoading].concat(_toConsumableArray(__callbackDeps__)));
   var displayOptions = useMemo(function () {
     return generateOptions(_objectSpread({
       options: memoOptions

package/es/select/component/use-select.js

@@ -57,10 +57,7 @@ function renderMaxTag(omittedValues) {
   return _jsxs(Text, {
     autoShowTooltip: false,
     tooltip: {
-      title: tooltip,
-      align: {
-        offset: [0, 0]
-      }
+      title: tooltip
     },
     children: ["+", omittedValues.length, "..."]
   });
@@ -103,7 +100,7 @@ export function useSelect(_ref3) {
     })),
     displayOptions = _useSelectOptions.displayOptions,
     restSelectProps = _objectWithoutProperties(_useSelectOptions, _excluded2);
-  function onDropdownVisibleChange(open) {
+  function onOpenChange(open) {
     setOpen(open);
     setSearch('');
   }
@@ -123,7 +120,7 @@ export function useSelect(_ref3) {
     optionFilterProp: 'originLabel',
     optionLabelProp: 'originLabel',
     getPopupContainer: getPopupContainer,
-    dropdownRender: customRenderDropdown,
+    popupRender: customRenderDropdown,
     maxTagPlaceholder: renderMaxTag
   }, getComponentProps(restSelectProps)), {}, {
     placeholder: placeholder,
@@ -131,6 +128,6 @@ export function useSelect(_ref3) {
     loading: loading,
     options: displayOptions,
     onSearch: showSearch ? setSearch : undefined,
-    onDropdownVisibleChange: onDropdownVisibleChange
+    onOpenChange: onOpenChange
   });
 }

package/es/select/component/utils.d.ts

@@ -1,11 +1,10 @@
 import { FormValues } from "../../form";
 import { BaseSelectProps, SelectOptions } from "..";
-import { DependencyList } from 'react';
 export declare function generateOptions({ options, sort, ...rest }: BaseSelectProps): any[];
 export declare function getOptionsValue(options?: SelectOptions): (string | number)[];
 interface DependenciesProps {
     values?: FormValues;
-    deps?: DependencyList;
+    deps?: string[];
     search: string;
     isFunctionOptions: boolean;
 }

package/es/select/type/index.d.ts

@@ -1,9 +1,9 @@
 import { BaseComponentProps, FunctionReturn } from "../../api";
 import { UseFetchOptions } from "../../hooks";
 import { TextProps } from "../../text";
-import { SelectProps as AntdSelectProps } from 'antd/lib/select';
+import { SelectProps as AntdSelectProps } from 'antd/es/select';
 import { BaseOptionType, DefaultOptionType } from 'rc-select/lib/Select';
-import { ReactNode } from 'react';
+import { DependencyList, ReactNode } from 'react';
 /**
  * @noExtends
  */
@@ -54,6 +54,7 @@ export interface BaseSelectProps {
      */
     __filterNotExistValue__?: boolean;
     __callback__?(props: SelectCallbackProps): void;
+    __callbackDeps__?: DependencyList;
 }
 type UnionType = Omit<AntdSelectProps, 'options'> & Omit<BaseSelectProps, 'options'> & BaseComponentProps;
 export interface SelectProps extends UnionType {

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

@@ -12,7 +12,8 @@ export declare const alignMap: {
     between: string;
 };
 export declare function getAlign(align: HStackProps['align']): string;
-export declare function getWidthAndFlex({ width, style, flex }: Partial<HStackProps>): import("@emotion/react").SerializedStyles;
+type WidthFlexStyle = Pick<HStackProps, 'width' | 'style' | 'flex'>;
+export declare function getWidthAndFlex({ width, style, flex }: WidthFlexStyle): import("@emotion/react").SerializedStyles;
 declare const style: {
     hStack: (props: Partial<HStackProps>) => import("@emotion/react").SerializedStyles;
     vStack: (props: Partial<VStackProps>) => import("@emotion/react").SerializedStyles;

package/es/switch/type/index.d.ts

@@ -1,6 +1,6 @@
 import { BaseComponentProps, FunctionReturn } from "../../api";
-import { SwitchProps as AntdSwitchProps } from 'antd/lib/switch';
-import { EllipsisConfig } from 'antd/lib/typography/Base';
+import { SwitchProps as AntdSwitchProps } from 'antd/es/switch';
+import { EllipsisConfig } from 'antd/es/typography/Base';
 export interface SwitchProps extends AntdSwitchProps, BaseComponentProps {
     /**
      * @description 提示信息

package/es/table/component/action-button.js

@@ -17,7 +17,6 @@ function generateAction(action, params) {
     disabled: executeFunction(action.disabled, params),
     tooltip: executeFunction(action.tooltip, params),
     confirm: executeFunction(action.confirm, params),
-    confirmMessage: executeFunction(action.confirmMessage, params),
     onClick: function onClick() {
       var _action$onClick;
       return (_action$onClick = action.onClick) === null || _action$onClick === void 0 ? void 0 : _action$onClick.call(action, params);

package/es/table/component/filter.d.ts

@@ -1,3 +1,3 @@
 import { Column } from "..";
-import { ColumnType } from 'antd/lib/table';
+import type { ColumnType } from 'antd/es/table';
 export declare function getFilterColumn(column: Column): ColumnType<any>;

package/es/table/component/filter.js

@@ -29,7 +29,7 @@ function generateFilters(_ref) {
       return filter;
     }
     return {
-      text: filter,
+      text: "".concat(filter),
       value: filter
     };
   });

package/es/table/component/sort.d.ts

@@ -1,6 +1,6 @@
 import { Column } from '../type';
 export declare function getSortColumn({ dataIndex, sort }: Column): {
-    sorter: import("antd/lib/table/interface").CompareFn<any>;
+    sorter: import("antd/es/table/interface").CompareFn<any>;
 } | {
     sorter: (a: any, b: any) => any;
 };

package/es/table/component/time.js

@@ -1,4 +1,4 @@
-import moment from 'moment-timezone';
+import dayjs from 'dayjs';
 import { Fragment as _Fragment, jsx as _jsx } from "@emotion/react/jsx-runtime";
 var defaultFormat = 'YYYY-MM-DD hh:mm:ss A';
 export function Time(_ref) {
@@ -7,6 +7,6 @@ export function Time(_ref) {
   var timeFormat = column.timeFormat;
   var format = timeFormat || defaultFormat;
   return _jsx(_Fragment, {
-    children: moment(+children).format(format)
+    children: dayjs(+children).format(format)
   });
 }

package/es/table/component/utils.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
 import { FormInstance, FormProps } from "../../form";
-import { TableRowSelection } from 'antd/lib/table/interface';
+import type { ColumnType } from 'antd/es/table';
+import type { TableRowSelection } from 'antd/es/table/interface';
 import { Column, DataSource, GetSearchColumn, TableContext, TableProps } from '../type';
 import { Actions } from './actions';
 import { Editor } from './editor';
@@ -19,81 +19,7 @@ export declare const componentMap: {
     editor: typeof Editor;
     default: (props: any) => any;
 };
-export declare function generateColumns({ columns, getSearchColumn }: GenerateColumnsProps): {
-    render: (current: any, record: Record<string, any>, index: number) => import("react").ReactNode;
-    dataIndex?: string | undefined;
-    type?: "link" | "switch" | "time" | "actions" | "selection" | "editor" | undefined;
-    width?: string | number | undefined;
-    minWidth?: string | number | undefined;
-    maxWidth?: string | number | undefined;
-    rows?: number | undefined;
-    timeFormat?: string | undefined;
-    disabled?: boolean | ((props: import("../type").CommonProps) => boolean) | undefined;
-    tooltip?: import("react").ReactNode | ((props: import("../type").CommonProps) => import("react").ReactNode);
-    onClick?(props: import("../type").CommonProps): any;
-    search?: boolean | string[] | ((props: import("../type").CustomFilterProps) => boolean) | undefined;
-    placeholder?: string | undefined;
-    sort?: boolean | import("antd/lib/table/interface").CompareFn<any> | {
-        compare?: import("antd/lib/table/interface").CompareFn<any> | undefined;
-        multiple?: number | undefined;
-    } | undefined;
-    filters?: (boolean | import("react").Key | import("antd/lib/table/interface").ColumnFilterItem)[] | undefined;
-    filterBy?: string[] | ((props: import("../type").CustomFilterProps) => boolean) | undefined;
-    actions?: import("../type").ActionProps[] | ((props: import("../type").CommonProps) => import("../type").ActionProps[]) | undefined;
-    editorProps?: import("../../form").FormItemProps | ((props: import("../type").CommonProps) => import("../../form").FormItemProps) | undefined;
-    className?: string | undefined;
-    title?: import("antd/lib/table/interface").ColumnTitle<any>;
-    responsive?: import("antd/lib/_util/responsiveObserve").Breakpoint[] | undefined;
-    align?: import("rc-table/lib/interface").AlignType | undefined;
-    fixed?: import("rc-table/lib/interface").FixedType | undefined;
-    colSpan?: number | undefined;
-    rowSpan?: number | undefined;
-    key?: import("react").Key | undefined;
-    shouldCellUpdate?: ((record: any, prevRecord: any) => boolean) | undefined;
-    onCell?: import("rc-table/lib/interface").GetComponentProps<any> | undefined;
-    onCellClick?: ((record: any, e: import("react").MouseEvent<HTMLElement, MouseEvent>) => void) | undefined;
-    onHeaderCell?: import("rc-table/lib/interface").GetComponentProps<import("rc-table/lib/interface").ColumnType<any> | import("rc-table/lib/interface").ColumnGroupType<any>> | undefined;
-    sorter?: boolean | import("antd/lib/table/interface").CompareFn<any> | {
-        compare?: import("antd/lib/table/interface").CompareFn<any> | undefined;
-        multiple?: number | undefined;
-    } | undefined;
-    sortOrder?: import("antd/lib/table/interface").SortOrder | undefined;
-    defaultSortOrder?: import("antd/lib/table/interface").SortOrder | undefined;
-    sortDirections?: import("antd/lib/table/interface").SortOrder[] | undefined;
-    showSorterTooltip?: boolean | import("antd").TooltipProps | undefined;
-    filtered?: boolean | undefined;
-    filterDropdown?: import("react").ReactNode | ((props: import("antd/lib/table/interface").FilterDropdownProps) => import("react").ReactNode);
-    filterMultiple?: boolean | undefined;
-    filteredValue?: import("antd/lib/table/interface").FilterValue | null | undefined;
-    defaultFilteredValue?: import("antd/lib/table/interface").FilterValue | null | undefined;
-    filterIcon?: import("react").ReactNode | ((filtered: boolean) => import("react").ReactNode);
-    filterMode?: "menu" | "tree" | undefined;
-    filterSearch?: import("antd/lib/table/interface").FilterSearchType<import("antd/lib/table/interface").ColumnFilterItem> | undefined;
-    onFilter?: ((value: boolean | import("react").Key, record: any) => boolean) | undefined;
-    filterDropdownVisible?: boolean | undefined;
-    filterDropdownOpen?: boolean | undefined;
-    onFilterDropdownVisibleChange?: ((visible: boolean) => void) | undefined;
-    onFilterDropdownOpenChange?: ((open: boolean) => void) | undefined;
-    filterResetToDefaultFilteredValue?: boolean | undefined;
-    onChange?: ((selectedRowKeys: import("react").Key[], selectedRows: any[], info: {
-        type: import("antd/lib/table/interface").RowSelectMethod;
-    }) => void) | undefined;
-    onSelect?: import("antd/lib/table/interface").SelectionSelectFn<any> | undefined;
-    columnWidth?: string | number | undefined;
-    preserveSelectedRowKeys?: boolean | undefined;
-    selectedRowKeys?: import("react").Key[] | undefined;
-    defaultSelectedRowKeys?: import("react").Key[] | undefined;
-    getCheckboxProps?: ((record: any) => Partial<Omit<import("antd").CheckboxProps, "defaultChecked" | "checked">>) | undefined;
-    onSelectMultiple?: ((selected: boolean, selectedRows: any[], changeRows: any[]) => void) | undefined;
-    onSelectAll?: ((selected: boolean, selectedRows: any[], changeRows: any[]) => void) | undefined;
-    onSelectInvert?: ((selectedRowKeys: import("react").Key[]) => void) | undefined;
-    onSelectNone?: (() => void) | undefined;
-    selections?: boolean | import("antd/lib/table/hooks/useSelection").INTERNAL_SELECTION_ITEM[] | undefined;
-    hideSelectAll?: boolean | undefined;
-    columnTitle?: import("react").ReactNode;
-    checkStrictly?: boolean | undefined;
-    renderCell?: ((value: boolean, record: any, index: number, originNode: import("react").ReactNode) => import("react").ReactNode | import("rc-table/lib/interface").RenderedCell<any>) | undefined;
-}[];
+export declare function generateColumns({ columns, getSearchColumn }: GenerateColumnsProps): ColumnType<any>[];
 interface RowSelectionProps {
     rowKey: string;
     columns: Column[];

package/es/table/component/utils.js

@@ -28,9 +28,7 @@ export var componentMap = {
 export function generateColumns(_ref) {
   var columns = _ref.columns,
     getSearchColumn = _ref.getSearchColumn;
-  return _.filter(columns, function (column) {
-    return column.width !== 0;
-  }).map(function (column) {
+  return _.map(columns, function (column) {
     var newColumn = _.clone(column);
     var search = newColumn.search,
       sort = newColumn.sort,

package/es/table/hook/search.d.ts

@@ -1,4 +1,4 @@
-import { ColumnType } from 'antd/lib/table';
+import type { ColumnType } from 'antd/es/table';
 import { Column } from '../type';
 export declare function useSearchColumn(): {
     getSearchColumn: ({ dataIndex, ...rest }: Column) => ColumnType<any>;

package/es/table/hook/search.js

@@ -94,12 +94,14 @@ function getSearchableColumn(column) {
       }
       return filter.apply(void 0, [column].concat(args));
     },
-    onFilterDropdownOpenChange: function onFilterDropdownOpenChange(visible) {
-      if (visible) {
-        setTimeout(function () {
-          var _currentInput;
-          return (_currentInput = currentInput) === null || _currentInput === void 0 ? void 0 : _currentInput.focus();
-        }, 30);
+    filterDropdownProps: {
+      onOpenChange: function onOpenChange(visible) {
+        if (visible) {
+          setTimeout(function () {
+            var _currentInput;
+            return (_currentInput = currentInput) === null || _currentInput === void 0 ? void 0 : _currentInput.focus();
+          }, 30);
+        }
       }
     },
     render: function render(text) {

package/es/table/type/action.d.ts

@@ -3,7 +3,7 @@ import { ButtonProps } from "../../button";
 import { FormListActionProps, FormListProps } from "../../form";
 import { TableContext } from "..";
 import { ReactNode } from 'react';
-type ButtonType = Omit<ButtonProps & Partial<FormListActionProps> & Pick<FormListProps, 'focusFirstOnAdd'>, 'icon' | 'show' | 'disabled' | 'tooltip' | 'confirm' | 'confirmMessage' | 'onClick'>;
+type ButtonType = Omit<ButtonProps & Partial<FormListActionProps> & Pick<FormListProps, 'focusFirstOnAdd'>, 'icon' | 'show' | 'disabled' | 'tooltip' | 'confirm' | 'onClick'>;
 export interface ActionProps extends ButtonType {
     /**
      * @description 图标
@@ -33,12 +33,7 @@ export interface ActionProps extends ButtonType {
      * @default false
      * @link TableContext: #tablecontext
      */
-    confirm?: boolean | ((props: TableContext) => boolean);
-    /**
-     * @description 确认信息
-     * @link TableContext: #tablecontext
-     */
-    confirmMessage?: ReactNode | ((props: TableContext) => ReactNode);
+    confirm?: ButtonProps['confirm'] | ((props: TableContext) => ButtonProps['confirm']);
     /**
      * @description 点击回调
      * @link TableContext: #tablecontext

package/es/table/type/column.d.ts

@@ -2,10 +2,10 @@ import { FunctionReturn } from "../../api";
 import { FormItemProps } from "../../form";
 import { ActionProps, CommonProps } from "..";
 import { componentMap } from "../component/utils";
-import { ColumnType } from 'antd/lib/table';
-import { ColumnFilterItem, TableRowSelection } from 'antd/lib/table/interface';
+import type { ColumnType } from 'antd/es/table';
+import type { ColumnFilterItem, TableRowSelection } from 'antd/es/table/interface';
 import React, { ReactNode } from 'react';
-type UnionColumnType = Omit<ColumnType<any>, 'ellipsis' | 'filters'> & Omit<TableRowSelection<any>, 'type'>;
+type UnionColumnType = Omit<ColumnType<any>, 'ellipsis' | 'filters' | 'minWidth' | 'maxWidth'> & Omit<TableRowSelection<any>, 'type'>;
 export interface Column extends UnionColumnType {
     /**
      * @description 字段名

package/es/tabs/component/utils.d.ts

@@ -6,19 +6,19 @@ export declare function getRenderTabBar({ type, items, size, tabBarGutter, tabBa
 export declare function generateTabItems({ items }: TabsProps): {
     label: import("@emotion/react/jsx-runtime").JSX.Element;
     key: string;
+    prefixCls?: string | undefined;
+    className?: string | undefined;
     style?: import("react").CSSProperties | undefined;
+    disabled?: boolean | undefined;
     children?: import("react").ReactNode;
-    className?: string | undefined;
     id?: string | undefined;
-    icon?: import("react").ReactNode;
-    prefixCls?: string | undefined;
-    disabled?: boolean | undefined;
-    animated?: boolean | undefined;
-    destroyInactiveTabPane?: boolean | undefined;
-    forceRender?: boolean | undefined;
     closable?: boolean | undefined;
     closeIcon?: import("react").ReactNode;
-    tabKey?: string | undefined;
     active?: boolean | undefined;
+    icon?: import("react").ReactNode;
+    forceRender?: boolean | undefined;
+    destroyInactiveTabPane?: boolean | undefined;
+    animated?: boolean | undefined;
+    tabKey?: string | undefined;
 }[];
 export {};

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

@@ -1,6 +1,6 @@
 import { SelectOption } from "../../select";
 import { TabsProps as AntdTabsProps } from 'antd';
-import { TabsType } from 'antd/lib/tabs';
+import { TabsType } from 'antd/es/tabs';
 import { Tab } from 'rc-tabs/lib/interface';
 export interface TabProps extends Tab, Omit<SelectOption, 'label'> {
 }

package/es/text/component/index.js

@@ -4,6 +4,7 @@ var _excluded = ["children", "tooltip", "rows", "autoShowTooltip"];
 import { generateTooltip } from "./..";
 import { getTooltipProps } from "../../tooltip";
 import { Tooltip, Typography } from 'antd';
+import ResizeObserver from 'rc-resize-observer';
 import style from "../style";
 import { useText } from "./use-text";
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
@@ -16,12 +17,11 @@ export function Text(_ref) {
     _ref$autoShowTooltip = _ref.autoShowTooltip,
     autoShowTooltip = _ref$autoShowTooltip === void 0 ? true : _ref$autoShowTooltip,
     props = _objectWithoutProperties(_ref, _excluded);
-  var _useText = useText({
-      children: children
-    }),
-    key = _useText.key;
+  var _useText = useText(),
+    key = _useText.key,
+    onResize = _useText.onResize;
   if (tooltip === false || !rows) {
-    return _jsx("div", _objectSpread(_objectSpread({
+    return _jsx("span", _objectSpread(_objectSpread({
       css: style.wordBreak
     }, props), {}, {
       children: children
@@ -29,19 +29,18 @@ export function Text(_ref) {
   }
   var ellipsis = {
     rows: rows,
-    tooltip: getTooltipProps(_objectSpread({
-      align: {
-        offset: [0, 5]
-      }
-    }, generateTooltip(tooltip !== null && tooltip !== void 0 ? tooltip : children)))
+    tooltip: getTooltipProps(_objectSpread({}, generateTooltip(tooltip !== null && tooltip !== void 0 ? tooltip : children)))
   };
   if (autoShowTooltip) {
-    return _jsx(Paragraph, _objectSpread(_objectSpread({
-      css: style.wrapper
-    }, props), {}, {
-      ellipsis: ellipsis,
-      children: children
-    }), key);
+    return _jsx(ResizeObserver, {
+      onResize: onResize,
+      children: _jsx(Paragraph, _objectSpread(_objectSpread({
+        css: style.wrapper
+      }, props), {}, {
+        ellipsis: ellipsis,
+        children: children
+      }), key)
+    });
   }
   return _jsx(Tooltip, _objectSpread(_objectSpread({}, ellipsis.tooltip), {}, {
     children: _jsx(Paragraph, _objectSpread(_objectSpread({

package/es/text/component/use-text.d.ts

@@ -1,4 +1,5 @@
-import { TextProps } from "..";
-export declare function useText({ children }: TextProps): {
+import { SizeInfo } from 'rc-resize-observer';
+export declare function useText(): {
     key: number;
+    onResize: (size: SizeInfo) => void | undefined;
 };

package/es/text/component/use-text.js

@@ -1,24 +1,17 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { useDebounce, useWindowResize } from "../../hooks";
-import { useState } from 'react';
-import { useUpdateEffect } from 'react-use';
-export function useText(_ref) {
-  var children = _ref.children;
-  var _useState = useState(0),
-    _useState2 = _slicedToArray(_useState, 2),
-    key = _useState2[0],
-    setKey = _useState2[1];
-  var reset = useDebounce(setKey, 150);
-  useWindowResize(function (_ref2) {
-    var width = _ref2.width;
-    return reset(width);
+import { useDebounce, useSafeState } from "../../hooks";
+export function useText() {
+  var _useSafeState = useSafeState(0),
+    _useSafeState2 = _slicedToArray(_useSafeState, 2),
+    key = _useSafeState2[0],
+    setKey = _useSafeState2[1];
+  var reset = useDebounce(setKey, 150, {
+    leading: false
   });
-
-  // 修复某些场景下，tooltip 会自动显示的问题
-  useUpdateEffect(function () {
-    reset(Date.now());
-  }, [children]);
   return {
-    key: key
+    key: key,
+    onResize: function onResize(size) {
+      return reset(size.width);
+    }
   };
 }

package/es/text/component/utils.d.ts

@@ -1,3 +1,3 @@
 import { TextProps } from "..";
-import type { TooltipProps } from 'antd/lib/tooltip';
+import { TooltipProps } from "../../tooltip";
 export declare function generateTooltip(tooltip: TextProps['tooltip']): TooltipProps;

package/es/text/style/index.js

@@ -2,7 +2,7 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/esm/taggedTemplateLit
 var _templateObject, _templateObject2;
 import { css } from '@emotion/react';
 var style = {
-  wrapper: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    &.ant-typography {\n      color: inherit;\n      margin-bottom: 0;\n      max-width: 100%;\n    }\n  "]))),
+  wrapper: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    &.ant-typography {\n      font-size: inherit;\n      color: inherit;\n      margin-bottom: 0;\n      max-width: 100%;\n    }\n  "]))),
   wordBreak: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n    white-space: pre-wrap;\n    word-wrap: break-word;\n    word-break: break-word;\n  "])))
 };
 export default style;

package/es/text/type/index.d.ts

@@ -1,5 +1,5 @@
-import { EllipsisConfig } from 'antd/lib/typography/Base';
-import type { TypographyProps } from 'antd/lib/typography/Typography';
+import { EllipsisConfig } from 'antd/es/typography/Base';
+import type { TypographyProps } from 'antd/es/typography/Typography';
 export interface TextProps extends Omit<TypographyProps<any>, 'onChange'> {
     /**
      * @description 最多显示的行数，设置为 `0` 时，不显示省略号