@douyinfe/semi-ui 2.48.0-beta.0 → 2.49.0-beta.0

package/lib/cjs/banner/index.d.ts

@@ -26,8 +26,8 @@ export default class Banner extends BaseComponent<BannerProps, BannerState> {
         type: PropTypes.Requireable<string>;
         title: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         description: PropTypes.Requireable<PropTypes.ReactNodeLike>;
-        icon: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;
-        closeIcon: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;
+        icon: PropTypes.Requireable<PropTypes.ReactNodeLike>;
+        closeIcon: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         children: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         style: PropTypes.Requireable<object>;
         className: PropTypes.Requireable<string>;

package/lib/cjs/banner/index.js

@@ -167,8 +167,8 @@ Banner.propTypes = {
   type: _propTypes.default.oneOf(types),
   title: _propTypes.default.node,
   description: _propTypes.default.node,
-  icon: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]),
-  closeIcon: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]),
+  icon: _propTypes.default.node,
+  closeIcon: _propTypes.default.node,
   children: _propTypes.default.node,
   style: _propTypes.default.object,
   className: _propTypes.default.string,

package/lib/cjs/breadcrumb/item.d.ts

@@ -29,7 +29,7 @@ export default class BreadcrumbItem extends BaseComponent<BreadcrumbItemProps, B
         children: propTypes.Requireable<propTypes.ReactNodeLike>;
         active: propTypes.Requireable<boolean>;
         shouldRenderSeparator: propTypes.Requireable<boolean>;
-        icon: propTypes.Requireable<NonNullable<propTypes.ReactNodeLike>>;
+        icon: propTypes.Requireable<propTypes.ReactNodeLike>;
         separator: propTypes.Requireable<propTypes.ReactNodeLike>;
         noLink: propTypes.Requireable<boolean>;
     };

package/lib/cjs/breadcrumb/item.js

@@ -188,7 +188,7 @@ BreadcrumbItem.propTypes = {
   children: _propTypes.default.node,
   active: _propTypes.default.bool,
   shouldRenderSeparator: _propTypes.default.bool,
-  icon: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]),
+  icon: _propTypes.default.node,
   separator: _propTypes.default.node,
   noLink: _propTypes.default.bool
 };

package/lib/cjs/calendar/dayCalendar.d.ts

@@ -20,6 +20,7 @@ export default class DayCalendar extends BaseComponent<DayCalendarProps, DayCale
         mode: PropTypes.Requireable<string>;
         renderTimeDisplay: PropTypes.Requireable<(...args: any[]) => any>;
         markWeekend: PropTypes.Requireable<boolean>;
+        minEventHeight: PropTypes.Requireable<number>;
         scrollTop: PropTypes.Requireable<number>;
         width: PropTypes.Requireable<NonNullable<string | number>>;
         height: PropTypes.Requireable<NonNullable<string | number>>;

package/lib/cjs/calendar/dayCalendar.js

@@ -125,7 +125,8 @@ class DayCalendar extends _baseComponent.default {
       height,
       width,
       style,
-      header
+      header,
+      minEventHeight
     } = this.props;
     const dayCls = (0, _classnames.default)(prefixCls, className);
     const dayStyle = Object.assign({
@@ -158,6 +159,7 @@ class DayCalendar extends _baseComponent.default {
       handleClick: this.handleClick,
       showCurrTime: showCurrTime,
       isWeekend: this.isWeekend,
+      minEventHeight: minEventHeight,
       dateGridRender: dateGridRender
     }))));
   }
@@ -172,6 +174,7 @@ DayCalendar.propTypes = {
   mode: _propTypes.default.string,
   renderTimeDisplay: _propTypes.default.func,
   markWeekend: _propTypes.default.bool,
+  minEventHeight: _propTypes.default.number,
   scrollTop: _propTypes.default.number,
   width: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
   height: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),

package/lib/cjs/calendar/dayCol.d.ts

