@douyinfe/semi-ui 2.19.0-alpha.2 → 2.19.0-alpha.3

package/lib/es/popconfirm/index.d.ts

@@ -27,13 +27,15 @@ export interface PopconfirmProps extends PopoverProps {
     zIndex?: number;
     trigger?: Trigger;
     position?: Position;
-    onCancel?: (e: React.MouseEvent) => void;
-    onConfirm?: (e: React.MouseEvent) => void;
+    onCancel?: (e: React.MouseEvent) => Promise<any> | void;
+    onConfirm?: (e: React.MouseEvent) => Promise<any> | void;
     onVisibleChange?: (visible: boolean) => void;
     onClickOutSide?: (e: React.MouseEvent) => void;
 }
 export interface PopconfirmState {
     visible: boolean;
+    cancelLoading: boolean;
+    confirmLoading: boolean;
 }
 export default class Popconfirm extends BaseComponent<PopconfirmProps, PopconfirmState> {
     static contextType: React.Context<ContextValue>;

package/lib/es/popconfirm/index.js

@@ -44,6 +44,8 @@ export default class Popconfirm extends BaseComponent {
     this.stopImmediatePropagation = e => e && e.nativeEvent && e.nativeEvent.stopImmediatePropagation();
 
     this.state = {
+      cancelLoading: false,
+      confirmLoading: false,
       visible: props.defaultVisible || false
     };
     this.foundation = new PopconfirmFoundation(this.adapter);
@@ -67,6 +69,12 @@ export default class Popconfirm extends BaseComponent {
       setVisible: visible => this.setState({
         visible
       }),
+      updateConfirmLoading: loading => this.setState({
+        confirmLoading: loading
+      }),
+      updateCancelLoading: loading => this.setState({
+        cancelLoading: loading
+      }),
       notifyConfirm: e => this.props.onConfirm(e),
       notifyCancel: e => this.props.onCancel(e),
       notifyVisibleChange: visible => this.props.onVisibleChange(visible),
@@ -83,15 +91,21 @@ export default class Popconfirm extends BaseComponent {
       cancelButtonProps,
       okButtonProps
     } = this.props;
+    const {
+      cancelLoading,
+      confirmLoading
+    } = this.state;
     return /*#__PURE__*/React.createElement(LocaleConsumer, {
       componentName: "Popconfirm"
     }, (locale, localeCode) => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, _Object$assign({
       type: cancelType,
-      onClick: this.handleCancel
+      onClick: this.handleCancel,
+      loading: cancelLoading
     }, cancelButtonProps), cancelText || _get(locale, 'cancel')), /*#__PURE__*/React.createElement(Button, _Object$assign({
       type: okType,
       theme: "solid",
-      onClick: this.handleConfirm
+      onClick: this.handleConfirm,
+      loading: confirmLoading
     }, okButtonProps), okText || _get(locale, 'confirm'))));
   }
 
@@ -113,35 +127,39 @@ export default class Popconfirm extends BaseComponent {
     });
     const showTitle = title !== null && typeof title !== 'undefined';
     const showContent = content !== null || typeof content !== 'undefined';
