@synerise/ds-table 0.53.2 → 0.55.0

package/CHANGELOG.md

@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.55.0](https://github.com/synerise/synerise-design/compare/@synerise/ds-table@0.54.0...@synerise/ds-table@0.55.0) (2024-07-05)
+
+
+### Bug Fixes
+
+* fixed missing dependencies ([f718fb7](https://github.com/synerise/synerise-design/commit/f718fb7e954a19857ea4b6bbd417e3fe290fd2dc))
+* **table:** fix remount virtual rows ([284e4ef](https://github.com/synerise/synerise-design/commit/284e4ef46188362b5e23c2fb2c1d18544f3c9680))
+
+
+### Features
+
+* **table:** added prop to exclude selection for rows ([2607c00](https://github.com/synerise/synerise-design/commit/2607c0048fa7abddfc249d7fc4eeb2b9142ae5c1))
+
+
+
+
+
+# [0.54.0](https://github.com/synerise/synerise-design/compare/@synerise/ds-table@0.53.2...@synerise/ds-table@0.54.0) (2024-07-02)
+
+
+### Bug Fixes
+
+* **table:** infinite loader - trigger loading without scrolling ([4559290](https://github.com/synerise/synerise-design/commit/455929012ab463980f0dd5de7230636a0ee058b6))
+
+
+### Features
+
+* **table:** add custom name for children column ([e5b2089](https://github.com/synerise/synerise-design/commit/e5b2089e011a28eccfdc56843c268fc861677a07))
+
+
+
+
+
 ## [0.53.2](https://github.com/synerise/synerise-design/compare/@synerise/ds-table@0.53.1...@synerise/ds-table@0.53.2) (2024-06-27)
 
 

package/README.md

@@ -98,6 +98,15 @@ This type of table requires a specific type of dataSource which has to contain a
 | onChange                         | Callback executed when selection changes             | (selectedRowKeys: React.ReactText[], selectedRows: T[]) => void | -       |
 | limit                            | Max length of selection rows array                   | number                                                          | -       |
 | independentSelectionExpandedRows | Allows to select parent and child rows independently | boolean                                                         | -       |
+| checkRowSelectionStatus          | Validator function record selection status           | (record: T) => SelectionStatus                                  | -       |
+
+#### SelectionStatus
+
+| Property               | Description                                            | Type                                                                       | Default |
+| ---------------        | ------------------------------------------------       | ---------------------------------------------------------------            | ------- |
+| unavailable            | Skips rendering checkbox if true                       | boolean                                                                    | -       |
+| disabled               | Renders checkbox in disabled state                     | boolean                                                                    | -       |
+
 
 #### RowStar
 

package/dist/Cell/Star/StarCell.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 declare const _default: React.ForwardRefExoticComponent<{
-    children: ((string | number | boolean | {} | React.ReactElement<any, string | React.JSXElementConstructor<any>> | React.ReactNodeArray | React.ReactPortal | React.ReactNode[]) & (boolean | React.ReactChild | React.ReactFragment | React.ReactPortal)) | null | undefined;
+    children: ((string | number | boolean | {} | React.ReactElement<any, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode> | React.ReactPortal | React.ReactNode[]) & (boolean | React.ReactChild | React.ReactFragment | React.ReactPortal)) | null | undefined;
     onClick?: (() => void) | undefined;
     active?: boolean | undefined;
     starTooltip?: React.ReactNode;

package/dist/DefaultTable/DefaultTable.d.ts

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 import { DSTableProps, RowType } from '../Table.types';
-declare function DefaultTable<T extends object & RowType<T>>(props: DSTableProps<T>): React.ReactElement;
+declare function DefaultTable<T extends object & RowType<T>>(props: DSTableProps<T>): React.JSX.Element;
 export default DefaultTable;

package/dist/DefaultTable/DefaultTable.js

@@ -10,17 +10,18 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import * as React from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
 import { compact, isEqual } from 'lodash';
 import Table from 'antd/lib/table';
 import { FormattedMessage } from 'react-intl';
 import Result from '@synerise/ds-result';
-import usePrevious from '@synerise/ds-utils/dist/usePrevious/usePrevious';
+import { usePrevious } from '@synerise/ds-utils';
 import { columnsToSortState, useSortState } from '../ColumnSortMenu/useSortState';
 import { columnWithSortButtons } from '../ColumnSortMenu/columnWithSortButtons';
 import { useRowKey } from '../hooks/useRowKey';
 import { useRowStar } from '../hooks/useRowStar/useRowStar';
-import { RowSelectionColumn } from '../RowSelection'; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+import { RowSelectionColumn } from '../RowSelection';
+import { getChildrenColumnName, isRecordSelectable } from '../utils';
 
 function DefaultTable(props) {
   var _selection$selections;
@@ -41,20 +42,22 @@ function DefaultTable(props) {
   var _useRowStar = useRowStar((rowStar == null ? void 0 : rowStar.starredRowKeys) || []),
       getRowStarColumn = _useRowStar.getRowStarColumn;
 
+  var childrenColumnName = getChildrenColumnName(expandable == null ? void 0 : expandable.childrenColumnName);
+
   var _useRowKey = useRowKey(rowKey),
       getRowKey = _useRowKey.getRowKey;
 
-  var starColumn = React.useMemo(function () {
+  var starColumn = useMemo(function () {
     return getRowStarColumn(_objectSpread({}, props, {
       getRowKey: getRowKey
     }));
   }, [getRowKey, getRowStarColumn, props]);
-  React.useEffect(function () {
+  useEffect(function () {
     if (!isEqual(previousColumns, columns)) {
       sortStateApi.updateColumnsData(columnsToSortState(columns));
     }
   }, [columns, previousColumns, sortStateApi]);
-  var RenderRow = React.useCallback(function (row) {
+  var RenderRow = useCallback(function (row) {
     var children = row.children,
         rowProps = _objectWithoutPropertiesLoose(row, _excluded);
 
@@ -99,23 +102,26 @@ function DefaultTable(props) {
         value = _ref2[1];
     return _objectSpread({}, acc, (_objectSpread2 = {}, _objectSpread2[key] = value, _objectSpread2));
   }, {});
-  var selectedRecords = React.useMemo(function () {
+  var selectedRecords = useMemo(function () {
     if (selection) {
       var _ref4 = selection,
-          selectedRowKeys = _ref4.selectedRowKeys;
+          selectedRowKeys = _ref4.selectedRowKeys,
+          checkRowSelectionStatus = _ref4.checkRowSelectionStatus;
       var selectedRows = [];
       dataSource && dataSource.forEach(function (row) {
         var key = getRowKey(row);
 
-        if (key && selectedRowKeys.indexOf(key) >= 0) {
+        if (key && selectedRowKeys.indexOf(key) >= 0 && isRecordSelectable(row, checkRowSelectionStatus)) {
           selectedRows = [].concat(selectedRows, [row]);
         }
 
-        if (row.children !== undefined && Array.isArray(row.children)) {
-          row.children.forEach(function (child) {
+        var rowChildren = row[childrenColumnName];
+
+        if (rowChildren !== undefined && Array.isArray(rowChildren)) {
+          rowChildren.forEach(function (child) {
             var childKey = getRowKey(child);
 
-            if (childKey && selectedRowKeys.indexOf(childKey) >= 0) {
+            if (childKey && selectedRowKeys.indexOf(childKey) >= 0 && isRecordSelectable(child, checkRowSelectionStatus)) {
               selectedRows = [].concat(selectedRows, [child]);
             }
           });
@@ -125,13 +131,14 @@ function DefaultTable(props) {
     }
 
     return [];
-  }, [dataSource, getRowKey, selection]);
-  var renderRowSelection = React.useCallback(function (key, record) {
+  }, [childrenColumnName, dataSource, getRowKey, selection]);
+  var renderRowSelection = useCallback(function (key, record) {
     var _ref5 = selection,
         selectedRowKeys = _ref5.selectedRowKeys,
         limit = _ref5.limit,
         independentSelectionExpandedRows = _ref5.independentSelectionExpandedRows,
-        onChange = _ref5.onChange;
+        onChange = _ref5.onChange,
+        checkRowSelectionStatus = _ref5.checkRowSelectionStatus;
     return /*#__PURE__*/React.createElement(RowSelectionColumn, {
       rowKey: rowKey,
       record: record,
@@ -140,43 +147,41 @@ function DefaultTable(props) {
       independentSelectionExpandedRows: independentSelectionExpandedRows,
       onChange: onChange,
       selectedRecords: selectedRecords,
-      tableLocale: locale
+      tableLocale: locale,
+      checkRowSelectionStatus: checkRowSelectionStatus,
+      childrenColumnName: childrenColumnName
     });
-  }, [locale, rowKey, selectedRecords, selection]);
-  return (
-    /*#__PURE__*/
-    // @ts-ignore
-    React.createElement(Table, _extends({}, props, {
-      "data-popup-container": true,
-      columns: [].concat(prependedColumns, decoratedColumns),
-      expandable: _objectSpread({
-        expandIconColumnIndex: -1
-      }, expandable),
-      locale: _objectSpread({}, locale, {
-        emptyText: /*#__PURE__*/React.createElement(Result, {
-          description: (locale == null ? void 0 : locale.emptyText) || /*#__PURE__*/React.createElement(FormattedMessage, {
-            id: "DS.TABLE.EMPTY_TEXT"
-          }),
-          type: "no-results",
-          noSearchResults: true
-        })
-      }) // @ts-ignore
-      ,
-      title: title,
-      showSorterTooltip: false,
-      components: _objectSpread({
-        body: {
-          row: RenderRow
-        }
-      }, decoratedComponents) // @ts-ignore
-      ,
-      rowSelection: selection && _objectSpread({}, selection, {
-        selections: selection == null || (_selection$selections = selection.selections) == null ? void 0 : _selection$selections.filter(Boolean),
-        columnWidth: 64,
-        renderCell: renderRowSelection
+  }, [locale, rowKey, selectedRecords, selection, childrenColumnName]);
+  return /*#__PURE__*/React.createElement(Table, _extends({}, props, {
+    "data-popup-container": true,
+    columns: [].concat(prependedColumns, decoratedColumns),
+    expandable: _objectSpread({
+      expandIconColumnIndex: -1
+    }, expandable),
+    locale: _objectSpread({}, locale, {
+      emptyText: /*#__PURE__*/React.createElement(Result, {
+        description: (locale == null ? void 0 : locale.emptyText) || /*#__PURE__*/React.createElement(FormattedMessage, {
+          id: "DS.TABLE.EMPTY_TEXT"
+        }),
+        type: "no-results",
+        noSearchResults: true
       })
-    }))
-  );
+    }) // @ts-ignore
+    ,
+    title: title,
+    showSorterTooltip: false,
+    components: _objectSpread({
+      body: {
+        row: RenderRow
+      }
+    }, decoratedComponents) // @ts-ignore
+    ,
+    rowSelection: selection && _objectSpread({}, selection, {
+      selections: selection == null || (_selection$selections = selection.selections) == null ? void 0 : _selection$selections.filter(Boolean),
+      columnWidth: 64,
+      renderCell: renderRowSelection
+    })
+  }));
 }
 
 export default DefaultTable;

package/dist/InfiniteScroll/ErrorItem.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+type ErrorItemProps = {
+    onRetryClick?: () => void;
+};
+export declare const ErrorItem: ({ onRetryClick }: ErrorItemProps) => React.JSX.Element;
+export {};

package/dist/InfiniteScroll/ErrorItem.js

@@ -0,0 +1,28 @@
+import React from 'react';
+import Alert from '@synerise/ds-alert';
+import Button from '@synerise/ds-button';
+import Icon, { RefreshM } from '@synerise/ds-icon';
+import { TableLocaleContext } from '../utils/locale';
+export var ErrorItem = function ErrorItem(_ref) {
+  var onRetryClick = _ref.onRetryClick;
+  return /*#__PURE__*/React.createElement(TableLocaleContext.Consumer, null, function (tableLocale) {
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        display: 'flex'
+      }
+    }, /*#__PURE__*/React.createElement(Alert.InlineAlert, {
+      type: "alert",
+      message: tableLocale.infiniteScrollError
+    }), onRetryClick && /*#__PURE__*/React.createElement(Button, {
+      onClick: onRetryClick,
+      type: "ghost",
+      mode: "icon-label",
+      icon: /*#__PURE__*/React.createElement(Icon, {
+        component: /*#__PURE__*/React.createElement(RefreshM, null)
+      }),
+      style: {
+        marginLeft: 8
+      }
+    }, tableLocale.infiniteScrollRetry));
+  });
+};

package/dist/InfiniteScroll/InfiniteLoaderItem.d.ts

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 import { LoaderItemProps } from './InfiniteLoaderItem.types';
-declare const InfiniteLoaderItem: ({ infiniteScroll, position }: LoaderItemProps) => React.ReactElement;
+declare const InfiniteLoaderItem: ({ infiniteScroll, position }: LoaderItemProps) => React.JSX.Element;
 export default InfiniteLoaderItem;

package/dist/InfiniteScroll/InfiniteLoaderItem.js

@@ -1,67 +1,35 @@
-import * as React from 'react';
-import Alert from '@synerise/ds-alert';
-import Button from '@synerise/ds-button';
-import Icon, { RefreshM } from '@synerise/ds-icon';
-import { TableLocaleContext } from '../utils/locale';
-import { Loader } from './InfiniteLoaderItem.styles';
+import React, { useEffect } from 'react';
 import { infiniteScrollPropsToState } from './utils';
+import { ErrorItem } from './ErrorItem';
+import { LoadingItem } from './LoadingItem';
+import { NoMoreItem } from './NoMoreItem';
 
-var LoadingItem = function LoadingItem() {
-  return /*#__PURE__*/React.createElement(TableLocaleContext.Consumer, null, function (tableLocale) {
-    return /*#__PURE__*/React.createElement(Loader, {
-      size: "M",
-      label: tableLocale.infiniteScrollLoading
-    });
-  });
-};
-
-var NoMoreItem = function NoMoreItem() {
-  return /*#__PURE__*/React.createElement(TableLocaleContext.Consumer, null, function (tableLocale) {
-    return /*#__PURE__*/React.createElement(Alert.InlineAlert, {
-      // @ts-ignore
-      type: "info",
-      message: tableLocale.infiniteScrollNoMoreData
-    });
-  });
-};
-
-var ErrorItem = function ErrorItem(_ref) {
-  var onRetryClick = _ref.onRetryClick;
-  return /*#__PURE__*/React.createElement(TableLocaleContext.Consumer, null, function (tableLocale) {
-    return /*#__PURE__*/React.createElement("div", {
-      style: {
-        display: 'flex'
-      }
-    }, /*#__PURE__*/React.createElement(Alert.InlineAlert, {
-      // @ts-ignore
-      type: "alert",
-      message: tableLocale.infiniteScrollError
-    }), onRetryClick && /*#__PURE__*/React.createElement(Button, {
-      onClick: onRetryClick,
-      type: "ghost",
-      mode: "icon-label",
-      icon: /*#__PURE__*/React.createElement(Icon, {
-        component: /*#__PURE__*/React.createElement(RefreshM, null)
-      }),
-      style: {
-        marginLeft: 8
-      }
-    }, tableLocale.infiniteScrollRetry));
-  });
-};
-
-var InfiniteLoaderItem = function InfiniteLoaderItem(_ref2) {
-  var infiniteScroll = _ref2.infiniteScroll,
-      position = _ref2.position;
+var InfiniteLoaderItem = function InfiniteLoaderItem(_ref) {
+  var infiniteScroll = _ref.infiniteScroll,
+      position = _ref.position;
   var hasMore = infiniteScroll.hasMore,
       isLoading = infiniteScroll.isLoading,
+      onScrollEndReach = infiniteScroll.onScrollEndReach,
       hasError = infiniteScroll.hasError,
       onRetryButtonClick = infiniteScroll.onRetryButtonClick,
       render = infiniteScroll.render;
 
   var handleRetryClick = function handleRetryClick() {
     onRetryButtonClick && onRetryButtonClick(position);
-  };
+  }; // @ts-expect-error TS7030: Not all code paths return a value
+  // eslint-disable-next-line consistent-return
+
+
+  useEffect(function () {
+    if (!isLoading && hasMore) {
+      if ((!position || position === 'BOTTOM') && typeof onScrollEndReach === 'function') {
+        var timeout = setTimeout(onScrollEndReach, 0);
+        return function () {
+          clearTimeout(timeout);
+        };
+      }
+    }
+  }, [hasMore, isLoading, onScrollEndReach, position]);
 
   if (typeof render === 'function') {
     return render(infiniteScrollPropsToState(infiniteScroll));

package/dist/InfiniteScroll/LoadingItem.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const LoadingItem: () => React.JSX.Element;

package/dist/InfiniteScroll/LoadingItem.js

@@ -0,0 +1,11 @@
+import React from 'react';
+import { TableLocaleContext } from '../utils/locale';
+import { Loader } from './InfiniteLoaderItem.styles';
+export var LoadingItem = function LoadingItem() {
+  return /*#__PURE__*/React.createElement(TableLocaleContext.Consumer, null, function (tableLocale) {
+    return /*#__PURE__*/React.createElement(Loader, {
+      size: "M",
+      label: tableLocale.infiniteScrollLoading
+    });
+  });
+};

package/dist/InfiniteScroll/NoMoreItem.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const NoMoreItem: () => React.JSX.Element;

package/dist/InfiniteScroll/NoMoreItem.js

@@ -0,0 +1,11 @@
+import React from 'react';
+import Alert from '@synerise/ds-alert';
+import { TableLocaleContext } from '../utils/locale';
+export var NoMoreItem = function NoMoreItem() {
+  return /*#__PURE__*/React.createElement(TableLocaleContext.Consumer, null, function (tableLocale) {
+    return /*#__PURE__*/React.createElement(Alert.InlineAlert, {
+      type: "info",
+      message: tableLocale.infiniteScrollNoMoreData
+    });
+  });
+};

package/dist/RowSelection/RowSelectionColumn.d.ts

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 import { RowSelectionProps } from './RowSelectionColumn.types';
 import { RowType } from '../Table.types';
-export declare function RowSelectionColumn<T extends object & RowType<T>>({ rowKey, record, limit, independentSelectionExpandedRows, selectedRowKeys, selectedRecords, tableLocale, onChange, }: RowSelectionProps<T>): React.ReactElement | null;
+export declare function RowSelectionColumn<T extends object & RowType<T>>({ rowKey, record, limit, independentSelectionExpandedRows, selectedRowKeys, selectedRecords, tableLocale, onChange, checkRowSelectionStatus, childrenColumnName, }: RowSelectionProps<T>): React.JSX.Element | null;

package/dist/RowSelection/RowSelectionColumn.js

@@ -1,8 +1,8 @@
-import * as React from 'react';
+import React, { useCallback, useMemo } from 'react';
 import Tooltip from '@synerise/ds-tooltip';
 import Button from '@synerise/ds-button';
 import { useRowKey } from '../hooks/useRowKey';
-// eslint-disable-next-line import/prefer-default-export
+import { getRecordSelectionStatus, isRecordSelectable } from '../utils';
 export function RowSelectionColumn(_ref) {
   var rowKey = _ref.rowKey,
       record = _ref.record,
@@ -11,55 +11,58 @@ export function RowSelectionColumn(_ref) {
       selectedRowKeys = _ref.selectedRowKeys,
       selectedRecords = _ref.selectedRecords,
       tableLocale = _ref.tableLocale,
-      onChange = _ref.onChange;
+      onChange = _ref.onChange,
+      checkRowSelectionStatus = _ref.checkRowSelectionStatus,
+      childrenColumnName = _ref.childrenColumnName;
 
   var _useRowKey = useRowKey(rowKey),
       getRowKey = _useRowKey.getRowKey;
 
   var recordKey = getRowKey(record);
-  var checkedChildren = React.useMemo(function () {
-    var _record$children;
-
-    return ((_record$children = record.children) == null ? void 0 : _record$children.filter(function (child) {
+  var rowChildren = record[childrenColumnName];
+  var isSelectable = useCallback(function (item) {
+    return isRecordSelectable(item, checkRowSelectionStatus);
+  }, [checkRowSelectionStatus]);
+  var checkedChildren = useMemo(function () {
+    return (rowChildren == null ? void 0 : rowChildren.filter(function (child) {
       var childKey = getRowKey(child);
-      return childKey && selectedRowKeys.indexOf(childKey) >= 0;
+      return childKey && selectedRowKeys.indexOf(childKey) >= 0 && isSelectable(child);
     })) || [];
-  }, [getRowKey, record.children, selectedRowKeys]);
-  var allChildrenSelected = React.useMemo(function () {
-    var _record$children2;
-
-    return !!((_record$children2 = record.children) != null && _record$children2.every(function (child) {
+  }, [isSelectable, getRowKey, rowChildren, selectedRowKeys]);
+  var allChildrenSelected = useMemo(function () {
+    return !!(rowChildren != null && rowChildren.filter(isSelectable).every(function (child) {
       var childKey = getRowKey(child);
       return childKey && selectedRowKeys.indexOf(childKey) >= 0;
     }));
-  }, [getRowKey, record.children, selectedRowKeys]);
-  var isIndeterminate = React.useMemo(function () {
-    if (Array.isArray(record.children) && !independentSelectionExpandedRows) {
-      var _record$children3;
-
-      return checkedChildren.length > 0 && checkedChildren.length < (((_record$children3 = record.children) == null ? void 0 : _record$children3.length) || 0);
+  }, [getRowKey, isSelectable, rowChildren, selectedRowKeys]);
+  var isIndeterminate = useMemo(function () {
+    if (Array.isArray(rowChildren) && !independentSelectionExpandedRows) {
+      var clickableChildren = rowChildren == null ? void 0 : rowChildren.filter(isSelectable);
+      return checkedChildren.length > 0 && checkedChildren.length < (clickableChildren.length || 0);
     }
 
     return false;
-  }, [checkedChildren.length, independentSelectionExpandedRows, record.children]);
-  var isChecked = React.useMemo(function () {
-    if (Array.isArray(record.children) && !independentSelectionExpandedRows) {
+  }, [checkedChildren.length, independentSelectionExpandedRows, isSelectable, rowChildren]);
+  var isChecked = useMemo(function () {
+    if (Array.isArray(rowChildren) && !independentSelectionExpandedRows) {
       return isChecked || allChildrenSelected;
     }
 
     return recordKey !== undefined && selectedRowKeys && selectedRowKeys.indexOf(recordKey) >= 0;
-  }, [allChildrenSelected, independentSelectionExpandedRows, record.children, recordKey, selectedRowKeys]);
-  var handleSelectionChange = React.useCallback(function (isCheckedNext, changedRecord) {
+  }, [allChildrenSelected, independentSelectionExpandedRows, rowChildren, recordKey, selectedRowKeys]);
+  var handleSelectionChange = useCallback(function (isCheckedNext, changedRecord) {
     var selectedRows = selectedRecords;
+    var changedRecordChildren = changedRecord[childrenColumnName];
 
     if (isCheckedNext) {
-      if (Array.isArray(changedRecord.children) && !independentSelectionExpandedRows) {
-        selectedRows = [].concat(selectedRows, changedRecord.children);
+      if (Array.isArray(changedRecordChildren) && !independentSelectionExpandedRows) {
+        var clickableChildren = changedRecordChildren.filter(isSelectable);
+        selectedRows = [].concat(selectedRows, clickableChildren);
       } else {
         selectedRows = [].concat(selectedRows, [changedRecord]);
       }
-    } else if (Array.isArray(changedRecord.children) && !independentSelectionExpandedRows) {
-      var childrenKeys = changedRecord.children.map(function (child) {
+    } else if (Array.isArray(changedRecordChildren) && !independentSelectionExpandedRows) {
+      var childrenKeys = changedRecordChildren.filter(isSelectable).map(function (child) {
         return getRowKey(child);
       });
       selectedRows = selectedRows.filter(function (child) {
@@ -81,18 +84,23 @@ export function RowSelectionColumn(_ref) {
 
       return acc;
     }, []), selectedRows);
-  }, [getRowKey, independentSelectionExpandedRows, onChange, recordKey, selectedRecords]);
-  return recordKey !== undefined ? /*#__PURE__*/React.createElement(Tooltip, {
+  }, [getRowKey, independentSelectionExpandedRows, isSelectable, onChange, recordKey, selectedRecords, childrenColumnName]);
+
+  var _getRecordSelectionSt = getRecordSelectionStatus(checkRowSelectionStatus, record),
+      unavailable = _getRecordSelectionSt.unavailable,
+      disabled = _getRecordSelectionSt.disabled;
+
+  return recordKey !== undefined && !unavailable ? /*#__PURE__*/React.createElement(Tooltip, {
     title: tableLocale == null ? void 0 : tableLocale.selectRowTooltip,
     mouseLeaveDelay: 0
   }, /*#__PURE__*/React.createElement(Button.Checkbox, {
     key: "checkbox-" + recordKey,
     "data-testid": "ds-table-selection-button",
     checked: isChecked,
-    disabled: !isChecked && Boolean(limit !== undefined && limit <= selectedRowKeys.length),
+    disabled: !isChecked && Boolean(limit !== undefined && limit <= selectedRowKeys.length) || disabled,
     indeterminate: isIndeterminate,
-    onClick: function onClick(e) {
-      e.stopPropagation();
+    onClick: function onClick(event) {
+      event.stopPropagation();
     },
     onChange: function onChange(isCheckedNext) {
       return handleSelectionChange(isCheckedNext, record);

package/dist/RowSelection/RowSelectionColumn.types.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { TableProps } from 'rc-table/lib/Table';
-import { DSTableProps } from '../Table.types';
+import { DSTableProps, RowSelection } from '../Table.types';
 export type RowSelectionProps<T> = {
     rowKey: TableProps<T>['rowKey'];
     independentSelectionExpandedRows?: boolean;
@@ -9,5 +9,7 @@ export type RowSelectionProps<T> = {
     limit?: number;
     record: T;
     tableLocale: DSTableProps<T>['locale'];
-    onChange: (selectedRowKeys: React.ReactText[], selectedRecords: T[]) => void;
+    onChange: RowSelection<T>['onChange'];
+    checkRowSelectionStatus?: RowSelection<T>['checkRowSelectionStatus'];
+    childrenColumnName: string;
 };

package/dist/Table.js

@@ -19,6 +19,7 @@ import TableHeader from './TableHeader/TableHeader';
 import DefaultTable from './DefaultTable/DefaultTable';
 import GroupTable from './GroupTable/GroupTable';
 import { useTableLocale, TableLocaleContext } from './utils/locale';
+import { getChildrenColumnName } from './utils/getChildrenColumnName';
 export var SELECTION_ALL = 'SELECTION_ALL';
 export var SELECTION_INVERT = 'SELECTION_INVERT';
 var ITEM_RENDER_TYPE = {
@@ -50,7 +51,8 @@ function DSTable(props) {
       hideColumnNames = props.hideColumnNames,
       renderSelectionTitle = props.renderSelectionTitle,
       hideTitlePart = props.hideTitlePart,
-      disableColumnNamesLineBreak = props.disableColumnNamesLineBreak;
+      disableColumnNamesLineBreak = props.disableColumnNamesLineBreak,
+      expandable = props.expandable;
   var tableLocale = useTableLocale(intl, locale);
 
   var _useDataFormat = useDataFormat(),
@@ -83,9 +85,10 @@ function DSTable(props) {
       rowKey: rowKey,
       locale: tableLocale,
       renderSelectionTitle: renderSelectionTitle,
-      hideTitlePart: hideTitlePart
+      hideTitlePart: hideTitlePart,
+      childrenColumnName: getChildrenColumnName(expandable == null ? void 0 : expandable.childrenColumnName)
     });
-  }, [selection, grouped, dataSource, dataSourceTotalCount, hideTitleBar, headerWithBorderTop, title, filters, itemsMenu, dataSourceFull, searchComponent, filterComponent, headerButton, rowKey, tableLocale, renderSelectionTitle, hideTitlePart]);
+  }, [selection, grouped, dataSource, dataSourceTotalCount, hideTitleBar, headerWithBorderTop, title, filters, itemsMenu, dataSourceFull, searchComponent, filterComponent, headerButton, rowKey, tableLocale, renderSelectionTitle, hideTitlePart, expandable == null ? void 0 : expandable.childrenColumnName]);
   var footerPagination = React.useMemo(function () {
     return _objectSpread({
       showTotal: function showTotal(total, range) {

package/dist/Table.types.d.ts

@@ -20,6 +20,10 @@ export type RowSelection<T> = Omit<TableRowSelection<T>, 'selections'> & {
     onChange: (selectedRowKeys: React.ReactText[], selectedRows: T[]) => void;
     limit?: number;
     independentSelectionExpandedRows?: boolean;
+    checkRowSelectionStatus?: (record: T) => {
+        disabled?: boolean;
+        unavailable?: boolean;
+    };
 };
 export interface Filter {
     tooltips: {