@@ -17,6 +17,7 @@ export default class DayCol extends BaseComponent<DayColProps, DayColState> {
         currPos: PropTypes.Requireable<number>;
         handleClick: PropTypes.Requireable<(...args: any[]) => any>;
         mode: PropTypes.Requireable<string>;
+        minEventHeight: PropTypes.Requireable<number>;
         isWeekend: PropTypes.Requireable<boolean>;
         dateGridRender: PropTypes.Requireable<(...args: any[]) => any>;
     };
@@ -26,6 +27,7 @@ export default class DayCol extends BaseComponent<DayColProps, DayColState> {
         scrollHeight: number;
         currPos: number;
         mode: string;
+        minEventHeight: number;
     };
     static contextType: React.Context<import("../locale/interface").Locale>;
     foundation: CalendarFoundation;

package/lib/cjs/calendar/dayCol.js

@@ -25,7 +25,8 @@ class DayCol extends _baseComponent.default {
     this.renderEvents = () => {
       const {
         events,
-        scrollHeight
+        scrollHeight,
+        minEventHeight
       } = this.props;
       const list = events.map((event, ind) => {
         const {
@@ -36,12 +37,9 @@ class DayCol extends _baseComponent.default {
         } = event;
         const top = startPos * scrollHeight;
         const height = (endPos - startPos) * scrollHeight;
-        if (!height) {
-          return undefined;
-        }
         const style = {
           top: `${top}px`,
-          height: `${height}px`
+          height: `${Math.max(minEventHeight, height)}px`
         };
         return /*#__PURE__*/_react.default.createElement("li", {
           className: `${_constants.cssClasses.PREFIX}-event-item ${_constants.cssClasses.PREFIX}-event-day`,
@@ -156,6 +154,7 @@ DayCol.propTypes = {
   currPos: _propTypes.default.number,
   handleClick: _propTypes.default.func,
   mode: _propTypes.default.string,
+  minEventHeight: _propTypes.default.number,
   isWeekend: _propTypes.default.bool,
   dateGridRender: _propTypes.default.func
 };
@@ -164,6 +163,7 @@ DayCol.defaultProps = {
   showCurrTime: true,
   scrollHeight: 0,
   currPos: 0,
-  mode: 'dayCol'
+  mode: 'dayCol',
+  minEventHeight: Number.MIN_SAFE_INTEGER
 };
 DayCol.contextType = _context.default;

package/lib/cjs/calendar/index.d.ts

@@ -24,6 +24,7 @@ declare class Calendar extends BaseComponent<CalendarProps, {}> {
         renderTimeDisplay: PropTypes.Requireable<(...args: any[]) => any>;
         renderDateDisplay: PropTypes.Requireable<(...args: any[]) => any>;
         markWeekend: PropTypes.Requireable<boolean>;
+        minEventHeight: PropTypes.Requireable<number>;
         width: PropTypes.Requireable<NonNullable<string | number>>;
         height: PropTypes.Requireable<NonNullable<string | number>>;
         style: PropTypes.Requireable<object>;

package/lib/cjs/calendar/index.js

@@ -69,6 +69,7 @@ Calendar.propTypes = {
   renderTimeDisplay: _propTypes.default.func,
   renderDateDisplay: _propTypes.default.func,
   markWeekend: _propTypes.default.bool,
+  minEventHeight: _propTypes.default.number,
   width: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
   height: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
   style: _propTypes.default.object,

package/lib/cjs/calendar/interface.d.ts

@@ -16,6 +16,7 @@ export interface CalendarProps extends BaseProps {
     onClose?: (e: React.MouseEvent) => void;
     renderTimeDisplay?: (time: number) => React.ReactNode;
     markWeekend?: boolean;
+    minEventHeight?: number;
     width?: number | string;
     height?: number | string;
     renderDateDisplay?: (date: Date) => React.ReactNode;
@@ -23,7 +24,7 @@ export interface CalendarProps extends BaseProps {
     allDayEventsRender?: (events: EventObject[]) => React.ReactNode;
 }
 export type DayCalendarProps = Omit<CalendarProps, 'mode'>;
-type DayCalendarPropsKeys = 'events' | 'displayValue' | 'showCurrTime' | 'mode' | 'dateGridRender';
+type DayCalendarPropsKeys = 'events' | 'displayValue' | 'showCurrTime' | 'mode' | 'dateGridRender' | 'minEventHeight';
 export interface DayColProps extends Pick<CalendarProps, DayCalendarPropsKeys>, BaseProps {
     scrollHeight: number;
     currPos: number;

package/lib/cjs/calendar/rangeCalendar.js

@@ -46,7 +46,8 @@ class RangeCalendar extends _baseComponent.default {
       } = this.RangeData;
       const {
         markWeekend,
-        dateGridRender
+        dateGridRender,
+        minEventHeight
       } = this.props;
       const inner = week.map(day => {
         const dateString = day.date.toString();
@@ -60,7 +61,8 @@ class RangeCalendar extends _baseComponent.default {
           events: parsed.day,
           showCurrTime: this.props.showCurrTime,
           isWeekend: markWeekend && day.isWeekend,
-          dateGridRender: dateGridRender
+          dateGridRender: dateGridRender,
+          minEventHeight: minEventHeight
         });
       });
       return inner;

package/lib/cjs/calendar/weekCalendar.js

@@ -47,7 +47,8 @@ class WeekCalendar extends _baseComponent.default {
       } = this.weeklyData;
       const {
         markWeekend,
-        dateGridRender
+        dateGridRender,
+        minEventHeight
       } = this.props;
       const inner = week.map(day => {
         const dateString = day.date.toString();
@@ -61,7 +62,8 @@ class WeekCalendar extends _baseComponent.default {
           events: parsed.day,
           showCurrTime: this.props.showCurrTime,
           isWeekend: markWeekend && day.isWeekend,
-          dateGridRender: dateGridRender
+          dateGridRender: dateGridRender,
+          minEventHeight: minEventHeight
         });
       });
       return inner;

package/lib/cjs/dropdown/dropdownItem.js

@@ -46,8 +46,9 @@ class DropdownItem extends _baseComponent.default {
       ['onClick', 'onMouseEnter', 'onMouseLeave', 'onContextMenu'].forEach(eventName => {
         if (eventName === "onClick") {
           events["onMouseDown"] = e => {
+            var _a, _b;
             if (e.button === 0) {
-              this.props[eventName](e);
+              (_b = (_a = this.props)[eventName]) === null || _b === void 0 ? void 0 : _b.call(_a, e);
             }
           };
         } else {

package/lib/cjs/form/baseForm.js

@@ -181,7 +181,7 @@ class Form extends _baseComponent.default {
       [prefix + '-vertical']: layout === 'vertical',
       [prefix + '-horizontal']: layout === 'horizontal'
     });
-    const showldAppendRow = wrapperCol && labelCol;
+    const shouldAppendRow = wrapperCol && labelCol;
     const formContent = /*#__PURE__*/_react.default.createElement("form", Object.assign({
       style: style
     }, rest, {
@@ -197,7 +197,7 @@ class Form extends _baseComponent.default {
       value: this.formApi
     }, /*#__PURE__*/_react.default.createElement(_context.FormStateContext.Provider, {
       value: formState
-    }, showldAppendRow ? withRowForm : formContent)));
+    }, shouldAppendRow ? withRowForm : formContent)));
   }
 }
 Form.propTypes = {

package/lib/cjs/modal/Modal.d.ts

@@ -59,7 +59,7 @@ declare class Modal extends BaseComponent<ModalReactProps, ModalState> {
         getPopupContainer: PropTypes.Requireable<(...args: any[]) => any>;
         getContainerContext: PropTypes.Requireable<(...args: any[]) => any>;
         maskFixed: PropTypes.Requireable<boolean>;
-        closeIcon: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;
+        closeIcon: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         closeOnEsc: PropTypes.Requireable<boolean>;
         size: PropTypes.Requireable<string>;
         keepDOM: PropTypes.Requireable<boolean>;

package/lib/cjs/modal/Modal.js

@@ -303,7 +303,7 @@ Modal.propTypes = {
   getPopupContainer: _propTypes.default.func,
   getContainerContext: _propTypes.default.func,
   maskFixed: _propTypes.default.bool,
-  closeIcon: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]),
+  closeIcon: _propTypes.default.node,
   closeOnEsc: _propTypes.default.bool,
   size: _propTypes.default.oneOf(_constants.strings.SIZE),
   keepDOM: _propTypes.default.bool,

package/lib/cjs/navigation/SubNav.d.ts

@@ -53,7 +53,7 @@ export default class SubNav extends BaseComponent<SubNavProps, SubNavState> {
         /**
          * Icon name on the left
          */
-        icon: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;
+        icon: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         /**
          * Maximum height (for animation)
          */

package/lib/cjs/navigation/SubNav.js

@@ -354,7 +354,7 @@ SubNav.propTypes = {
   /**
    * Icon name on the left
    */
-  icon: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]),
+  icon: _propTypes.default.node,
   /**
    * Maximum height (for animation)
    */

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

@@ -46,7 +46,7 @@ export default class Popconfirm extends BaseComponent<PopconfirmProps, Popconfir
         prefixCls: PropTypes.Requireable<string>;
         className: PropTypes.Requireable<string>;
         style: PropTypes.Requireable<object>;
-        icon: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;
+        icon: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         okText: PropTypes.Requireable<string>;
         okType: PropTypes.Requireable<string>;
         cancelText: PropTypes.Requireable<string>;

package/lib/cjs/popconfirm/index.js

@@ -241,7 +241,7 @@ Popconfirm.propTypes = {
   prefixCls: _propTypes.default.string,
   className: _propTypes.default.string,
   style: _propTypes.default.object,
-  icon: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]),
+  icon: _propTypes.default.node,
   okText: _propTypes.default.string,
   okType: _propTypes.default.string,
   cancelText: _propTypes.default.string,

package/lib/cjs/select/utils.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { OptionProps } from './option';
 import { OptionGroupProps } from './optionGroup';
-declare const generateOption: (child: React.ReactElement, parent: any, index: number) => OptionProps;
+declare const generateOption: (child: React.ReactElement, parent: any, index: number, newKey?: string | number) => OptionProps;
 declare const getOptionsFromGroup: (selectChildren: React.ReactNode) => {
     optionGroups: OptionGroupProps[];
     options: OptionProps[];

package/lib/cjs/select/utils.js

@@ -15,7 +15,7 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   }
   return t;
 };
-const generateOption = (child, parent, index) => {
+const generateOption = (child, parent, index, newKey) => {
   const childProps = child.props;
   if (!child || !childProps) {
     return null;
@@ -33,7 +33,7 @@ const generateOption = (child, parent, index) => {
   // Props are collected from ReactNode, after React.Children.toArray
   // no need to determine whether the key exists in child
   // Even if the user does not explicitly declare it, React will always generate a key.
-  option._keyInJsx = child.key;
+  option._keyInJsx = newKey || child.key;
   return option;
 };
 exports.generateOption = generateOption;
@@ -65,10 +65,22 @@ const getOptionsFromGroup = selectChildren => {
           children
         } = _a,
         restGroupProps = __rest(_a, ["children"]);
+      let originKeys = [];
+      if (Array.isArray(children)) {
+        // if group has children > 1
+        originKeys = children.map(item => item.key);
+      } else {
+        originKeys.push(children.key);
+      }
       children = _react.default.Children.toArray(children);
-      const childrenOption = children.map(option => {
+      const childrenOption = children.map((option, index) => {
+        let newKey = option.key;
+        if (originKeys[index] === null) {
+          newKey = child.key + '' + option.key; // if option in group and didn't set key, concat parent key to avoid conflict (default generate key just like .0, .1)
+        }
+
         optionIndex++;
-        return generateOption(option, restGroupProps, optionIndex);
+        return generateOption(option, restGroupProps, optionIndex, newKey);
       });
       const group = Object.assign(Object.assign({}, child.props), {
         children: childrenOption,

package/lib/cjs/sideSheet/SideSheetContent.d.ts

@@ -1,8 +1,9 @@
-import React, { CSSProperties } from 'react';
+import React, { CSSProperties, ReactNode } from 'react';
 import PropTypes from 'prop-types';
 import { SideSheetProps } from '@douyinfe/semi-foundation/lib/cjs/sideSheet/sideSheetFoundation';
 export interface SideSheetContentProps {
     onClose?: (e: React.MouseEvent) => void;
+    closeIcon?: ReactNode;
     mask?: boolean;
     maskStyle?: CSSProperties;
     maskClosable?: boolean;
@@ -30,6 +31,7 @@ export interface SideSheetContentProps {
 export default class SideSheetContent extends React.PureComponent<SideSheetContentProps> {
     static propTypes: {
         onClose: PropTypes.Requireable<(...args: any[]) => any>;
+        closeIcon: PropTypes.Requireable<PropTypes.ReactNodeLike>;
     };
     static defaultProps: {
         onClose: (...args: any[]) => void;

package/lib/cjs/sideSheet/SideSheetContent.js

@@ -66,7 +66,8 @@ class SideSheetContent extends _react.default.PureComponent {
     const {
       title,
       closable,
-      headerStyle
+      headerStyle,
+      closeIcon
     } = this.props;
     let header, closer;
     if (title) {
@@ -76,12 +77,13 @@ class SideSheetContent extends _react.default.PureComponent {
       }, this.props.title);
     }
     if (closable) {
+      const iconType = closeIcon || /*#__PURE__*/_react.default.createElement(_semiIcons.IconClose, null);
       closer = /*#__PURE__*/_react.default.createElement(_iconButton.default, {
         className: `${prefixCls}-close`,
         key: "close-btn",
         onClick: this.close,
         type: "tertiary",
-        icon: /*#__PURE__*/_react.default.createElement(_semiIcons.IconClose, null),
+        icon: iconType,
         theme: "borderless",
         size: "small"
       });
@@ -168,7 +170,8 @@ class SideSheetContent extends _react.default.PureComponent {
 }
 exports.default = SideSheetContent;
 SideSheetContent.propTypes = {
-  onClose: _propTypes.default.func
+  onClose: _propTypes.default.func,
+  closeIcon: _propTypes.default.node
 };
 SideSheetContent.defaultProps = {
   onClose: _noop2.default

package/lib/cjs/table/Body/BaseRow.d.ts

@@ -43,6 +43,8 @@ export interface BaseRowProps {
     style?: React.CSSProperties;
     virtualized?: Virtualized;
     visible: boolean;
+    /** whether display none */
+    displayNone?: boolean;
 }
 export default class TableRow extends BaseComponent<BaseRowProps, Record<string, any>> {
     static propTypes: {
@@ -55,6 +57,7 @@ export default class TableRow extends BaseComponent<BaseRowProps, Record<string,
         expandIcon: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike | ((...args: any[]) => any)>>;
         expandableRow: PropTypes.Requireable<boolean>;
         expanded: PropTypes.Requireable<boolean>;
+        displayNone: PropTypes.Requireable<boolean>;
         expandedRow: PropTypes.Requireable<boolean>;
         fixed: PropTypes.Requireable<NonNullable<string | boolean>>;
         height: PropTypes.Requireable<NonNullable<string | number>>;

package/lib/cjs/table/Body/BaseRow.js

@@ -221,6 +221,7 @@ class TableRow extends _baseComponent.default {
       record,
       hovered,
       expanded,
+      displayNone,
       expandableRow,
       level,
       expandedRow,
@@ -238,7 +239,8 @@ class TableRow extends _baseComponent.default {
     const rowCls = typeof replaceClassName === 'string' && replaceClassName.length ? replaceClassName : (0, _classnames.default)(className, `${prefixCls}-row`, {
       [`${prefixCls}-row-selected`]: selected,
       [`${prefixCls}-row-expanded`]: expanded,
-      [`${prefixCls}-row-hovered`]: hovered
+      [`${prefixCls}-row-hovered`]: hovered,
+      [`${prefixCls}-row-hidden`]: displayNone
     }, customClassName);
     const ariaProps = {};
     if (typeof index === 'number') {
@@ -280,6 +282,7 @@ TableRow.propTypes = {
   expandIcon: _propTypes.default.oneOfType([_propTypes.default.bool, _propTypes.default.func, _propTypes.default.node]),
   expandableRow: _propTypes.default.bool,
   expanded: _propTypes.default.bool,
+  displayNone: _propTypes.default.bool,
   expandedRow: _propTypes.default.bool,
   fixed: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.bool]),
   height: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),

package/lib/cjs/table/Body/ExpandedRow.d.ts

@@ -23,6 +23,7 @@ export interface TableExpandedRowProps {
     store?: Store;
     style?: React.CSSProperties;
     virtualized?: Virtualized;
+    displayNone?: boolean;
 }
 /**
  * Render expanded row

package/lib/cjs/table/Body/ExpandedRow.js

@@ -45,7 +45,8 @@ class TableExpandedRow extends _react.PureComponent {
       style,
       virtualized,
       indentSize,
-      cellWidths
+      cellWidths,
+      displayNone
     } = this.props;
     const {
       tableWidth,
@@ -104,7 +105,8 @@ class TableExpandedRow extends _react.PureComponent {
       store: store,
       virtualized: virtualized,
       indentSize: indentSize,
-      cellWidths: baseRowCellWidths
+      cellWidths: baseRowCellWidths,
+      displayNone: displayNone
     });
   }
 }

package/lib/cjs/table/Body/index.d.ts

@@ -32,6 +32,7 @@ export interface BodyProps extends BaseProps {
     renderExpandIcon: (record: Record<string, any>, isNested: boolean) => ReactNode | null;
     headerRef?: React.MutableRefObject<HTMLDivElement> | ((instance: any) => void);
     onScroll?: VirtualizedOnScroll;
+    keepDOM?: boolean;
 }
 export interface BodyState {
     virtualizedData?: Array<FlattenData | GroupFlattenData>;
@@ -61,6 +62,8 @@ export interface RenderExpandedRowProps {
     rowKey?: RowKey<Record<string, any>>;
     virtualized?: Virtualized;
     level?: number;
+    keepDOM?: boolean;
+    displayNone?: boolean;
 }
 export interface RenderSectionRowProps {
     dataSource?: Record<string, any>[];

package/lib/cjs/table/Body/index.js

@@ -308,7 +308,8 @@ class Body extends _baseComponent.default {
         expanded,
         index,
         rowKey,
-        virtualized
+        virtualized,
+        displayNone
       } = props;
       let key = (0, _utils.getRecordKey)(record, rowKey);
       if (key == null) {
@@ -334,7 +335,8 @@ class Body extends _baseComponent.default {
         index: index,
         virtualized: virtualized,
         key: (0, _utils.genExpandedRowKey)(key),
-        cellWidths: _this.cellWidths
+        cellWidths: _this.cellWidths,
+        displayNone: displayNone
       });
     };
     /**
@@ -346,7 +348,8 @@ class Body extends _baseComponent.default {
         groups,
         dataSource: data,
         rowKey,
-        expandedRowKeys
+        expandedRowKeys,
+        keepDOM
       } = this.props;
       const {
         flattenedColumns
@@ -381,7 +384,7 @@ class Body extends _baseComponent.default {
           expanded
         })));
         // Render the grouped content when the group is expanded
-        if (expanded) {
+        if (expanded || keepDOM) {
           const dataInGroup = [];
           group.forEach(recordKey => {
             const record = (0, _utils.getRecord)(data, recordKey, rowKey);
@@ -392,7 +395,7 @@ class Body extends _baseComponent.default {
           /**
            * Render the contents of the group row
            */
-          renderedRows.push(this.renderBodyRows(dataInGroup));
+          renderedRows.push(this.renderBodyRows(dataInGroup, undefined, [], !expanded));
         }
       });
       return renderedRows;
@@ -636,12 +639,14 @@ class Body extends _baseComponent.default {
     let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     let level = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
     let renderedRows = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+    let displayNone = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
     const {
       rowKey,
       expandedRowRender,
       expandedRowKeys,
       childrenRecordName,
-      rowExpandable
+      rowExpandable,
+      keepDOM
     } = this.props;
     const hasExpandedRowRender = typeof expandedRowRender === 'function';
     const expandBtnShouldInRow = this.state.cachedExpandBtnShouldInRow;
@@ -658,6 +663,7 @@ class Body extends _baseComponent.default {
       renderedRows.push(this.renderBaseRow(Object.assign(Object.assign({}, this.props), {
         columns: flattenedColumns,
         expandBtnShouldInRow,
+        displayNone,
         record,
         key,
         level,
@@ -665,13 +671,15 @@ class Body extends _baseComponent.default {
       })));
       // render expand row
       const expanded = (0, _utils.isExpanded)(expandedRowKeys, key);
-      if (hasExpandedRowRender && rowExpandable && rowExpandable(record) && expanded) {
+      const shouldRenderExpandedRows = expanded || keepDOM;
+      if (hasExpandedRowRender && rowExpandable && rowExpandable(record) && shouldRenderExpandedRows) {
         const currentExpandRow = this.renderExpandedRow(Object.assign(Object.assign({}, this.props), {
           columns: flattenedColumns,
           level,
           index,
           record,
-          expanded
+          expanded,
+          displayNone: displayNone || !expanded
         }));
         /**
           * If expandedRowRender returns falsy, this expanded row will not be rendered
@@ -682,8 +690,8 @@ class Body extends _baseComponent.default {
         }
       }
       // render tree data
-      if (recordHasChildren && expanded) {
-        const nestedRows = this.renderBodyRows(recordChildren, level + 1);
+      if (recordHasChildren && shouldRenderExpandedRows) {
+        const nestedRows = this.renderBodyRows(recordChildren, level + 1, [], displayNone || !expanded);
         renderedRows.push(...nestedRows);
       }
     });

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

@@ -34,6 +34,7 @@ export interface TableProps<RecordType extends Record<string, any> = any> extend
     hideExpandedColumn?: boolean;
     id?: string;
     indentSize?: number;
+    keepDOM?: boolean;
     loading?: boolean;
     pagination?: TablePagination;
     prefixCls?: string;

package/lib/cjs/timePicker/TimePicker.d.ts

@@ -63,6 +63,7 @@ export type TimePickerProps = {
     secondStep?: number;
     showClear?: boolean;
     size?: InputSize;
+    stopPropagation: boolean;
     style?: React.CSSProperties;
     timeZone?: string | number;
     triggerRender?: (props?: any) => React.ReactNode;
@@ -133,6 +134,7 @@ export default class TimePicker extends BaseComponent<TimePickerProps, TimePicke
         focusOnOpen: PropTypes.Requireable<boolean>;
         autoFocus: PropTypes.Requireable<boolean>;
         size: PropTypes.Requireable<"default" | "small" | "large">;
+        stopPropagation: PropTypes.Requireable<boolean>;
         panels: PropTypes.Requireable<PropTypes.InferProps<{
             panelHeader: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;
             panelFooter: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;
@@ -166,6 +168,7 @@ export default class TimePicker extends BaseComponent<TimePickerProps, TimePicke
         prefixCls: string;
         inputReadOnly: boolean;
         style: {};
+        stopPropagation: boolean;
         className: string;
         popupClassName: string;
         popupStyle: {