-    return /*#__PURE__*/React.createElement("div", {
-      className: popCardCls,
-      onClick: this.stopImmediatePropagation,
-      style: style
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "".concat(prefixCls, "-inner")
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "".concat(prefixCls, "-header")
-    }, /*#__PURE__*/React.createElement("i", {
-      className: "".concat(prefixCls, "-header-icon"),
-      "x-semi-prop": "icon"
-    }, /*#__PURE__*/React.isValidElement(icon) ? icon : null), /*#__PURE__*/React.createElement("div", {
-      className: "".concat(prefixCls, "-header-body")
-    }, showTitle ? /*#__PURE__*/React.createElement("div", {
-      className: "".concat(prefixCls, "-header-title"),
-      "x-semi-prop": "title"
-    }, title) : null, showContent ? /*#__PURE__*/React.createElement("div", {
-      className: "".concat(prefixCls, "-header-content"),
-      "x-semi-prop": "content"
-    }, content) : null), /*#__PURE__*/React.createElement(Button, {
-      className: "".concat(prefixCls, "-btn-close"),
-      icon: /*#__PURE__*/React.createElement(IconClose, null),
-      size: "small",
-      theme: 'borderless',
-      type: cancelType,
-      onClick: this.handleCancel
-    })), /*#__PURE__*/React.createElement("div", {
-      className: "".concat(prefixCls, "-footer")
-    }, this.renderControls())));
+    return (
+      /*#__PURE__*/
+      // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+      React.createElement("div", {
+        className: popCardCls,
+        onClick: this.stopImmediatePropagation,
+        style: style
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "".concat(prefixCls, "-inner")
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "".concat(prefixCls, "-header")
+      }, /*#__PURE__*/React.createElement("i", {
+        className: "".concat(prefixCls, "-header-icon"),
+        "x-semi-prop": "icon"
+      }, /*#__PURE__*/React.isValidElement(icon) ? icon : null), /*#__PURE__*/React.createElement("div", {
+        className: "".concat(prefixCls, "-header-body")
+      }, showTitle ? /*#__PURE__*/React.createElement("div", {
+        className: "".concat(prefixCls, "-header-title"),
+        "x-semi-prop": "title"
+      }, title) : null, showContent ? /*#__PURE__*/React.createElement("div", {
+        className: "".concat(prefixCls, "-header-content"),
+        "x-semi-prop": "content"
+      }, content) : null), /*#__PURE__*/React.createElement(Button, {
+        className: "".concat(prefixCls, "-btn-close"),
+        icon: /*#__PURE__*/React.createElement(IconClose, null),
+        size: "small",
+        theme: 'borderless',
+        type: cancelType,
+        onClick: this.handleCancel
+      })), /*#__PURE__*/React.createElement("div", {
+        className: "".concat(prefixCls, "-footer")
+      }, this.renderControls())))
+    );
   }
 
   render() {

package/lib/es/radio/radioGroup.js

@@ -1,10 +1,7 @@
 import _noop from "lodash/noop";
-import _get from "lodash/get";
 import _Object$assign from "@babel/runtime-corejs3/core-js-stable/object/assign";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
-import _someInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/some";
-import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
@@ -104,8 +101,7 @@ class RadioGroup extends BaseComponent {
           return /*#__PURE__*/React.createElement(Radio, {
             key: index,
             disabled: this.props.disabled,
-            value: option,
-            type: type
+            value: option
           }, option);
         } else {
           return /*#__PURE__*/React.createElement(Radio, {
@@ -114,37 +110,16 @@ class RadioGroup extends BaseComponent {
             value: option.value,
             extra: option.extra,
             className: option.className,
-            style: option.style,
-            type: type
+            style: option.style
           }, option.label);
         }
       });
     } else if (children) {
       var _context5;
 
-      inner = _mapInstanceProperty(_context5 = React.Children).call(_context5, children, (itm, index) => {
-        if ( /*#__PURE__*/React.isValidElement(itm)) {
-          var _context6;
-
-          const props = {
-            key: index
-          };
-
-          const isRadioComp = _someInstanceProperty(_context6 = ['Radio', 'RadioWithGroup']).call(_context6, comp => {
-            var _context7;
-
-            return _includesInstanceProperty(_context7 = [_get(itm, 'type.displayName'), _get(itm, 'type.name')]).call(_context7, comp);
-          });
-
-          if (isRadioComp) {
-            props.type = type;
-          }
-
-          return /*#__PURE__*/React.cloneElement(itm, props);
-        } else {
-          return null;
-        }
-      });
+      inner = _mapInstanceProperty(_context5 = React.Children).call(_context5, children, (itm, index) => /*#__PURE__*/React.isValidElement(itm) ? /*#__PURE__*/React.cloneElement(itm, {
+        key: index
+      }) : null);
     }
 
     return /*#__PURE__*/React.createElement("div", {

package/lib/es/table/ColumnFilter.js

@@ -153,12 +153,14 @@ export default function ColumnFilter() {
   } else {
     iconElem = /*#__PURE__*/React.createElement("div", {
       className: finalCls
-    }, /*#__PURE__*/React.createElement(IconFilter, {
+    }, '\u200b'
+    /* ZWSP(zero-width space) */
+    , /*#__PURE__*/React.createElement(IconFilter, {
       role: "button",
       "aria-label": "Filter data with this column",
       "aria-haspopup": "listbox",
       tabIndex: -1,
-      size: "small"
+      size: "default"
     }));
   }
 

package/lib/es/table/ColumnSorter.d.ts

@@ -7,6 +7,7 @@ export interface ColumnSorterProps {
     onClick?: (e: React.MouseEvent<HTMLDivElement>) => void;
     prefixCls?: string;
     sortOrder?: SortOrder;
+    title?: React.ReactNode;
 }
 export default class ColumnSorter extends PureComponent<ColumnSorterProps> {
     static propTypes: {

package/lib/es/table/ColumnSorter.js

@@ -12,9 +12,10 @@ export default class ColumnSorter extends PureComponent {
       prefixCls,
       onClick,
       sortOrder,
-      style
+      style,
+      title
     } = this.props;
-    const iconBtnSize = 'small';
+    const iconBtnSize = 'default';
     const upCls = cls("".concat(prefixCls, "-column-sorter-up"), {
       on: sortOrder === strings.SORT_DIRECTIONS[0]
     });
@@ -33,11 +34,13 @@ export default class ColumnSorter extends PureComponent {
       role: 'button'
     }, ariaProps, {
       tabIndex: -1,
-      style: style,
-      className: "".concat(prefixCls, "-column-sorter"),
+      className: "".concat(prefixCls, "-column-sorter-wrapper"),
       onClick: onClick,
       onKeyPress: e => isEnterPress(e) && onClick(e)
-    }), /*#__PURE__*/React.createElement("span", {
+    }), title, /*#__PURE__*/React.createElement("div", {
+      style: style,
+      className: "".concat(prefixCls, "-column-sorter")
+    }, /*#__PURE__*/React.createElement("span", {
       className: "".concat(upCls)
     }, /*#__PURE__*/React.createElement(IconCaretup, {
       size: iconBtnSize
@@ -45,7 +48,7 @@ export default class ColumnSorter extends PureComponent {
       className: "".concat(downCls)
     }, /*#__PURE__*/React.createElement(IconCaretdown, {
       size: iconBtnSize
-    })));
+    }))));
   }
 
 }

