@carbon/ibm-products 2.43.2-canary.3 → 2.43.2-canary.300

package/es/components/Datagrid/useFlexResize.js

@@ -5,33 +5,48 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { toConsumableArray as _toConsumableArray } from '../../_virtual/_rollupPluginBabelHelpers.js';
-
-/* eslint-disable no-unreachable */
-/**
- * Copyright IBM Corp. 2020, 2024
- *
- * This source code is licensed under the Apache-2.0 license found in the
- * LICENSE file in the root directory of this source tree.
- */
+import { slicedToArray as _slicedToArray, toConsumableArray as _toConsumableArray } from '../../_virtual/_rollupPluginBabelHelpers.js';
+import { useState, useEffect } from 'react';
 
 var useFlexResize = function useFlexResize(hooks) {
+  var _useState = useState(),
+    _useState2 = _slicedToArray(_useState, 2),
+    spacerColumn = _useState2[0],
+    setSpacerColumn = _useState2[1];
+  var useInstance = function useInstance(instance) {
+    var enableSpacerColumn = instance.enableSpacerColumn;
+    useEffect(function () {
+      setSpacerColumn(enableSpacerColumn);
+    }, [enableSpacerColumn]);
+  };
+  var spacer = {
+    id: 'spacer',
+    width: 0,
+    disableSortBy: true,
+    disableResizing: true
+  };
   hooks.visibleColumns.push(function (columns) {
     // always move actions to the end
     var actionsIdx = columns.findIndex(function (col) {
       return col.isAction;
     });
-    if (actionsIdx === -1) {
-      var _lastCol = columns.at(-1);
-      _lastCol.isFlexCol = true;
+    if (!spacerColumn && actionsIdx === -1) {
+      var lastCol = columns.at(-1);
+      lastCol.isFlexCol = true;
       return _toConsumableArray(columns);
+    } else if (spacerColumn & actionsIdx === -1) {
+      return [].concat(_toConsumableArray(columns), [spacer]);
     }
     var cols = _toConsumableArray(columns);
     var actions = cols.splice(actionsIdx, 1)[0];
-    cols.splice(columns.length, 0, actions);
-    // the last non-action action column should flex remaining space
-    var lastCol = columns.at(-2);
-    lastCol.isFlexCol = true;
+    if (spacerColumn) {
+      cols.splice(columns.length, 0, spacer, actions);
+    } else {
+      cols.splice(columns.length, 0, actions);
+      // the last non-action action column should flex remaining space
+      var _lastCol = columns.at(-2);
+      _lastCol.isFlexCol = true;
+    }
     return cols;
   });
   var changeProps = function changeProps(props, data) {
@@ -39,7 +54,7 @@ var useFlexResize = function useFlexResize(hooks) {
     if (!column && data.cell) {
       column = data.cell.column;
     }
-    if (column.isFlexCol) {
+    if (column.isFlexCol || column.id === spacer.id) {
       return [props, {
         style: {
           flex: '1 1 0'
@@ -58,6 +73,7 @@ var useFlexResize = function useFlexResize(hooks) {
   hooks.getCellProps.push(function (props, data) {
     return changeProps(props, data);
   });
+  hooks.useInstance.push(useInstance);
 };
 var useFlexResize$1 = useFlexResize;
 

package/es/components/Datagrid/useInfiniteScroll.js

@@ -52,6 +52,5 @@ var useInfiniteScroll = function useInfiniteScroll(hooks) {
   };
   hooks.useInstance.push(useInstance);
 };
-var useInfiniteScroll$1 = useInfiniteScroll;
 
-export { useInfiniteScroll$1 as default };
+export { useInfiniteScroll as default };

package/es/components/Datagrid/useInitialColumnSort.js

@@ -29,6 +29,10 @@ var useInitialColumnSort = function useInitialColumnSort(instance) {
     if (sortableColumn) {
       var columnId = sortableColumn.id,
         order = sortableColumn.order;
+      // prevents edge case where initial sort state of none actually starts out as ascending
+      if (order !== 'ASC' && order !== 'DESC') {
+        return;
+      }
       var _getNewSortOrder = getNewSortOrder(order),
         newSortDesc = _getNewSortOrder.newSortDesc,
         newOrder = _getNewSortOrder.newOrder;

package/es/components/Datagrid/useInlineEdit.js

@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import { typeof as _typeof } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default from 'react';
 import { pkg } from '../../settings.js';
 import cx from 'classnames';
@@ -13,12 +14,13 @@ import { InlineEditCell } from './Datagrid/addons/InlineEdit/InlineEditCell/Inli
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var useInlineEdit = function useInlineEdit(hooks) {
   var addInlineEdit = function addInlineEdit(props, _ref) {
-    var _cell$column, _cell$column2;
+    var _cell$column, _cell$column2, _cell$value, _cell$value2, _cell$value3;
     var cell = _ref.cell,
       instance = _ref.instance;
     var columnInlineEditConfig = cell.column.inlineEdit;
     var inlineEditType = (_cell$column = cell.column) === null || _cell$column === void 0 || (_cell$column = _cell$column.inlineEdit) === null || _cell$column === void 0 ? void 0 : _cell$column.type;
     var isDisabled = (_cell$column2 = cell.column) === null || _cell$column2 === void 0 ? void 0 : _cell$column2.isDisabled;
+    var staticCell = _typeof(cell.value) === 'object' && cell.column.id === ((_cell$value = cell.value) === null || _cell$value === void 0 ? void 0 : _cell$value.columnId) && ((_cell$value2 = cell.value) === null || _cell$value2 === void 0 ? void 0 : _cell$value2.isStaticCell);
     var renderInlineEditComponent = function renderInlineEditComponent(type) {
       return /*#__PURE__*/React__default.createElement(InlineEditCell, {
         config: columnInlineEditConfig,
@@ -38,7 +40,15 @@ var useInlineEdit = function useInlineEdit(hooks) {
     return [props, {
       className: cx("".concat(blockClass, "__cell"), "".concat(blockClass, "__cell-inline-edit")),
       role: 'gridcell',
-      children: /*#__PURE__*/React__default.createElement(React__default.Fragment, null, inlineEditType === 'text' && renderInlineEditComponent(inlineEditType), inlineEditType === 'number' && renderInlineEditComponent(inlineEditType), inlineEditType === 'selection' && renderInlineEditComponent(inlineEditType), inlineEditType === 'date' && renderInlineEditComponent(inlineEditType), !inlineEditType && /*#__PURE__*/React__default.createElement(InlineEditCell, {
+      children: /*#__PURE__*/React__default.createElement(React__default.Fragment, null, !staticCell && inlineEditType === 'text' && renderInlineEditComponent(inlineEditType), !staticCell && inlineEditType === 'number' && renderInlineEditComponent(inlineEditType), !staticCell && inlineEditType === 'selection' && renderInlineEditComponent(inlineEditType), inlineEditType === 'checkbox' && renderInlineEditComponent(inlineEditType), !staticCell && inlineEditType === 'date' && renderInlineEditComponent(inlineEditType), staticCell && /*#__PURE__*/React__default.createElement(InlineEditCell, {
+        config: columnInlineEditConfig,
+        tabIndex: -1,
+        value: (_cell$value3 = cell.value) === null || _cell$value3 === void 0 ? void 0 : _cell$value3.value,
+        cell: cell,
+        instance: instance,
+        nonEditCell: true,
+        type: "text"
+      }), !inlineEditType && /*#__PURE__*/React__default.createElement(InlineEditCell, {
         config: columnInlineEditConfig,
         tabIndex: -1,
         value: cell.value,
@@ -57,6 +67,5 @@ var useInlineEdit = function useInlineEdit(hooks) {
     });
   });
 };
-var useInlineEdit$1 = useInlineEdit;
 
-export { useInlineEdit$1 as default };
+export { useInlineEdit as default };

package/es/components/Datagrid/useNestedRowExpander.js

@@ -5,12 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { toConsumableArray as _toConsumableArray, objectSpread2 as _objectSpread2, extends as _extends, defineProperty as _defineProperty } from '../../_virtual/_rollupPluginBabelHelpers.js';
+import { toConsumableArray as _toConsumableArray, objectSpread2 as _objectSpread2, extends as _extends, defineProperty as _defineProperty, asyncToGenerator as _asyncToGenerator, regeneratorRuntime as _regeneratorRuntime } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default, { useRef } from 'react';
 import { ChevronRight } from '@carbon/react/icons';
 import cx from 'classnames';
 import { pkg, carbon } from '../../settings.js';
 import { useFocusRowExpander } from './useFocusRowExpander.js';
+import { handleDynamicRowCheck } from './Datagrid/addons/stateReducer.js';
 
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var useNestedRowExpander = function useNestedRowExpander(hooks) {
@@ -25,34 +26,84 @@ var useNestedRowExpander = function useNestedRowExpander(hooks) {
     blockClass: blockClass,
     activeElement: typeof document !== 'undefined' && document.activeElement
   });
-  var visibleColumns = function visibleColumns(columns) {
+  var visibleColumns = function visibleColumns(columns, state) {
+    var _ref = state.instance || {},
+      getAsyncSubRows = _ref.getAsyncSubRows,
+      dispatch = _ref.dispatch,
+      tableState = _ref.state;
+    var fetchingDynamicSubRows = !!tableState.dynamicRowSkeleton;
     var expanderColumn = {
       id: 'expander',
-      Cell: function Cell(_ref) {
-        var row = _ref.row;
+      Cell: function Cell(_ref2) {
+        var row = _ref2.row;
         var expanderButtonProps = _objectSpread2(_objectSpread2({}, row.getToggleRowExpandedProps()), {}, {
-          onClick: function onClick(event) {
-            // Prevents `onRowClick` from being called if `useOnRowClick` is included
-            event.stopPropagation();
-            row.toggleRowExpanded();
-            lastExpandedRowIndex.current = row.id;
-          }
+          disabled: getAsyncSubRows && fetchingDynamicSubRows,
+          onClick: function () {
+            var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(event) {
+              return _regeneratorRuntime().wrap(function _callee$(_context) {
+                while (1) switch (_context.prev = _context.next) {
+                  case 0:
+                    // Prevents `onRowClick` from being called if `useOnRowClick` is included
+                    event.stopPropagation();
+                    row.toggleRowExpanded();
+                    lastExpandedRowIndex.current = row.id;
+                    if (row.isExpanded) {
+                      _context.next = 15;
+                      break;
+                    }
+                    _context.prev = 4;
+                    handleDynamicRowCheck({
+                      dispatch: dispatch,
+                      status: 'start',
+                      rowId: row.id,
+                      depth: row.depth,
+                      index: row.index
+                    });
+                    if (!getAsyncSubRows) {
+                      _context.next = 9;
+                      break;
+                    }
+                    _context.next = 9;
+                    return getAsyncSubRows === null || getAsyncSubRows === void 0 ? void 0 : getAsyncSubRows(row);
+                  case 9:
+                    handleDynamicRowCheck({
+                      dispatch: dispatch,
+                      status: 'finish',
+                      rowId: row.id
+                    });
+                    _context.next = 15;
+                    break;
+                  case 12:
+                    _context.prev = 12;
+                    _context.t0 = _context["catch"](4);
+                    console.log({
+                      error: _context.t0
+                    });
+                  case 15:
+                  case "end":
+                    return _context.stop();
+                }
+              }, _callee, null, [[4, 12]]);
+            }));
+            function onClick(_x) {
+              return _onClick.apply(this, arguments);
+            }
+            return onClick;
+          }()
         });
-        var _ref2 = (tempState === null || tempState === void 0 ? void 0 : tempState.current) || {},
-          _ref2$expanderButtonT = _ref2.expanderButtonTitleExpanded,
-          expanderButtonTitleExpanded = _ref2$expanderButtonT === void 0 ? 'Collapse row' : _ref2$expanderButtonT,
-          _ref2$expanderButtonT2 = _ref2.expanderButtonTitleCollapsed,
-          expanderButtonTitleCollapsed = _ref2$expanderButtonT2 === void 0 ? 'Expand row' : _ref2$expanderButtonT2;
+        var _ref3 = (tempState === null || tempState === void 0 ? void 0 : tempState.current) || {},
+          _ref3$expanderButtonT = _ref3.expanderButtonTitleExpanded,
+          expanderButtonTitleExpanded = _ref3$expanderButtonT === void 0 ? 'Collapse row' : _ref3$expanderButtonT,
+          _ref3$expanderButtonT2 = _ref3.expanderButtonTitleCollapsed,
+          expanderButtonTitleCollapsed = _ref3$expanderButtonT2 === void 0 ? 'Expand row' : _ref3$expanderButtonT2;
         var expanderTitle = row.isExpanded ? expanderButtonTitleExpanded : expanderButtonTitleCollapsed;
-        return row.canExpand && /*#__PURE__*/React__default.createElement("button", _extends({
+        return row.canExpand || getAsyncSubRows ? /*#__PURE__*/React__default.createElement("button", _extends({
           type: "button",
           "aria-label": expanderTitle,
           className: cx("".concat(blockClass, "__row-expander"), "".concat(carbon.prefix, "--btn"), "".concat(carbon.prefix, "--btn--ghost"))
-        }, expanderButtonProps, {
-          title: expanderTitle
-        }), /*#__PURE__*/React__default.createElement(ChevronRight, {
+        }, expanderButtonProps), /*#__PURE__*/React__default.createElement(ChevronRight, {
           className: cx("".concat(blockClass, "__expander-icon"), _defineProperty(_defineProperty({}, "".concat(blockClass, "__expander-icon--not-open"), !row.isExpanded), "".concat(blockClass, "__expander-icon--open"), row.isExpanded))
-        }));
+        })) : null;
       },
       width: 48,
       disableResizing: true,

package/es/components/Datagrid/useNestedRows.js

@@ -15,33 +15,52 @@ var blockClass = "".concat(pkg.prefix, "--datagrid");
 var useNestedRows = function useNestedRows(hooks) {
   useNestedRowExpander(hooks);
   var useInstance = function useInstance(instance) {
+    useEffect(function () {
+      var _ref = instance,
+        rows = _ref.rows;
+      var defaultExpandedRows = rows.filter(function (row) {
+        var _row$original;
+        return row === null || row === void 0 || (_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.defaultExpanded;
+      });
+      if (defaultExpandedRows !== null && defaultExpandedRows !== void 0 && defaultExpandedRows.length) {
+        defaultExpandedRows.map(function (defaultExpandedRow) {
+          if (!(defaultExpandedRow !== null && defaultExpandedRow !== void 0 && defaultExpandedRow.isExpanded) && !(defaultExpandedRow !== null && defaultExpandedRow !== void 0 && defaultExpandedRow.hasExpanded)) {
+            var _defaultExpandedRow$t;
+            defaultExpandedRow === null || defaultExpandedRow === void 0 || (_defaultExpandedRow$t = defaultExpandedRow.toggleRowExpanded) === null || _defaultExpandedRow$t === void 0 || _defaultExpandedRow$t.call(defaultExpandedRow);
+            defaultExpandedRow.hasExpanded = true;
+            return;
+          }
+        });
+      }
+    }, [instance, instance.rows]);
     // This useEffect will expand rows if they exist in the initialState obj
     useEffect(function () {
       var rows = instance.rows,
         initialState = instance.initialState;
-      var _ref = initialState,
-        expandedRowIds = _ref.expandedRowIds;
+      var _ref2 = initialState,
+        expandedRowIds = _ref2.expandedRowIds;
       if (expandedRowIds) {
         Object.keys(expandedRowIds).forEach(function (key) {
+          var _row$0$original;
           var row = rows.filter(function (r) {
-            return r.id.toString() === key.toString();
+            var _r$original;
+            return r.id.toString() === key.toString() || ((_r$original = r.original) === null || _r$original === void 0 || (_r$original = _r$original.id) === null || _r$original === void 0 ? void 0 : _r$original.toString()) === key.toString();
           });
-          if (row !== null && row !== void 0 && row.length && key.toString() === row[0].id.toString()) {
-            var _row$;
-            (_row$ = row[0]) === null || _row$ === void 0 || _row$.toggleRowExpanded();
+          if (row.length && key.toString() === row[0].id.toString() || row.length && key.toString() === ((_row$0$original = row[0].original) === null || _row$0$original === void 0 || (_row$0$original = _row$0$original.id) === null || _row$0$original === void 0 ? void 0 : _row$0$original.toString())) {
+            row[0].toggleRowExpanded();
           }
         });
       }
     }, [instance]);
     var marginLeft = 24;
-    var getRowProps = function getRowProps(props, _ref2) {
-      var row = _ref2.row;
+    var getRowProps = function getRowProps(props, _ref3) {
+      var row = _ref3.row;
       return [props, {
         className: cx(_defineProperty(_defineProperty({}, "".concat(blockClass, "__carbon-nested-row"), row.depth > 0), "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded))
       }];
     };
-    var getRowStyles = function getRowStyles(props, _ref3) {
-      var row = _ref3.row;
+    var getRowStyles = function getRowStyles(props, _ref4) {
+      var row = _ref4.row;
       return [props, {
         style: {
           paddingLeft: "".concat(row.depth > 1 ? marginLeft * 2 + (row.depth - 1) * (marginLeft + marginLeft / 3) : row.depth === 1 ? marginLeft * 2 : 0, "px")
@@ -51,9 +70,9 @@ var useNestedRows = function useNestedRows(hooks) {
     var getIndentation = function getIndentation(depth) {
       return 32 * depth + 16;
     }; // row indentation padding
-    var getCellProps = function getCellProps(props, _ref4) {
-      var cell = _ref4.cell,
-        instance = _ref4.instance;
+    var getCellProps = function getCellProps(props, _ref5) {
+      var cell = _ref5.cell,
+        instance = _ref5.instance;
       // we add a dynamic -ve margin right only if the cell is resized below minimum width i.e 50px, else we set the width based on indentation at different levels
       var isFirstCell = instance.columns.findIndex(function (c) {
         return c.id === cell.column.id;
@@ -75,6 +94,5 @@ var useNestedRows = function useNestedRows(hooks) {
   };
   hooks.useInstance.push(useInstance);
 };
-var useNestedRows$1 = useNestedRows;
 
-export { useNestedRows$1 as default };
+export { useNestedRows as default };

package/es/components/Datagrid/useOnRowClick.js

@@ -61,6 +61,5 @@ var useOnRowClick = function useOnRowClick(hooks) {
   };
   hooks.useInstance.push(useInstance);
 };
-var useOnRowClick$1 = useOnRowClick;
 
-export { useOnRowClick$1 as default };
+export { useOnRowClick as default };

package/es/components/Datagrid/useRowExpander.js

@@ -38,21 +38,18 @@ var useRowExpander = function useRowExpander(hooks) {
             row.toggleRowExpanded();
             row === null || row === void 0 || (_row$onClick = row.onClick) === null || _row$onClick === void 0 || _row$onClick.call(row, row, event);
             lastExpandedRowIndex.current = row.id;
-          }
+          },
+          title: null
         });
         var _ref2 = (tempState === null || tempState === void 0 ? void 0 : tempState.current) || {},
-          _ref2$expanderButtonT = _ref2.expanderButtonTitleExpanded,
-          expanderButtonTitleExpanded = _ref2$expanderButtonT === void 0 ? 'Collapse row' : _ref2$expanderButtonT,
-          _ref2$expanderButtonT2 = _ref2.expanderButtonTitleCollapsed,
-          expanderButtonTitleCollapsed = _ref2$expanderButtonT2 === void 0 ? 'Expand row' : _ref2$expanderButtonT2;
+          expanderButtonTitleExpanded = _ref2.expanderButtonTitleExpanded,
+          expanderButtonTitleCollapsed = _ref2.expanderButtonTitleCollapsed;
         var expanderTitle = row.isExpanded ? expanderButtonTitleExpanded : expanderButtonTitleCollapsed;
         return row.canExpand && /*#__PURE__*/React__default.createElement("button", _extends({
           type: "button",
           "aria-label": expanderTitle,
           className: cx("".concat(blockClass, "__row-expander"), "".concat(carbon.prefix, "--btn"), "".concat(carbon.prefix, "--btn--ghost"))
-        }, expanderButtonProps, {
-          title: expanderTitle
-        }), row.isExpanded ? /*#__PURE__*/React__default.createElement(ChevronUp, {
+        }, expanderButtonProps), row.isExpanded ? /*#__PURE__*/React__default.createElement(ChevronUp, {
           className: "".concat(blockClass, "__row-expander--icon")
         }) : /*#__PURE__*/React__default.createElement(ChevronDown, {
           className: "".concat(blockClass, "__row-expander--icon")

package/es/components/Datagrid/useRowIsMouseOver.d.ts

@@ -1,3 +1,9 @@
+/**
+ * Copyright IBM Corp. 2024
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 import { Hooks } from 'react-table';
 declare const useRowIsMouseOver: (hooks: Hooks) => void;
 export default useRowIsMouseOver;

package/es/components/Datagrid/useRowIsMouseOver.js

@@ -48,6 +48,5 @@ var useDebounce = function useDebounce(fn, wait) {
     useCallback(debounce(fn, wait), [])
   );
 };
-var useRowIsMouseOver$1 = useRowIsMouseOver;
 
-export { useRowIsMouseOver$1 as default };
+export { useRowIsMouseOver as default };

package/es/components/Datagrid/useRowRenderer.js

@@ -5,18 +5,60 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import { toConsumableArray as _toConsumableArray } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import DatagridRow from './Datagrid/DatagridRow.js';
 
 var useRowRenderer = function useRowRenderer(hooks) {
   var useInstance = function useInstance(instance) {
-    var rows = instance.rows;
+    var _newRows;
+    var rows = instance.rows,
+      state = instance.state;
+    var newRows = null;
+    if (state !== null && state !== void 0 && state.dynamicRowSkeleton) {
+      var _state$dynamicRowSkel;
+      var depthIndexArray = state === null || state === void 0 || (_state$dynamicRowSkel = state.dynamicRowSkeleton) === null || _state$dynamicRowSkel === void 0 ? void 0 : _state$dynamicRowSkel.id.split('').filter(function (r) {
+        return r !== '.';
+      });
+      if (depthIndexArray.length > 1) {
+        var subRows;
+        var finalRow;
+        // This will find the subRow that requested to find dynamic rows
+        // and will apply the skeleton row after that row
+        depthIndexArray.map(function (depthIndex, index) {
+          if (index === 0) {
+            subRows = rows[depthIndex].subRows;
+            return;
+          }
+          if (depthIndexArray.length - 1 === index) {
+            finalRow = subRows.find(function (r) {
+              return r.index === parseInt(depthIndex);
+            });
+            subRows.splice(finalRow.index + 1, 0, state === null || state === void 0 ? void 0 : state.dynamicRowSkeleton); // + 1 because we want to add the skeleton row after the row initiating the dynamic request
+            return;
+          }
+          var foundRow = subRows.find(function (r) {
+            return r.index === parseInt(depthIndex);
+          });
+          subRows = foundRow.subRows;
+        });
+      }
+      var rootRowIndexWithDynamicRow = rows.findIndex(function (r) {
+        var _state$dynamicRowSkel2;
+        return r.id === (state === null || state === void 0 || (_state$dynamicRowSkel2 = state.dynamicRowSkeleton) === null || _state$dynamicRowSkel2 === void 0 ? void 0 : _state$dynamicRowSkel2.id);
+      });
+      if (rootRowIndexWithDynamicRow > -1) {
+        newRows = [].concat(_toConsumableArray(rows.slice(0, rootRowIndexWithDynamicRow + 1)), [// + 1 because we want to add the skeleton row after the row initiating the dynamic request
+        state === null || state === void 0 ? void 0 : state.dynamicRowSkeleton], _toConsumableArray(rows.slice(rootRowIndexWithDynamicRow + 1)));
+      }
+    }
+    newRows = (_newRows = newRows) !== null && _newRows !== void 0 ? _newRows : rows;
     var addRowRenderer = function addRowRenderer(row) {
       return Object.assign(row, {
         RowRenderer: DatagridRow,
         subRows: (row.subRows || []).map(addRowRenderer)
       });
     };
-    var rowsWithRenderer = rows.map(addRowRenderer);
+    var rowsWithRenderer = newRows.map(addRowRenderer);
     Object.assign(instance, {
       rows: rowsWithRenderer
     });

package/es/components/Datagrid/useSelectAllToggle.js

@@ -89,6 +89,5 @@ var Header = function Header(gridState) {
   };
   return /*#__PURE__*/React__default.createElement(SelectAllWithToggle, props);
 };
-var useSelectAllToggle$1 = useSelectAllToggle;
 
-export { useSelectAllToggle$1 as default };
+export { useSelectAllToggle as default };

package/es/components/Datagrid/useSelectRows.js

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { toConsumableArray as _toConsumableArray, slicedToArray as _slicedToArray, objectWithoutProperties as _objectWithoutProperties, extends as _extends, defineProperty as _defineProperty, objectSpread2 as _objectSpread2 } from '../../_virtual/_rollupPluginBabelHelpers.js';
+import { toConsumableArray as _toConsumableArray, slicedToArray as _slicedToArray, objectWithoutProperties as _objectWithoutProperties, extends as _extends, defineProperty as _defineProperty, objectSpread2 as _objectSpread2, asyncToGenerator as _asyncToGenerator, regeneratorRuntime as _regeneratorRuntime } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default, { useState, useLayoutEffect } from 'react';
 import cx from 'classnames';
 import { TableSelectRow } from '@carbon/react';
@@ -81,11 +81,12 @@ var SelectRow = function SelectRow(datagridState) {
     withStickyColumn = datagridState.withStickyColumn,
     dispatch = datagridState.dispatch,
     getRowId = datagridState.getRowId;
-  var _useState = useState(typeof window !== 'undefined' ? window.innerWidth : ''),
+  var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     windowSize = _useState2[0],
     setWindowSize = _useState2[1];
   useLayoutEffect(function () {
+    setWindowSize(window.innerWidth);
     function updateSize() {
       setWindowSize(window.innerWidth);
     }
@@ -94,24 +95,45 @@ var SelectRow = function SelectRow(datagridState) {
       return window.removeEventListener('resize', updateSize);
     };
   }, []);
-  var onSelectHandler = function onSelectHandler(event) {
-    event.stopPropagation(); // avoid triggering onRowClick
-    if (radio) {
-      toggleAllRowsSelected(false);
-      if (onRadioSelect) {
-        onRadioSelect(row);
-      }
-    }
-    onChange(event);
-    onRowSelect === null || onRowSelect === void 0 || onRowSelect(row, event);
-    handleToggleRowSelected({
-      dispatch: dispatch,
-      rowData: row,
-      isChecked: event.target.checked,
-      getRowId: getRowId,
-      selectAll: null
-    });
-  };
+  var onSelectHandler = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(event) {
+      var _document$activeEleme, _document, _document2;
+      var activeElement;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            event.stopPropagation(); // avoid triggering onRowClick
+            if (radio) {
+              toggleAllRowsSelected(false);
+              if (onRadioSelect) {
+                onRadioSelect(row);
+              }
+            }
+            onChange(event);
+            onRowSelect === null || onRowSelect === void 0 || onRowSelect(row, event);
+            handleToggleRowSelected({
+              dispatch: dispatch,
+              rowData: row,
+              isChecked: event.target.checked,
+              getRowId: getRowId,
+              selectAll: null
+            });
+            // focus the radio / checkbox if lost
+            activeElement = (_document$activeEleme = (_document = document) === null || _document === void 0 || (_document = _document.activeElement) === null || _document === void 0 ? void 0 : _document.id) !== null && _document$activeEleme !== void 0 ? _document$activeEleme : '';
+            _context.next = 8;
+            return undefined;
+          case 8:
+            (_document2 = document) === null || _document2 === void 0 || (_document2 = _document2.getElementById(activeElement)) === null || _document2 === void 0 || _document2.focus();
+          case 9:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function onSelectHandler(_x) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
   var selectDisabled = isFetching || row.getRowProps().disabled;
   var _row$getToggleRowSele2 = row.getToggleRowSelectedProps(),
     onChange = _row$getToggleRowSele2.onChange,
@@ -134,6 +156,5 @@ var SelectRow = function SelectRow(datagridState) {
     disabled: selectDisabled
   }));
 };
-var useSelectRows$1 = useSelectRows;
 
-export { useSelectRows$1 as default };
+export { useSelectRows as default };

package/es/components/Datagrid/useSortableColumns.d.ts

@@ -5,9 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { Hooks } from 'react-table';
-export declare const getNewSortOrder: (sortOrder?: boolean | string) => {
-    newSortDesc: boolean;
-    newOrder: string;
-};
+interface Order {
+    newOrder: 'ASC' | 'DESC' | 'NONE';
+    newSortDesc: undefined | boolean;
+}
+export declare const getNewSortOrder: (currentOrder?: boolean | string) => Order;
 declare const useSortableColumns: (hooks: Hooks) => void;
 export default useSortableColumns;