acud 1.2.17 → 1.2.18

package/lib/table/baseTable/hooks/useStickyOffsets.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _react = require("react");
-
 /**
  * Get sticky column offset width
  */
@@ -16,28 +14,25 @@ function useStickyOffsets(colWidths, columnCount, direction) {
     var rightOffsets = [];
     var left = 0;
     var right = 0;
-
     for (var start = 0; start < columnCount; start += 1) {
       if (direction === 'rtl') {
         // Left offset
         rightOffsets[start] = right;
-        right += colWidths[start] || 0; // Right offset
-
+        right += colWidths[start] || 0;
+        // Right offset
         var end = columnCount - start - 1;
         leftOffsets[end] = left;
         left += colWidths[end] || 0;
       } else {
         // Left offset
         leftOffsets[start] = left;
-        left += colWidths[start] || 0; // Right offset
-
+        left += colWidths[start] || 0;
+        // Right offset
         var _end = columnCount - start - 1;
-
         rightOffsets[_end] = right;
         right += colWidths[_end] || 0;
       }
     }
-
     return {
       left: leftOffsets,
       right: rightOffsets
@@ -45,6 +40,5 @@ function useStickyOffsets(colWidths, columnCount, direction) {
   }, [colWidths, columnCount, direction]);
   return stickyOffsets;
 }
-
 var _default = useStickyOffsets;
 exports["default"] = _default;

package/lib/table/baseTable/index.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -30,16 +29,10 @@ Object.defineProperty(exports, "Summary", {
   }
 });
 exports["default"] = void 0;
-
 var _Table = _interopRequireDefault(require("./Table"));
-
 var _Footer = require("./Footer");
-
 var _Column = _interopRequireDefault(require("./sugar/Column"));
-
 var _ColumnGroup = _interopRequireDefault(require("./sugar/ColumnGroup"));
-
 var _legacyUtil = require("./utils/legacyUtil");
-
 var _default = _Table["default"];
 exports["default"] = _default;

package/lib/table/baseTable/interface.d.ts

@@ -1,10 +1,10 @@
 import type * as React from 'react';
 import { ColumnTitle } from '../interface';