package/lib/es/table/Table.js

@@ -494,15 +494,23 @@ class Table extends BaseComponent {
         const defaultSortOrder = _get(curQuery, 'defaultSortOrder', false);
 
         const sortOrder = _this.foundation.isSortOrderValid(stateSortOrder) ? stateSortOrder : defaultSortOrder;
+        const TitleNode = typeof rawTitle !== 'function' && /*#__PURE__*/React.createElement(React.Fragment, {
+          key: strings.DEFAULT_KEY_COLUMN_TITLE
+        }, rawTitle);
 
         if (typeof column.sorter === 'function' || column.sorter === true) {
+          // In order to increase the click hot area of ​​sorting, when sorting is required & useFullRender is false,
+          // both the title and sorting areas are used as the click hot area for sorting。
           const sorter = /*#__PURE__*/React.createElement(ColumnSorter, {
             key: strings.DEFAULT_KEY_COLUMN_SORTER,
             sortOrder: sortOrder,
-            onClick: e => _this.foundation.handleSort(column, e)
+            onClick: e => _this.foundation.handleSort(column, e),
+            title: TitleNode
           });
           useFullRender && (titleMap.sorter = sorter);
           titleArr.push(sorter);
+        } else {
+          titleArr.push(TitleNode);
         }
 
         const stateFilteredValue = _get(curQuery, 'filteredValue');
@@ -523,9 +531,7 @@ class Table extends BaseComponent {
           titleArr.push(filter);
         }
 
-        const newTitle = typeof rawTitle === 'function' ? () => rawTitle(titleMap) : titleArr.unshift( /*#__PURE__*/React.createElement(React.Fragment, {
-          key: strings.DEFAULT_KEY_COLUMN_TITLE
-        }, rawTitle)) && titleArr;
+        const newTitle = typeof rawTitle === 'function' ? () => rawTitle(titleMap) : titleArr;
         column = _Object$assign(_Object$assign({}, column), {
           title: newTitle
         });

package/lib/es/tabs/TabBar.js

@@ -125,7 +125,11 @@ class TabBar extends React.Component {
       var _context5, _context6;
 
       if (_isEmpty(items)) {
-        return null;
+        return /*#__PURE__*/React.createElement(Button, {
+          disabled: true,
+          icon: icon,
+          theme: "borderless"
+        });
       }
 
       const {

package/lib/es/transfer/index.js

@@ -280,7 +280,8 @@ class Transfer extends BaseComponent {
     const noMatch = inSearchMode && searchResult.size === 0;
     const emptySearch = emptyContent.search ? emptyContent.search : locale.emptySearch;
     const emptyLeft = emptyContent.left ? emptyContent.left : locale.emptyLeft;
-    const emptyCom = this.renderEmpty('left', inputValue ? emptySearch : emptyLeft);
+    const emptyDataCom = this.renderEmpty('left', emptyLeft);
+    const emptySearchCom = this.renderEmpty('left', emptySearch);
     const loadingCom = /*#__PURE__*/React.createElement(Spin, null);
     let content = null;
 
@@ -290,7 +291,11 @@ class Transfer extends BaseComponent {
         break;
 
       case noMatch:
-        content = emptyCom;
+        content = emptySearchCom;
+        break;
+
+      case data.length === 0:
+        content = emptyDataCom;
         break;
 
       case type === strings.TYPE_TREE_TO_LIST:

package/lib/es/typography/title.d.ts

@@ -37,7 +37,7 @@ export default class Title extends PureComponent<TitleProps> {
         underline: PropTypes.Requireable<boolean>;
         strong: PropTypes.Requireable<boolean>;
         type: PropTypes.Requireable<"warning" | "success" | "primary" | "tertiary" | "secondary" | "danger" | "quaternary">;
-        heading: PropTypes.Requireable<1 | 2 | 3 | 4 | 5 | 6>;
+        heading: PropTypes.Requireable<4 | 2 | 1 | 3 | 5 | 6>;
         style: PropTypes.Requireable<object>;
         className: PropTypes.Requireable<string>;
         component: PropTypes.Requireable<string>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-ui",
-    "version": "2.19.0-alpha.2",
+    "version": "2.19.0-alpha.3",
     "description": "",
     "main": "lib/cjs/index.js",
     "module": "lib/es/index.js",
@@ -15,11 +15,11 @@
     "dependencies": {
         "@babel/runtime-corejs3": "^7.15.4",
         "@douyinfe/semi-animation": "2.12.0",
-        "@douyinfe/semi-animation-react": "2.19.0-alpha.2",
-        "@douyinfe/semi-foundation": "2.19.0-alpha.2",
-        "@douyinfe/semi-icons": "2.19.0-alpha.2",
+        "@douyinfe/semi-animation-react": "2.19.0-alpha.3",
+        "@douyinfe/semi-foundation": "2.19.0-alpha.3",
+        "@douyinfe/semi-icons": "2.19.0-alpha.3",
         "@douyinfe/semi-illustrations": "2.15.0",
-        "@douyinfe/semi-theme-default": "2.19.0-alpha.2",
+        "@douyinfe/semi-theme-default": "2.19.0-alpha.3",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
         "copy-text-to-clipboard": "^2.1.1",
@@ -66,13 +66,13 @@
     ],
     "author": "",
     "license": "MIT",
-    "gitHead": "8f3924ea67e8b1df150c590927421b42f7325074",
+    "gitHead": "db52c2a32ffb9587992b72bf7114289a4759e790",
     "devDependencies": {
         "@babel/plugin-proposal-decorators": "^7.15.8",
         "@babel/plugin-transform-runtime": "^7.15.8",
         "@babel/preset-env": "^7.15.8",
         "@babel/preset-react": "^7.14.5",
-        "@douyinfe/semi-scss-compile": "2.19.0-alpha.2",
+        "@douyinfe/semi-scss-compile": "2.19.0-alpha.3",
         "@storybook/addon-knobs": "^6.3.1",
         "@types/lodash": "^4.14.176",
         "@types/react": ">=16.0.0",

package/popconfirm/_story/popconfirm.stories.js

@@ -167,4 +167,40 @@ export const ClickOutSideDemo = () => {
 
 ClickOutSideDemo.story = {
   name: 'ClickOutSideDemo',
-};
+};
+
+export const PromiseCallback = () => {
+  const onConfirm = () => {
+    return new Promise((resolve, reject) => {
+      setTimeout(() => {
+        console.log('ccc');
+        resolve(1);
+      }, 2000)
+    })
+  };
+
+  const onCancel = () => {
+    return new Promise((resolve, reject) => {
+      setTimeout(() => {
+        console.log('ccc');
+        reject(1);
+      }, 2000)
+    })
+  };
+
+  return (
+    <Popconfirm
+      title="确定是否要保存此修改？"
+      content="此修改将不可逆"
+      onConfirm={onConfirm}
+      onCancel={onCancel}
+    >
+      <Button>保存</Button>
+    </Popconfirm>
+  );
+};
+
+PromiseCallback.story = {
+  name: 'PromiseCallbackDemo',
+};
+

package/popconfirm/index.tsx

@@ -35,14 +35,16 @@ export interface PopconfirmProps extends PopoverProps {
     zIndex?: number;
     trigger?: Trigger;
     position?: Position;
-    onCancel?: (e: React.MouseEvent) => void;
-    onConfirm?: (e: React.MouseEvent) => void;
+    onCancel?: (e: React.MouseEvent) => Promise<any> | void;
+    onConfirm?: (e: React.MouseEvent) => Promise<any> | void;
     onVisibleChange?: (visible: boolean) => void;
     onClickOutSide?: (e: React.MouseEvent) => void;
 }
 
 export interface PopconfirmState {
     visible: boolean;
+    cancelLoading: boolean;
+    confirmLoading: boolean;
 }
 
 interface PopProps {
@@ -99,6 +101,8 @@ export default class Popconfirm extends BaseComponent<PopconfirmProps, Popconfir
         super(props);
 
         this.state = {
+            cancelLoading: false,
+            confirmLoading: false,
             visible: props.defaultVisible || false,
         };
 
@@ -122,8 +126,10 @@ export default class Popconfirm extends BaseComponent<PopconfirmProps, Popconfir
         return {
             ...super.adapter,
             setVisible: (visible: boolean): void => this.setState({ visible }),
-            notifyConfirm: (e: React.MouseEvent): void => this.props.onConfirm(e),
-            notifyCancel: (e: React.MouseEvent): void => this.props.onCancel(e),
+            updateConfirmLoading: (loading: boolean): void => this.setState({ confirmLoading: loading }),
+            updateCancelLoading: (loading: boolean): void => this.setState({ cancelLoading: loading }),
+            notifyConfirm: (e: React.MouseEvent): Promise<any> | void => this.props.onConfirm(e),
+            notifyCancel: (e: React.MouseEvent): Promise<any> | void => this.props.onCancel(e),
             notifyVisibleChange: (visible: boolean): void => this.props.onVisibleChange(visible),
             notifyClickOutSide: (e: React.MouseEvent) => this.props.onClickOutSide(e),
         };
@@ -141,14 +147,15 @@ export default class Popconfirm extends BaseComponent<PopconfirmProps, Popconfir
 
     renderControls() {
         const { okText, cancelText, okType, cancelType, cancelButtonProps, okButtonProps } = this.props;
+        const { cancelLoading, confirmLoading } = this.state;
         return (
             <LocaleConsumer componentName="Popconfirm">
                 {(locale: LocaleObject['Popconfirm'], localeCode: string) => (
                     <>
-                        <Button type={cancelType} onClick={this.handleCancel} {...cancelButtonProps}>
+                        <Button type={cancelType} onClick={this.handleCancel} loading={cancelLoading} {...cancelButtonProps}>
                             {cancelText || get(locale, 'cancel')}
                         </Button>
-                        <Button type={okType} theme="solid" onClick={this.handleConfirm} {...okButtonProps}>
+                        <Button type={okType} theme="solid" onClick={this.handleConfirm} loading={confirmLoading} {...okButtonProps}>
                             {okText || get(locale, 'confirm')}
                         </Button>
                     </>
@@ -171,6 +178,7 @@ export default class Popconfirm extends BaseComponent<PopconfirmProps, Popconfir
         const showContent = content !== null || typeof content !== 'undefined';
 
         return (
+            // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
             <div className={popCardCls} onClick={this.stopImmediatePropagation} style={style}>
                 <div className={`${prefixCls}-inner`}>
                     <div className={`${prefixCls}-header`}>

package/radio/radioGroup.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import { get, noop } from 'lodash';
+import { noop } from 'lodash';
 
 import { radioGroupClasses as css, strings } from '@douyinfe/semi-foundation/radio/constants';
 import RadioGroupFoundation, { RadioGroupAdapter } from '@douyinfe/semi-foundation/radio/radioGroupFoundation';
@@ -177,7 +177,6 @@ class RadioGroup extends BaseComponent<RadioGroupProps, RadioGroupState> {
                             key={index}
                             disabled={this.props.disabled}
                             value={option}
-                            type={type}
                         >
                             {option}
                         </Radio>
@@ -191,7 +190,6 @@ class RadioGroup extends BaseComponent<RadioGroupProps, RadioGroupState> {
                             extra={option.extra}
                             className={option.className}
                             style={option.style}
-                            type={type}
                         >
                             {option.label}
                         </Radio>
@@ -199,18 +197,9 @@ class RadioGroup extends BaseComponent<RadioGroupProps, RadioGroupState> {
                 }
             });
         } else if (children) {
-            inner = React.Children.map(children, (itm, index) => {
-                if (React.isValidElement(itm)) {
-                    const props: Record<string, any> = { key: index };
-                    const isRadioComp = ['Radio', 'RadioWithGroup'].some(comp => [get(itm, 'type.displayName'), get(itm, 'type.name')].includes(comp));
-                    if (isRadioComp) {
-                        props.type = type;
-                    }
-                    return React.cloneElement(itm, props);
-                } else {
-                    return null;
-                }
-            });
+            inner = React.Children.map(children, (itm, index) => (React.isValidElement(itm) ?
+                React.cloneElement(itm, { key: index }) :
+                null));
         }
 
         return (

package/table/ColumnFilter.tsx

@@ -164,12 +164,13 @@ export default function ColumnFilter(props: ColumnFilterProps = {}): React.React
     } else {
         iconElem = (
             <div className={finalCls}>
+                {'\u200b'/* ZWSP(zero-width space) */}
                 <IconFilter
                     role="button"
                     aria-label="Filter data with this column"
                     aria-haspopup="listbox"
                     tabIndex={-1}
-                    size="small"
+                    size="default"
                 />
             </div>
         );

package/table/ColumnSorter.tsx

@@ -15,6 +15,7 @@ export interface ColumnSorterProps {
     onClick?: (e: React.MouseEvent<HTMLDivElement>) => void;
     prefixCls?: string;
     sortOrder?: SortOrder;
+    title?: React.ReactNode;
 }
 
 export default class ColumnSorter extends PureComponent<ColumnSorterProps> {
@@ -33,9 +34,9 @@ export default class ColumnSorter extends PureComponent<ColumnSorterProps> {
     };
 
     render() {
-        const { prefixCls, onClick, sortOrder, style } = this.props;
+        const { prefixCls, onClick, sortOrder, style, title } = this.props;
 
-        const iconBtnSize = 'small';
+        const iconBtnSize = 'default';
 
         const upCls = cls(`${prefixCls}-column-sorter-up`, {
             on: sortOrder === strings.SORT_DIRECTIONS[0],
@@ -58,17 +59,22 @@ export default class ColumnSorter extends PureComponent<ColumnSorterProps> {
                 role='button'
                 {...ariaProps}
                 tabIndex={-1}
-                style={style}
-                className={`${prefixCls}-column-sorter`}
+                className={`${prefixCls}-column-sorter-wrapper`}
                 onClick={onClick}
                 onKeyPress={e => isEnterPress(e) && onClick(e as any)}
             >
-                <span className={`${upCls}`}>
-                    <IconCaretup size={iconBtnSize} />
-                </span>
-                <span className={`${downCls}`}>
-                    <IconCaretdown size={iconBtnSize} />
-                </span>
+                {title}
+                <div
+                    style={style}
+                    className={`${prefixCls}-column-sorter`}
+                >
+                    <span className={`${upCls}`}>
+                        <IconCaretup size={iconBtnSize} />
+                    </span>
+                    <span className={`${downCls}`}>
+                        <IconCaretdown size={iconBtnSize} />
+                    </span>
+                </div>
             </div>
         );
     }

package/table/Table.tsx

@@ -933,16 +933,22 @@ class Table<RecordType extends Record<string, any>> extends BaseComponent<Normal
             const stateSortOrder = get(curQuery, 'sortOrder');
             const defaultSortOrder = get(curQuery, 'defaultSortOrder', false);
             const sortOrder = this.foundation.isSortOrderValid(stateSortOrder) ? stateSortOrder : defaultSortOrder;
+            const TitleNode = typeof rawTitle !== 'function' && <React.Fragment key={strings.DEFAULT_KEY_COLUMN_TITLE}>{rawTitle as React.ReactNode}</React.Fragment>;
             if (typeof column.sorter === 'function' || column.sorter === true) {
+                // In order to increase the click hot area of ​​sorting, when sorting is required & useFullRender is false,
+                // both the title and sorting areas are used as the click hot area for sorting。
                 const sorter = (
                     <ColumnSorter
                         key={strings.DEFAULT_KEY_COLUMN_SORTER}
                         sortOrder={sortOrder}
                         onClick={e => this.foundation.handleSort(column, e)}
+                        title={TitleNode}
                     />
                 );
                 useFullRender && (titleMap.sorter = sorter);
                 titleArr.push(sorter);
+            } else {
+                titleArr.push(TitleNode);
             }
 
             const stateFilteredValue = get(curQuery, 'filteredValue');
@@ -964,10 +970,7 @@ class Table<RecordType extends Record<string, any>> extends BaseComponent<Normal
 
             const newTitle =
                 typeof rawTitle === 'function' ?
-                    () => rawTitle(titleMap) :
-                    titleArr.unshift(
-                        <React.Fragment key={strings.DEFAULT_KEY_COLUMN_TITLE}>{rawTitle}</React.Fragment>
-                    ) && titleArr;
+                    () => rawTitle(titleMap) : titleArr;
 
             column = { ...column, title: newTitle };
         }