@semcore/data-table 16.5.3 → 16.6.0-prerelease.1

package/lib/es6/components/DataTable/DataTable.js

@@ -23,38 +23,39 @@ import { isFocusInside, hasFocusableIn } from '@semcore/core/lib/utils/use/useFo
 import { NoData } from '@semcore/widget-empty';
 import * as React from 'react';
 /*!__reshadow-styles__:"./dataTable.shadow.css"*/
-var style = (/*__reshadow_css_start__*/_sstyled.insert(/*__inner_css_start__*/".___SDataTable_236d0_gg_{display:grid;align-items:start;min-width:-moz-fit-content;min-width:fit-content;grid-auto-rows:min-content}.___SDataTable_236d0_gg_.__isDataEmpty_236d0_gg_{display:block;align-items:initial;min-width:initial}.___SDataTable_236d0_gg_.__gridTemplateColumns_236d0_gg_{grid-template-columns:var(--gridTemplateColumns_236d0)}.___SDataTable_236d0_gg_.__gridTemplateAreas_236d0_gg_{grid-template-areas:var(--gridTemplateAreas_236d0)}.___SDataTable_236d0_gg_.__gridTemplateRows_236d0_gg_{grid-template-rows:var(--gridTemplateRows_236d0)}", /*__inner_css_end__*/"236d0_gg_"),
+var style = (/*__reshadow_css_start__*/_sstyled.insert(/*__inner_css_start__*/".___SDataTable_hxi9n_gg_{display:grid;align-items:start;min-width:-moz-fit-content;min-width:fit-content;grid-auto-rows:min-content}.___SDataTable_hxi9n_gg_.__isDataEmpty_hxi9n_gg_{display:block;align-items:initial;min-width:initial}.___SDataTable_hxi9n_gg_.__gridTemplateColumns_hxi9n_gg_{grid-template-columns:var(--gridTemplateColumns_hxi9n)}.___SDataTable_hxi9n_gg_.__gridTemplateAreas_hxi9n_gg_{grid-template-areas:var(--gridTemplateAreas_hxi9n)}.___SDataTable_hxi9n_gg_.__gridTemplateRows_hxi9n_gg_{grid-template-rows:var(--gridTemplateRows_hxi9n)}", /*__inner_css_end__*/"hxi9n_gg_"),
 /*__reshadow_css_end__*/
 {
-  "__SDataTable": "___SDataTable_236d0_gg_",
-  "_isDataEmpty": "__isDataEmpty_236d0_gg_",
-  "_gridTemplateColumns": "__gridTemplateColumns_236d0_gg_",
-  "--gridTemplateColumns": "--gridTemplateColumns_236d0",
-  "_gridTemplateAreas": "__gridTemplateAreas_236d0_gg_",
-  "--gridTemplateAreas": "--gridTemplateAreas_236d0",
-  "_gridTemplateRows": "__gridTemplateRows_236d0_gg_",
-  "--gridTemplateRows": "--gridTemplateRows_236d0"
+  "__SDataTable": "___SDataTable_hxi9n_gg_",
+  "_isDataEmpty": "__isDataEmpty_hxi9n_gg_",
+  "_gridTemplateColumns": "__gridTemplateColumns_hxi9n_gg_",
+  "--gridTemplateColumns": "--gridTemplateColumns_hxi9n",
+  "_gridTemplateAreas": "__gridTemplateAreas_hxi9n_gg_",
+  "--gridTemplateAreas": "--gridTemplateAreas_hxi9n",
+  "_gridTemplateRows": "__gridTemplateRows_hxi9n_gg_",
+  "--gridTemplateRows": "--gridTemplateRows_hxi9n"
 });
+import { SelectableRows } from '../../store/SelectableRows';
 /*!__reshadow-styles__:"../../style/scroll-shadows.shadow.css"*/
-var scrollStyles = (/*__reshadow_css_start__*/_sstyled2.insert(/*__inner_css_start__*/".___SScrollArea_1m51n_gg_{width:-moz-fit-content;width:fit-content}.___SScrollArea_1m51n_gg_ .___SContainer_1m51n_gg_{overflow:visible;overflow:initial}.___SScrollArea_1m51n_gg_ .___SContainer_1m51n_gg_._scrollDirection_both_1m51n_gg_{overflow:auto}.___SScrollArea_1m51n_gg_ .___SContainer_1m51n_gg_._scrollDirection_both_1m51n_gg_.__loading_1m51n_gg_,.___SScrollArea_1m51n_gg_ .___SContainer_1m51n_gg_._scrollDirection_horizontal_1m51n_gg_.__loading_1m51n_gg_,.___SScrollArea_1m51n_gg_ .___SContainer_1m51n_gg_._scrollDirection_vertical_1m51n_gg_.__loading_1m51n_gg_{overflow:hidden}.___SScrollArea_1m51n_gg_ .___SContainer_1m51n_gg_._scrollDirection_horizontal_1m51n_gg_{overflow-x:auto;overflow-y:initial}.___SScrollArea_1m51n_gg_ .___SContainer_1m51n_gg_._scrollDirection_vertical_1m51n_gg_{overflow-x:initial;overflow-y:auto}.___SScrollArea_1m51n_gg_ .___SContainer_1m51n_gg_.__headerHeight_1m51n_gg_{scroll-padding-top:var(--headerHeight_1m51n)}.___SScrollArea_1m51n_gg_ .___SContainer_1m51n_gg_.__leftScrollPadding_1m51n_gg_{scroll-padding-left:var(--leftScrollPadding_1m51n)}.___SScrollArea_1m51n_gg_ .___SContainer_1m51n_gg_.__rightScrollPadding_1m51n_gg_{scroll-padding-right:var(--rightScrollPadding_1m51n)}.___SScrollArea_1m51n_gg_ .___SShadowHorizontal_1m51n_gg_::before,.___SScrollArea_1m51n_gg_ .___SShadowHorizontal_1m51n_gg_:after,.___SScrollArea_1m51n_gg_ .___SShadowVertical_1m51n_gg_::after{z-index:20}.___SScrollArea_1m51n_gg_ .___SShadowHorizontal_1m51n_gg_.__leftOffset_1m51n_gg_::before,.___SScrollArea_1m51n_gg_ .___SShadowHorizontal_1m51n_gg_.__rightOffset_1m51n_gg_::after,.___SScrollArea_1m51n_gg_ .___SShadowVertical_1m51n_gg_::before{display:none}", /*__inner_css_end__*/"1m51n_gg_"),
+var scrollStyles = (/*__reshadow_css_start__*/_sstyled2.insert(/*__inner_css_start__*/".___SScrollArea_70deb_gg_{width:-moz-fit-content;width:fit-content}.___SScrollArea_70deb_gg_ .___SContainer_70deb_gg_{overflow:visible;overflow:initial}.___SScrollArea_70deb_gg_ .___SContainer_70deb_gg_._scrollDirection_both_70deb_gg_{overflow:auto}.___SScrollArea_70deb_gg_ .___SContainer_70deb_gg_._scrollDirection_both_70deb_gg_.__loading_70deb_gg_,.___SScrollArea_70deb_gg_ .___SContainer_70deb_gg_._scrollDirection_horizontal_70deb_gg_.__loading_70deb_gg_,.___SScrollArea_70deb_gg_ .___SContainer_70deb_gg_._scrollDirection_vertical_70deb_gg_.__loading_70deb_gg_{overflow:hidden}.___SScrollArea_70deb_gg_ .___SContainer_70deb_gg_._scrollDirection_horizontal_70deb_gg_{overflow-x:auto;overflow-y:initial}.___SScrollArea_70deb_gg_ .___SContainer_70deb_gg_._scrollDirection_vertical_70deb_gg_{overflow-x:initial;overflow-y:auto}.___SScrollArea_70deb_gg_ .___SContainer_70deb_gg_.__headerHeight_70deb_gg_{scroll-padding-top:var(--headerHeight_70deb)}.___SScrollArea_70deb_gg_ .___SContainer_70deb_gg_.__leftScrollPadding_70deb_gg_{scroll-padding-left:var(--leftScrollPadding_70deb)}.___SScrollArea_70deb_gg_ .___SContainer_70deb_gg_.__rightScrollPadding_70deb_gg_{scroll-padding-right:var(--rightScrollPadding_70deb)}.___SScrollArea_70deb_gg_ .___SShadowHorizontal_70deb_gg_::before,.___SScrollArea_70deb_gg_ .___SShadowHorizontal_70deb_gg_:after,.___SScrollArea_70deb_gg_ .___SShadowVertical_70deb_gg_::after{z-index:20}.___SScrollArea_70deb_gg_ .___SShadowHorizontal_70deb_gg_.__leftOffset_70deb_gg_::before,.___SScrollArea_70deb_gg_ .___SShadowHorizontal_70deb_gg_.__rightOffset_70deb_gg_::after,.___SScrollArea_70deb_gg_ .___SShadowVertical_70deb_gg_::before{display:none}", /*__inner_css_end__*/"70deb_gg_"),
 /*__reshadow_css_end__*/
 {
-  "__SScrollArea": "___SScrollArea_1m51n_gg_",
-  "__SContainer": "___SContainer_1m51n_gg_",
-  "_scrollDirection_both": "_scrollDirection_both_1m51n_gg_",
-  "_loading": "__loading_1m51n_gg_",
-  "_scrollDirection_horizontal": "_scrollDirection_horizontal_1m51n_gg_",
-  "_scrollDirection_vertical": "_scrollDirection_vertical_1m51n_gg_",
-  "_headerHeight": "__headerHeight_1m51n_gg_",
-  "--headerHeight": "--headerHeight_1m51n",
-  "_leftScrollPadding": "__leftScrollPadding_1m51n_gg_",
-  "--leftScrollPadding": "--leftScrollPadding_1m51n",
-  "_rightScrollPadding": "__rightScrollPadding_1m51n_gg_",
-  "--rightScrollPadding": "--rightScrollPadding_1m51n",
-  "__SShadowVertical": "___SShadowVertical_1m51n_gg_",
-  "__SShadowHorizontal": "___SShadowHorizontal_1m51n_gg_",
-  "_leftOffset": "__leftOffset_1m51n_gg_",
-  "_rightOffset": "__rightOffset_1m51n_gg_"
+  "__SScrollArea": "___SScrollArea_70deb_gg_",
+  "__SContainer": "___SContainer_70deb_gg_",
+  "_scrollDirection_both": "_scrollDirection_both_70deb_gg_",
+  "_loading": "__loading_70deb_gg_",
+  "_scrollDirection_horizontal": "_scrollDirection_horizontal_70deb_gg_",
+  "_scrollDirection_vertical": "_scrollDirection_vertical_70deb_gg_",
+  "_headerHeight": "__headerHeight_70deb_gg_",
+  "--headerHeight": "--headerHeight_70deb",
+  "_leftScrollPadding": "__leftScrollPadding_70deb_gg_",
+  "--leftScrollPadding": "--leftScrollPadding_70deb",
+  "_rightScrollPadding": "__rightScrollPadding_70deb_gg_",
+  "--rightScrollPadding": "--rightScrollPadding_70deb",
+  "__SShadowVertical": "___SShadowVertical_70deb_gg_",
+  "__SShadowHorizontal": "___SShadowHorizontal_70deb_gg_",
+  "_leftOffset": "__leftOffset_70deb_gg_",
+  "_rightOffset": "__rightOffset_70deb_gg_"
 });
 import { localizedMessages } from '../../translations/__intergalactic-dynamic-locales';
 import { Body } from '../Body/Body';
@@ -95,7 +96,7 @@ var DataTableRoot = /*#__PURE__*/function (_Component) {
     });
     _defineProperty(_this, "selectAllMessageTimer", 0);
     _defineProperty(_this, "headerNodesMap", new Map());
-    _defineProperty(_this, "isPressedShift", false);
+    _defineProperty(_this, "selectedRowsContainer", void 0);
     _defineProperty(_this, "lastSelectedRowKey", void 0);
     _defineProperty(_this, "state", {
       scrollTop: 0,
@@ -140,13 +141,16 @@ var DataTableRoot = /*#__PURE__*/function (_Component) {
         _this.initFocusableCell([_this.hasFocusableInHeader() ? opt.rowIndex + 1 : opt.rowIndex, opt.colIndex]);
       }
     });
+    _defineProperty(_this, "handleSelectAllRows", function (selectedRows, event) {
+      if (!('onSelectedRowsChange' in _this.asProps) || !_this.asProps.onSelectedRowsChange || !Array.isArray(selectedRows)) return;
+      _this.asProps.onSelectedRowsChange(selectedRows, event);
+    });
     _defineProperty(_this, "handleSelectRow", function (isSelected, selectedRowIndex, row, event) {
-      var _this$asProps = _this.asProps,
-        selectedRows = _this$asProps.selectedRows,
-        onSelectedRowsChange = _this$asProps.onSelectedRowsChange;
-      if (!selectedRows || !onSelectedRowsChange) return;
+      var selectedRows = _this.asProps.selectedRows;
+      if (!selectedRows || !('onSelectedRowsChange' in _this.asProps) || !_this.asProps.onSelectedRowsChange || !Array.isArray(selectedRows)) return;
+      var onSelectedRowsChange = _this.asProps.onSelectedRowsChange;
       var selectedRowsSet = new Set(selectedRows);
-      if (_this.isPressedShift && selectedRowsSet.size > 0 && _this.lastSelectedRowKey && (isSelected ? selectedRowsSet.has(_this.lastSelectedRowKey) : true)) {
+      if (_this.selectedRowsContainer.isPressedShift && selectedRowsSet.size > 0 && _this.lastSelectedRowKey && (isSelected ? selectedRowsSet.has(_this.lastSelectedRowKey) : true)) {
         var select = false;
         var firstColumnKey = _this.columns[0].name;
         var isMerged = _this.flatRows.some(function (item) {
@@ -222,9 +226,9 @@ var DataTableRoot = /*#__PURE__*/function (_Component) {
       });
     });
     _defineProperty(_this, "onExpandRow", function (expandedRow) {
-      var _this$asProps2 = _this.asProps,
-        onAccordionToggle = _this$asProps2.onAccordionToggle,
-        accordionMode = _this$asProps2.accordionMode;
+      var _this$asProps = _this.asProps,
+        onAccordionToggle = _this$asProps.onAccordionToggle,
+        accordionMode = _this$asProps.accordionMode;
       var expandedRows = _this.state.expandedRows;
       if (expandedRows.has(expandedRow[UNIQ_ROW_KEY])) {
         expandedRows["delete"](expandedRow[UNIQ_ROW_KEY]);
@@ -369,13 +373,13 @@ var DataTableRoot = /*#__PURE__*/function (_Component) {
           }
         case 'Shift':
           {
-            _this.isPressedShift = true;
+            _this.selectedRowsContainer.isPressedShift = true;
           }
       }
     });
     _defineProperty(_this, "handleKeyUp", function (e) {
       if (e.key === 'Shift') {
-        _this.isPressedShift = false;
+        _this.selectedRowsContainer.isPressedShift = false;
       }
     });
     _defineProperty(_this, "handleScroll", trottle(function (e) {
@@ -493,12 +497,12 @@ var DataTableRoot = /*#__PURE__*/function (_Component) {
       _this.changeFocusCell(-1, cellIndex === -1 ? 0 : cellIndex, 'up');
     });
     _defineProperty(_this, "handleContainerResizeEnd", function (entries, observer) {
-      var _this$asProps$onResiz, _this$asProps3;
+      var _this$asProps$onResiz, _this$asProps2;
       if (_this.containerResizeEndTimeoutId) {
         clearTimeout(_this.containerResizeEndTimeoutId);
       }
       _this.containerResizeEndTimeoutId = setTimeout(_this.calculateVerticalShadow, 0);
-      (_this$asProps$onResiz = (_this$asProps3 = _this.asProps).onResize) === null || _this$asProps$onResiz === void 0 || _this$asProps$onResiz.call(_this$asProps3, entries, observer);
+      (_this$asProps$onResiz = (_this$asProps2 = _this.asProps).onResize) === null || _this$asProps$onResiz === void 0 || _this$asProps$onResiz.call(_this$asProps2, entries, observer);
     });
     _defineProperty(_this, "getScrollOffsetValue", function () {
       if (!_this.headerRef.current) {
@@ -572,6 +576,11 @@ var DataTableRoot = /*#__PURE__*/function (_Component) {
     _this.calculatedRows = _this.getRows();
     _this.flatRows = _this.calculatedRows.flat();
     _this.tmpData = props.data;
+    if (Array.isArray(props.selectedRows) || !props.selectedRows) {
+      _this.selectedRowsContainer = new SelectableRows();
+    } else {
+      _this.selectedRowsContainer = props.selectedRows;
+    }
     return _this;
   }
   _inherits(DataTableRoot, _Component);
@@ -579,9 +588,9 @@ var DataTableRoot = /*#__PURE__*/function (_Component) {
     key: "componentDidMount",
     value: function componentDidMount() {
       var _this2 = this;
-      var _this$asProps4 = this.asProps,
-        headerProps = _this$asProps4.headerProps,
-        loading = _this$asProps4.loading;
+      var _this$asProps3 = this.asProps,
+        headerProps = _this$asProps3.headerProps,
+        loading = _this$asProps3.loading;
       if (headerProps !== null && headerProps !== void 0 && headerProps.sticky && !headerProps.h || loading || this.hasFixedColumn) {
         requestAnimationFrame(function () {
           _this2.forceUpdate();
@@ -595,10 +604,10 @@ var DataTableRoot = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      var _this$asProps5 = this.asProps,
-        data = _this$asProps5.data,
-        selectedRows = _this$asProps5.selectedRows,
-        columns = _this$asProps5.columns;
+      var _this$asProps4 = this.asProps,
+        data = _this$asProps4.data,
+        selectedRows = _this$asProps4.selectedRows,
+        columns = _this$asProps4.columns;
       if (prevProps.columns !== columns) {
         var cols = this.calculateColumnsFromConfig();
         this.columns = cols[0];
@@ -610,7 +619,7 @@ var DataTableRoot = /*#__PURE__*/function (_Component) {
           this.calculateVerticalShadow();
         }
       }
-      if (prevProps.selectedRows !== selectedRows && selectedRows !== undefined) {
+      if (prevProps.selectedRows !== selectedRows && selectedRows !== undefined && Array.isArray(selectedRows)) {
         var selectedRowsSet = new Set(selectedRows);
         var allChecked = [];
         var allUnchecked = [];
@@ -627,6 +636,9 @@ var DataTableRoot = /*#__PURE__*/function (_Component) {
           this.setSelectAllMessage(false);
         }
       }
+      if (prevProps.selectedRows !== selectedRows && selectedRows !== undefined && !Array.isArray(selectedRows)) {
+        this.selectedRowsContainer = selectedRows;
+      }
     }
   }, {
     key: "componentWillUnmount",
@@ -673,11 +685,11 @@ var DataTableRoot = /*#__PURE__*/function (_Component) {
   }, {
     key: "scrollDirection",
     get: function get() {
-      var _this$asProps6 = this.asProps,
-        w = _this$asProps6.w,
-        wMax = _this$asProps6.wMax,
-        h = _this$asProps6.h,
-        hMax = _this$asProps6.hMax;
+      var _this$asProps5 = this.asProps,
+        w = _this$asProps5.w,
+        wMax = _this$asProps5.wMax,
+        h = _this$asProps5.h,
+        hMax = _this$asProps5.hMax;
       var scrollDirection = undefined;
       var hasWidthSettings = Boolean(w) || Boolean(wMax);
       var hasHeightSettings = Boolean(h) && h !== 'fit-content' || Boolean(hMax);
@@ -698,18 +710,17 @@ var DataTableRoot = /*#__PURE__*/function (_Component) {
   }, {
     key: "getHeadProps",
     value: function getHeadProps() {
-      var _this$asProps7 = this.asProps,
-        use = _this$asProps7.use,
-        compact = _this$asProps7.compact,
-        sort = _this$asProps7.sort,
-        onSortChange = _this$asProps7.onSortChange,
-        getI18nText = _this$asProps7.getI18nText,
-        uid = _this$asProps7.uid,
-        headerProps = _this$asProps7.headerProps,
-        onSelectedRowsChange = _this$asProps7.onSelectedRowsChange,
-        selectedRows = _this$asProps7.selectedRows,
-        sideIndents = _this$asProps7.sideIndents,
-        variant = _this$asProps7.variant;
+      var _this$asProps6 = this.asProps,
+        use = _this$asProps6.use,
+        compact = _this$asProps6.compact,
+        sort = _this$asProps6.sort,
+        onSortChange = _this$asProps6.onSortChange,
+        getI18nText = _this$asProps6.getI18nText,
+        uid = _this$asProps6.uid,
+        headerProps = _this$asProps6.headerProps,
+        selectedRows = _this$asProps6.selectedRows,
+        sideIndents = _this$asProps6.sideIndents,
+        variant = _this$asProps6.variant;
       var _this$gridSettings = this.gridSettings,
         gridTemplateColumns = _this$gridSettings.gridTemplateColumns,
         gridTemplateAreas = _this$gridSettings.gridTemplateAreas;
@@ -733,7 +744,7 @@ var DataTableRoot = /*#__PURE__*/function (_Component) {
         totalRows: this.totalRows,
         selectedRows: selectedRows,
         flatRows: this.getFlatRows(),
-        onChangeSelectAll: onSelectedRowsChange,
+        onChangeSelectAll: Array.isArray(selectedRows) ? this.handleSelectAllRows : undefined,
         getFixedStyle: this.getFixedStyle,
         onCellClick: this.handleCellClick,
         shadowVertical: shadowVertical,
@@ -744,27 +755,27 @@ var DataTableRoot = /*#__PURE__*/function (_Component) {
   }, {
     key: "getBodyProps",
     value: function getBodyProps() {
-      var _this$asProps8 = this.asProps,
-        use = _this$asProps8.use,
-        compact = _this$asProps8.compact,
-        loading = _this$asProps8.loading,
-        getI18nText = _this$asProps8.getI18nText,
-        virtualScroll = _this$asProps8.virtualScroll,
-        uid = _this$asProps8.uid,
-        rowProps = _this$asProps8.rowProps,
-        renderCell = _this$asProps8.renderCell,
-        headerProps = _this$asProps8.headerProps,
-        renderEmptyData = _this$asProps8.renderEmptyData,
-        sideIndents = _this$asProps8.sideIndents,
-        selectedRows = _this$asProps8.selectedRows,
-        accordionDuration = _this$asProps8.accordionDuration,
-        accordionMode = _this$asProps8.accordionMode,
-        rawData = _this$asProps8.data,
-        renderCellOverlay = _this$asProps8.renderCellOverlay,
-        limit = _this$asProps8.limit,
-        variant = _this$asProps8.variant,
-        totalRows = _this$asProps8.totalRows,
-        accordionAnimationRows = _this$asProps8.accordionAnimationRows;
+      var _this$asProps7 = this.asProps,
+        use = _this$asProps7.use,
+        compact = _this$asProps7.compact,
+        loading = _this$asProps7.loading,
+        getI18nText = _this$asProps7.getI18nText,
+        virtualScroll = _this$asProps7.virtualScroll,
+        uid = _this$asProps7.uid,
+        rowProps = _this$asProps7.rowProps,
+        renderCell = _this$asProps7.renderCell,
+        headerProps = _this$asProps7.headerProps,
+        renderEmptyData = _this$asProps7.renderEmptyData,
+        sideIndents = _this$asProps7.sideIndents,
+        selectedRows = _this$asProps7.selectedRows,
+        accordionDuration = _this$asProps7.accordionDuration,
+        accordionMode = _this$asProps7.accordionMode,
+        rawData = _this$asProps7.data,
+        renderCellOverlay = _this$asProps7.renderCellOverlay,
+        limit = _this$asProps7.limit,
+        variant = _this$asProps7.variant,
+        totalRows = _this$asProps7.totalRows,
+        accordionAnimationRows = _this$asProps7.accordionAnimationRows;
       var _this$gridSettings2 = this.gridSettings,
         gridTemplateColumns = _this$gridSettings2.gridTemplateColumns,
         gridTemplateAreas = _this$gridSettings2.gridTemplateAreas;
@@ -801,7 +812,7 @@ var DataTableRoot = /*#__PURE__*/function (_Component) {
         renderEmptyData: renderEmptyData,
         sideIndents: sideIndents,
         selectedRows: selectedRows,
-        onSelectRow: this.handleSelectRow,
+        onSelectRow: Array.isArray(selectedRows) ? this.handleSelectRow : undefined,
         getFixedStyle: this.getFixedStyle,
         onCellClick: this.handleCellClick,
         rawData: rawData,
@@ -844,20 +855,20 @@ var DataTableRoot = /*#__PURE__*/function (_Component) {
       var _ref = this.asProps,
         _ref2;
       var SDataTable = Box;
-      var _this$asProps9 = this.asProps,
-        Children = _this$asProps9.Children,
-        styles = _this$asProps9.styles,
-        w = _this$asProps9.w,
-        wMax = _this$asProps9.wMax,
-        wMin = _this$asProps9.wMin,
-        h = _this$asProps9.h,
-        hMax = _this$asProps9.hMax,
-        hMin = _this$asProps9.hMin,
-        virtualScroll = _this$asProps9.virtualScroll,
-        children = _this$asProps9.children,
-        headerProps = _this$asProps9.headerProps,
-        loading = _this$asProps9.loading,
-        selectedRows = _this$asProps9.selectedRows;
+      var _this$asProps8 = this.asProps,
+        Children = _this$asProps8.Children,
+        styles = _this$asProps8.styles,
+        w = _this$asProps8.w,
+        wMax = _this$asProps8.wMax,
+        wMin = _this$asProps8.wMin,
+        h = _this$asProps8.h,
+        hMax = _this$asProps8.hMax,
+        hMin = _this$asProps8.hMin,
+        virtualScroll = _this$asProps8.virtualScroll,
+        children = _this$asProps8.children,
+        headerProps = _this$asProps8.headerProps,
+        loading = _this$asProps8.loading,
+        selectedRows = _this$asProps8.selectedRows;
       var _this$getScrollOffset = this.getScrollOffsetValue(),
         _this$getScrollOffset2 = _slicedToArray(_this$getScrollOffset, 2),
         offsetLeftSum = _this$getScrollOffset2[0],
@@ -1076,11 +1087,13 @@ var DataTableRoot = /*#__PURE__*/function (_Component) {
       var _this$props2 = this.props,
         data = _this$props2.data,
         uid = _this$props2.uid,
-        uniqueRowKey = _this$props2.uniqueRowKey;
+        uniqueRowKey = _this$props2.uniqueRowKey,
+        selectedRows = _this$props2.selectedRows;
       if (this.tmpData === data) {
         return this.calculatedRows;
       }
       this.tmpData = data;
+      var availableRowKeys = [];
       var rows = [];
       var columnNames = columns.map(function (column) {
         return column.name;
@@ -1150,6 +1163,10 @@ var DataTableRoot = /*#__PURE__*/function (_Component) {
             dtRow[value] = '';
           });
         }
+        if (!excludeColumns) {
+          // we should add only the main row in mergedRows or default rows
+          availableRowKeys.push(dtRow[UNIQ_ROW_KEY]);
+        }
         return dtRow;
       };
       data.forEach(function (row) {
@@ -1202,6 +1219,9 @@ var DataTableRoot = /*#__PURE__*/function (_Component) {
         }
       });
       this.calculatedRows = rows;
+      if (selectedRows && !Array.isArray(selectedRows)) {
+        selectedRows.setAvailableKeys(availableRowKeys);
+      }
       return rows;
     }
   }, {