-export declare type Key = React.Key;
-export declare type FixedType = 'left' | 'right' | boolean;
-export declare type DefaultRecordType = Record<string, any>;
-export declare type TableLayout = 'auto' | 'fixed';
-export declare type RowClassName<RecordType> = (record: RecordType, index: number, indent: number) => string;
+export type Key = React.Key;
+export type FixedType = 'left' | 'right' | boolean;
+export type DefaultRecordType = Record<string, any>;
+export type TableLayout = 'auto' | 'fixed';
+export type RowClassName<RecordType> = (record: RecordType, index: number, indent: number) => string;
 export interface CellType<RecordType> {
     key?: Key;
     className?: string;
@@ -22,8 +22,8 @@ export interface RenderedCell<RecordType> {
     props?: CellType<RecordType>;
     children?: React.ReactNode;
 }
-export declare type DataIndex = string | number | readonly (string | number)[];
-export declare type CellEllipsisType = {
+export type DataIndex = string | number | readonly (string | number)[];
+export type CellEllipsisType = {
     showTitle?: boolean;
 } | boolean;
 interface ColumnSharedType<RecordType> {
@@ -38,7 +38,7 @@ interface ColumnSharedType<RecordType> {
 export interface ColumnGroupType<RecordType> extends ColumnSharedType<RecordType> {
     children: ColumnsType<RecordType>;
 }
-export declare type AlignType = 'left' | 'center' | 'right';
+export type AlignType = 'left' | 'center' | 'right';
 export interface ColumnType<RecordType> extends Omit<ColumnSharedType<RecordType>, 'title'> {
     title?: ColumnTitle<RecordType>;
     colSpan?: number;
@@ -51,17 +51,17 @@ export interface ColumnType<RecordType> extends Omit<ColumnSharedType<RecordType
     /** @deprecated Please use `onCell` instead */
     onCellClick?: (record: RecordType, e: React.MouseEvent<HTMLElement>) => void;
 }
-export declare type ColumnsType<RecordType = unknown> = Array<ColumnGroupType<RecordType> | ColumnType<RecordType>>;
-export declare type GetRowKey<RecordType> = (record: RecordType, index?: number) => Key;
+export type ColumnsType<RecordType = unknown> = Array<ColumnGroupType<RecordType> | ColumnType<RecordType>>;
+export type GetRowKey<RecordType> = (record: RecordType, index?: number) => Key;
 export interface StickyOffsets {
     left: readonly number[];
     right: readonly number[];
     isSticky?: boolean;
 }
-export declare type GetComponentProps<DataType> = (data: DataType, index?: number) => React.HTMLAttributes<any> | React.TdHTMLAttributes<any>;
-declare type Component<P> = React.ComponentType<P> | React.ForwardRefExoticComponent<P> | React.FC<P> | keyof React.ReactHTML;
-export declare type CustomizeComponent = Component<any>;
-export declare type CustomizeScrollBody<RecordType> = (data: readonly RecordType[], info: {
+export type GetComponentProps<DataType> = (data: DataType, index?: number) => React.HTMLAttributes<any> | React.TdHTMLAttributes<any>;
+type Component<P> = React.ComponentType<P> | React.ForwardRefExoticComponent<P> | React.FC<P> | keyof React.ReactHTML;
+export type CustomizeComponent = Component<any>;
+export type CustomizeScrollBody<RecordType> = (data: readonly RecordType[], info: {
     scrollbarSize: number;
     ref: React.Ref<{
         scrollLeft: number;
@@ -84,8 +84,8 @@ export interface TableComponents<RecordType> {
         cell?: CustomizeComponent;
     };
 }
-export declare type GetComponent = (path: readonly string[], defaultComponent?: CustomizeComponent) => CustomizeComponent;
-export declare type ExpandableType = false | 'row' | 'nest';
+export type GetComponent = (path: readonly string[], defaultComponent?: CustomizeComponent) => CustomizeComponent;
+export type ExpandableType = false | 'row' | 'nest';
 export interface LegacyExpandableProps<RecordType> {
     /** @deprecated Use `expandable.expandedRowKeys` instead */
     expandedRowKeys?: Key[];
@@ -112,7 +112,7 @@ export interface LegacyExpandableProps<RecordType> {
     /** @deprecated Use `expandable.childrenColumnName` instead */
     childrenColumnName?: string;
 }
-export declare type ExpandedRowRender<ValueType> = (record: ValueType, index: number, indent: number, expanded: boolean) => React.ReactNode;
+export type ExpandedRowRender<ValueType> = (record: ValueType, index: number, indent: number, expanded: boolean) => React.ReactNode;
 export interface RenderExpandIconProps<RecordType> {
     prefixCls: string;
     expanded: boolean;
@@ -120,7 +120,7 @@ export interface RenderExpandIconProps<RecordType> {
     expandable: boolean;
     onExpand: TriggerEventHandler<RecordType>;
 }
-export declare type RenderExpandIcon<RecordType> = (props: RenderExpandIconProps<RecordType>) => React.ReactNode;
+export type RenderExpandIcon<RecordType> = (props: RenderExpandIconProps<RecordType>) => React.ReactNode;
 export interface ExpandableConfig<RecordType> {
     expandedRowKeys?: readonly Key[];
     defaultExpandedRowKeys?: readonly Key[];
@@ -140,8 +140,8 @@ export interface ExpandableConfig<RecordType> {
     columnWidth?: number | string;
     fixed?: FixedType;
 }
-export declare type PanelRender<RecordType> = (data: readonly RecordType[]) => React.ReactNode;
-export declare type TriggerEventHandler<RecordType> = (record: RecordType, event: React.MouseEvent<HTMLElement>) => void;
+export type PanelRender<RecordType> = (data: readonly RecordType[]) => React.ReactNode;
+export type TriggerEventHandler<RecordType> = (record: RecordType, event: React.MouseEvent<HTMLElement>) => void;
 export interface TableSticky {
     offsetHeader?: number;
     offsetSummary?: number;

package/lib/table/baseTable/stickyScrollBar.js

@@ -1,76 +1,53 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var React = _interopRequireWildcard(require("react"));
-
 var _addEventListener = _interopRequireDefault(require("rc-util/lib/Dom/addEventListener"));
-
 var _getScrollBarSize = _interopRequireDefault(require("rc-util/lib/getScrollBarSize"));
-
 var _classnames = _interopRequireDefault(require("classnames"));
-
 var _css = require("rc-util/lib/Dom/css");
-
 var _TableContext = _interopRequireDefault(require("./context/TableContext"));
-
 var _useFrame = require("./hooks/useFrame");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 var StickyScrollBar = function StickyScrollBar(_ref, ref) {
   var scrollBodyRef = _ref.scrollBodyRef,
-      onScroll = _ref.onScroll,
-      offsetScroll = _ref.offsetScroll,
-      container = _ref.container;
-
+    onScroll = _ref.onScroll,
+    offsetScroll = _ref.offsetScroll,
+    container = _ref.container;
   var _a, _b;
-
   var _React$useContext = React.useContext(_TableContext["default"]),
-      prefixCls = _React$useContext.prefixCls;
-
+    prefixCls = _React$useContext.prefixCls;
   var bodyScrollWidth = ((_a = scrollBodyRef.current) === null || _a === void 0 ? void 0 : _a.scrollWidth) || 0;
   var bodyWidth = ((_b = scrollBodyRef.current) === null || _b === void 0 ? void 0 : _b.clientWidth) || 0;
   var scrollBarWidth = bodyScrollWidth && bodyWidth * (bodyWidth / bodyScrollWidth);
   var scrollBarRef = React.useRef();
-
   var _useLayoutState = (0, _useFrame.useLayoutState)({
-    scrollLeft: 0,
-    isHiddenScrollBar: false
-  }),
-      _useLayoutState2 = (0, _slicedToArray2["default"])(_useLayoutState, 2),
-      scrollState = _useLayoutState2[0],
-      setScrollState = _useLayoutState2[1];
-
+      scrollLeft: 0,
+      isHiddenScrollBar: false
+    }),
+    _useLayoutState2 = (0, _slicedToArray2["default"])(_useLayoutState, 2),
+    scrollState = _useLayoutState2[0],
+    setScrollState = _useLayoutState2[1];
   var refState = React.useRef({
     delta: 0,
     x: 0
   });
-
   var _React$useState = React.useState(false),
-      _React$useState2 = (0, _slicedToArray2["default"])(_React$useState, 2),
-      isActive = _React$useState2[0],
-      setActive = _React$useState2[1];
-
+    _React$useState2 = (0, _slicedToArray2["default"])(_React$useState, 2),
+    isActive = _React$useState2[0],
+    setActive = _React$useState2[1];
   var onMouseUp = function onMouseUp() {
     setActive(false);
   };
-
   var onMouseDown = function onMouseDown(event) {
     event.persist();
     refState.current.delta = event.pageX - scrollState.scrollLeft;
@@ -78,46 +55,36 @@ var StickyScrollBar = function StickyScrollBar(_ref, ref) {
     setActive(true);
     event.preventDefault();
   };
-
   var onMouseMove = function onMouseMove(event) {
     // https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/buttons
     var _ref2 = event || (window === null || window === void 0 ? void 0 : window.event),
-        buttons = _ref2.buttons;
-
+      buttons = _ref2.buttons;
     if (!isActive || buttons === 0) {
       // If out body mouse up, we can set isActive false when mouse move
       if (isActive) {
         setActive(false);
       }
-
       return;
     }
-
     var left = refState.current.x + event.pageX - refState.current.x - refState.current.delta;
-
     if (left <= 0) {
       left = 0;
     }
-
     if (left + scrollBarWidth >= bodyWidth) {
       left = bodyWidth - scrollBarWidth;
     }
-
     onScroll({
       scrollLeft: left / bodyWidth * (bodyScrollWidth + 2)
     });
     refState.current.x = event.pageX;
   };
-
   var onContainerScroll = function onContainerScroll() {
     if (!scrollBodyRef.current) {
       return;
     }
-
     var tableOffsetTop = (0, _css.getOffset)(scrollBodyRef.current).top;
     var tableBottomOffset = tableOffsetTop + scrollBodyRef.current.offsetHeight;
     var currentClientOffset = container === window ? document.documentElement.scrollTop + window.innerHeight : (0, _css.getOffset)(container).top + container.clientHeight;
-
     if (tableBottomOffset - (0, _getScrollBarSize["default"])() <= currentClientOffset || tableOffsetTop >= currentClientOffset - offsetScroll) {
       setScrollState(function (state) {
         return (0, _extends2["default"])((0, _extends2["default"])({}, state), {
@@ -132,7 +99,6 @@ var StickyScrollBar = function StickyScrollBar(_ref, ref) {
       });
     }
   };
-
   var setScrollLeft = function setScrollLeft(left) {
     setScrollState(function (state) {
       return (0, _extends2["default"])((0, _extends2["default"])({}, state), {
@@ -140,7 +106,6 @@ var StickyScrollBar = function StickyScrollBar(_ref, ref) {
       });
     });
   };
-
   React.useImperativeHandle(ref, function () {
     return {
       setScrollLeft: setScrollLeft
@@ -167,22 +132,18 @@ var StickyScrollBar = function StickyScrollBar(_ref, ref) {
     if (!scrollState.isHiddenScrollBar) {
       setScrollState(function (state) {
         var bodyNode = scrollBodyRef.current;
-
         if (!bodyNode) {
           return state;
         }
-
         return (0, _extends2["default"])((0, _extends2["default"])({}, state), {
           scrollLeft: bodyNode.scrollLeft / bodyNode.scrollWidth * bodyNode.clientWidth
         });
       });
     }
   }, [scrollState.isHiddenScrollBar]);
-
   if (bodyScrollWidth <= bodyWidth || !scrollBarWidth || scrollState.isHiddenScrollBar) {
     return null;
   }
-
   return /*#__PURE__*/React.createElement("div", {
     style: {
       height: (0, _getScrollBarSize["default"])(),
@@ -200,7 +161,5 @@ var StickyScrollBar = function StickyScrollBar(_ref, ref) {
     }
   }));
 };
-
 var _default = /*#__PURE__*/React.forwardRef(StickyScrollBar);
-
 exports["default"] = _default;

package/lib/table/baseTable/sugar/Column.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 /* istanbul ignore next */
-
 /**
  * This is a syntactic sugar for `columns` prop.
  * So HOC will not work on this.
@@ -15,6 +13,5 @@ exports["default"] = void 0;
 function Column(_) {
   return null;
 }
-
 var _default = Column;
 exports["default"] = _default;

package/lib/table/baseTable/sugar/ColumnGroup.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 /* istanbul ignore next */
-
 /**
  * This is a syntactic sugar for `columns` prop.
  * So HOC will not work on this.
@@ -15,6 +13,5 @@ exports["default"] = void 0;
 function ColumnGroup(_) {
   return null;
 }
-
 var _default = ColumnGroup;
 exports["default"] = _default;

package/lib/table/baseTable/utils/expandUtil.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import * as React from 'react';
 import type { RenderExpandIconProps, Key, GetRowKey } from '../interface';
-export declare function renderExpandIcon<RecordType>({ prefixCls, record, onExpand, expanded, expandable }: RenderExpandIconProps<RecordType>): JSX.Element;
+export declare function renderExpandIcon<RecordType>({ prefixCls, record, onExpand, expanded, expandable }: RenderExpandIconProps<RecordType>): React.JSX.Element;
 export declare function findAllChildrenKeys<RecordType>(data: readonly RecordType[], getRowKey: GetRowKey<RecordType>, childrenColumnName: string): Key[];

package/lib/table/baseTable/utils/expandUtil.js

@@ -1,62 +1,47 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.findAllChildrenKeys = findAllChildrenKeys;
 exports.renderExpandIcon = renderExpandIcon;
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var React = _interopRequireWildcard(require("react"));
-
 var _classnames = _interopRequireDefault(require("classnames"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function renderExpandIcon(_ref) {
   var _classNames;
-
   var prefixCls = _ref.prefixCls,
-      record = _ref.record,
-      onExpand = _ref.onExpand,
-      expanded = _ref.expanded,
-      expandable = _ref.expandable;
+    record = _ref.record,
+    onExpand = _ref.onExpand,
+    expanded = _ref.expanded,
+    expandable = _ref.expandable;
   var expandClassName = "".concat(prefixCls, "-row-expand-icon");
-
   if (!expandable) {
     return /*#__PURE__*/React.createElement("span", {
       className: (0, _classnames["default"])(expandClassName, "".concat(prefixCls, "-row-spaced"))
     });
   }
-
   var onClick = function onClick(event) {
     onExpand(record, event);
     event.stopPropagation();
   };
-
   return /*#__PURE__*/React.createElement("span", {
     className: (0, _classnames["default"])(expandClassName, (_classNames = {}, (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-row-expanded"), expanded), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-row-collapsed"), !expanded), _classNames)),
     onClick: onClick
   });
 }
-
 function findAllChildrenKeys(data, getRowKey, childrenColumnName) {
   var keys = [];
-
   function dig(list) {
     (list || []).forEach(function (item, index) {
       keys.push(getRowKey(item, index));
       dig(item[childrenColumnName]);
     });
   }
-
   dig(data);
   return keys;
 }

package/lib/table/baseTable/utils/fixUtil.js

@@ -4,26 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getCellFixedInfo = getCellFixedInfo;
-
 function getCellFixedInfo(colStart, colEnd, columns, stickyOffsets, direction) {
   var startColumn = columns[colStart] || {};
   var endColumn = columns[colEnd] || {};
   var fixLeft;
   var fixRight;
-
   if (startColumn.fixed === 'left') {
     fixLeft = stickyOffsets.left[colStart];
   } else if (endColumn.fixed === 'right') {
     fixRight = stickyOffsets.right[colEnd];
   }
-
   var lastFixLeft = false;
   var firstFixRight = false;
   var lastFixRight = false;
   var firstFixLeft = false;
   var nextColumn = columns[colEnd + 1];
   var prevColumn = columns[colStart - 1];
-
   if (direction === 'rtl') {
     if (fixLeft !== undefined) {
       var prevFixLeft = prevColumn && prevColumn.fixed === 'left';
@@ -39,7 +35,6 @@ function getCellFixedInfo(colStart, colEnd, columns, stickyOffsets, direction) {
     var prevFixRight = prevColumn && prevColumn.fixed === 'right';
     firstFixRight = !prevFixRight;
   }
-
   return {
     fixLeft: fixLeft,
     fixRight: fixRight,

package/lib/table/baseTable/utils/legacyUtil.js

@@ -1,39 +1,27 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.INTERNAL_COL_DEFINE = void 0;
 exports.getExpandableProps = getExpandableProps;
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _warning = _interopRequireDefault(require("rc-util/lib/warning"));
-
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
-
-  for (var p in s) {
-    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
-  }
-
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
   if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
     if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
   }
   return t;
 };
-
 var INTERNAL_COL_DEFINE = 'RC_TABLE_INTERNAL_COL_DEFINE';
 exports.INTERNAL_COL_DEFINE = INTERNAL_COL_DEFINE;
-
 function getExpandableProps(props) {
   var expandable = props.expandable,
-      legacyExpandableConfig = __rest(props, ["expandable"]);
-
+    legacyExpandableConfig = __rest(props, ["expandable"]);
   var config;
-
   if ('expandable' in props) {
     config = (0, _extends2["default"])((0, _extends2["default"])({}, legacyExpandableConfig), expandable);
   } else {
@@ -42,13 +30,10 @@ function getExpandableProps(props) {
     })) {
       (0, _warning["default"])(false, 'expanded related props have been moved into `expandable`.');
     }
-
     config = legacyExpandableConfig;
   }
-
   if (config.showExpandColumn === false) {
     config.expandIconColumnIndex = -1;
   }
-
   return config;
 }

package/lib/table/baseTable/utils/valueUtil.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,69 +8,53 @@ exports.getColumnsKey = getColumnsKey;
 exports.getPathValue = getPathValue;
 exports.mergeObject = mergeObject;
 exports.validateValue = validateValue;
-
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
 var INTERNAL_KEY_PREFIX = 'RC_TABLE_KEY';
-
 function toArray(arr) {
   if (arr === undefined || arr === null) {
     return [];
   }
-
   return Array.isArray(arr) ? arr : [arr];
 }
-
 function getPathValue(record, path) {
   // Skip if path is empty
   if (!path && typeof path !== 'number') {
     return record;
   }
-
   var pathList = toArray(path);
   var current = record;
-
   for (var i = 0; i < pathList.length; i += 1) {
     if (!current) {
       return null;
     }
-
     var prop = pathList[i];
     current = current[prop];
   }
-
   return current;
 }
-
 function getColumnsKey(columns) {
   var columnKeys = [];
   var keys = {};
   columns.forEach(function (column) {
     var _ref = column || {},
-        key = _ref.key,
-        dataIndex = _ref.dataIndex;
-
+      key = _ref.key,
+      dataIndex = _ref.dataIndex;
     var mergedKey = key || toArray(dataIndex).join('-') || INTERNAL_KEY_PREFIX;
-
     while (keys[mergedKey]) {
       mergedKey = "".concat(mergedKey, "_next");
     }
-
     keys[mergedKey] = true;
     columnKeys.push(mergedKey);
   });
   return columnKeys;
 }
-
 function mergeObject() {
   var merged = {};
   /* eslint-disable no-param-reassign */
-
   function fillProps(obj, clone) {
     if (clone) {
       Object.keys(clone).forEach(function (key) {
         var value = clone[key];
-
         if (value && (0, _typeof2["default"])(value) === 'object') {
           obj[key] = obj[key] || {};
           fillProps(obj[key], value);
@@ -82,18 +65,14 @@ function mergeObject() {
     }
   }
   /* eslint-enable */
-
-
   for (var _len = arguments.length, objects = new Array(_len), _key = 0; _key < _len; _key++) {
     objects[_key] = arguments[_key];
   }
-
   objects.forEach(function (clone) {
     fillProps(merged, clone);
   });
   return merged;
 }
-
 function validateValue(val) {
   return val !== null && val !== undefined;
 }

package/lib/table/hooks/useFilter/FilterDropdown.d.ts

@@ -16,5 +16,5 @@ export interface FilterDropdownProps<RecordType> {
     locale: TableLocale;
     getPopupContainer?: GetPopupContainer;
 }
-declare function FilterDropdown<RecordType>(props: FilterDropdownProps<RecordType>): JSX.Element;
+declare function FilterDropdown<RecordType>(props: FilterDropdownProps<RecordType>): React.JSX.Element;
 export default FilterDropdown;