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

package/lib/components/Datagrid/useInitialColumnSort.js

@@ -7,8 +7,6 @@
 
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var _rollupPluginBabelHelpers = require('../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
 var useSortableColumns = require('./useSortableColumns.js');
@@ -33,6 +31,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 = useSortableColumns.getNewSortOrder(order),
         newSortDesc = _getNewSortOrder.newSortDesc,
         newOrder = _getNewSortOrder.newOrder;

package/lib/components/Datagrid/useInlineEdit.js

@@ -9,27 +9,24 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _rollupPluginBabelHelpers = require('../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
 var settings = require('../../settings.js');
 var cx = require('classnames');
 var InlineEditCell = require('./Datagrid/addons/InlineEdit/InlineEditCell/InlineEditCell.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
-
 var blockClass = "".concat(settings.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 = _rollupPluginBabelHelpers.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["default"].createElement(InlineEditCell.InlineEditCell, {
+      return /*#__PURE__*/React.createElement(InlineEditCell.InlineEditCell, {
         config: columnInlineEditConfig,
         tabIndex: -1,
         value: cell.value,
@@ -41,13 +38,21 @@ var useInlineEdit = function useInlineEdit(hooks) {
     };
     if (cell.column.id === 'spacer') {
       return [props, {
-        className: cx__default["default"]("".concat(blockClass, "__cell"), "".concat(blockClass, "__cell--spacer"))
+        className: cx("".concat(blockClass, "__cell"), "".concat(blockClass, "__cell--spacer"))
       }];
     }
     return [props, {
-      className: cx__default["default"]("".concat(blockClass, "__cell"), "".concat(blockClass, "__cell-inline-edit")),
+      className: cx("".concat(blockClass, "__cell"), "".concat(blockClass, "__cell-inline-edit")),
       role: 'gridcell',
-      children: /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, inlineEditType === 'text' && renderInlineEditComponent(inlineEditType), inlineEditType === 'number' && renderInlineEditComponent(inlineEditType), inlineEditType === 'selection' && renderInlineEditComponent(inlineEditType), inlineEditType === 'date' && renderInlineEditComponent(inlineEditType), !inlineEditType && /*#__PURE__*/React__default["default"].createElement(InlineEditCell.InlineEditCell, {
+      children: /*#__PURE__*/React.createElement(React.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.createElement(InlineEditCell.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.createElement(InlineEditCell.InlineEditCell, {
         config: columnInlineEditConfig,
         tabIndex: -1,
         value: cell.value,
@@ -66,6 +71,5 @@ var useInlineEdit = function useInlineEdit(hooks) {
     });
   });
 };
-var useInlineEdit$1 = useInlineEdit;
 
-exports["default"] = useInlineEdit$1;
+exports.default = useInlineEdit;

package/lib/components/Datagrid/useNestedRowExpander.js

@@ -15,11 +15,7 @@ var icons = require('@carbon/react/icons');
 var cx = require('classnames');
 var settings = require('../../settings.js');
 var useFocusRowExpander = require('./useFocusRowExpander.js');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
+var stateReducer = require('./Datagrid/addons/stateReducer.js');
 
 var blockClass = "".concat(settings.pkg.prefix, "--datagrid");
 var useNestedRowExpander = function useNestedRowExpander(hooks) {
@@ -34,34 +30,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 = _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.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 = _rollupPluginBabelHelpers.asyncToGenerator( /*#__PURE__*/_rollupPluginBabelHelpers.regeneratorRuntime().mark(function _callee(event) {
+              return _rollupPluginBabelHelpers.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;
+                    stateReducer.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:
+                    stateReducer.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["default"].createElement("button", _rollupPluginBabelHelpers["extends"]({
+        return row.canExpand || getAsyncSubRows ? /*#__PURE__*/React.createElement("button", _rollupPluginBabelHelpers.extends({
           type: "button",
           "aria-label": expanderTitle,
-          className: cx__default["default"]("".concat(blockClass, "__row-expander"), "".concat(settings.carbon.prefix, "--btn"), "".concat(settings.carbon.prefix, "--btn--ghost"))
-        }, expanderButtonProps, {
-          title: expanderTitle
-        }), /*#__PURE__*/React__default["default"].createElement(icons.ChevronRight, {
-          className: cx__default["default"]("".concat(blockClass, "__expander-icon"), _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__expander-icon--not-open"), !row.isExpanded), "".concat(blockClass, "__expander-icon--open"), row.isExpanded))
-        }));
+          className: cx("".concat(blockClass, "__row-expander"), "".concat(settings.carbon.prefix, "--btn"), "".concat(settings.carbon.prefix, "--btn--ghost"))
+        }, expanderButtonProps), /*#__PURE__*/React.createElement(icons.ChevronRight, {
+          className: cx("".concat(blockClass, "__expander-icon"), _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__expander-icon--not-open"), !row.isExpanded), "".concat(blockClass, "__expander-icon--open"), row.isExpanded))
+        })) : null;
       },
       width: 48,
       disableResizing: true,
@@ -75,4 +121,4 @@ var useNestedRowExpander = function useNestedRowExpander(hooks) {
 };
 var useNestedRowExpander$1 = useNestedRowExpander;
 
-exports["default"] = useNestedRowExpander$1;
+exports.default = useNestedRowExpander$1;

package/lib/components/Datagrid/useNestedRows.js

@@ -15,41 +15,56 @@ var settings = require('../../settings.js');
 var useNestedRowExpander = require('./useNestedRowExpander.js');
 var React = require('react');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
-
 var blockClass = "".concat(settings.pkg.prefix, "--datagrid");
 var useNestedRows = function useNestedRows(hooks) {
-  useNestedRowExpander["default"](hooks);
+  useNestedRowExpander.default(hooks);
   var useInstance = function useInstance(instance) {
+    React.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
     React.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__default["default"](_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__carbon-nested-row"), row.depth > 0), "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded))
+        className: cx(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.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")
@@ -59,9 +74,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;
@@ -83,6 +98,5 @@ var useNestedRows = function useNestedRows(hooks) {
   };
   hooks.useInstance.push(useInstance);
 };
-var useNestedRows$1 = useNestedRows;
 
-exports["default"] = useNestedRows$1;
+exports.default = useNestedRows;

package/lib/components/Datagrid/useOnRowClick.js

@@ -65,6 +65,5 @@ var useOnRowClick = function useOnRowClick(hooks) {
   };
   hooks.useInstance.push(useInstance);
 };
-var useOnRowClick$1 = useOnRowClick;
 
-exports["default"] = useOnRowClick$1;
+exports.default = useOnRowClick;

package/lib/components/Datagrid/useParentDimensions.js

@@ -61,4 +61,4 @@ var useParentDimensions = function useParentDimensions(hooks) {
 };
 var useParentDimensions$1 = useParentDimensions;
 
-exports["default"] = useParentDimensions$1;
+exports.default = useParentDimensions$1;

package/lib/components/Datagrid/useResizeTable.js

@@ -38,4 +38,4 @@ var useResizeTable = function useResizeTable(hooks) {
 };
 var useResizeTable$1 = useResizeTable;
 
-exports["default"] = useResizeTable$1;
+exports.default = useResizeTable$1;

package/lib/components/Datagrid/useRowExpander.js

@@ -16,11 +16,6 @@ var settings = require('../../settings.js');
 var cx = require('classnames');
 var useFocusRowExpander = require('./useFocusRowExpander.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
-
 var blockClass = "".concat(settings.pkg.prefix, "--datagrid");
 var useRowExpander = function useRowExpander(hooks) {
   var tempState = React.useRef();
@@ -47,23 +42,20 @@ 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["default"].createElement("button", _rollupPluginBabelHelpers["extends"]({
+        return row.canExpand && /*#__PURE__*/React.createElement("button", _rollupPluginBabelHelpers.extends({
           type: "button",
           "aria-label": expanderTitle,
-          className: cx__default["default"]("".concat(blockClass, "__row-expander"), "".concat(settings.carbon.prefix, "--btn"), "".concat(settings.carbon.prefix, "--btn--ghost"))
-        }, expanderButtonProps, {
-          title: expanderTitle
-        }), row.isExpanded ? /*#__PURE__*/React__default["default"].createElement(icons.ChevronUp, {
+          className: cx("".concat(blockClass, "__row-expander"), "".concat(settings.carbon.prefix, "--btn"), "".concat(settings.carbon.prefix, "--btn--ghost"))
+        }, expanderButtonProps), row.isExpanded ? /*#__PURE__*/React.createElement(icons.ChevronUp, {
           className: "".concat(blockClass, "__row-expander--icon")
-        }) : /*#__PURE__*/React__default["default"].createElement(icons.ChevronDown, {
+        }) : /*#__PURE__*/React.createElement(icons.ChevronDown, {
           className: "".concat(blockClass, "__row-expander--icon")
         }));
       },
@@ -79,4 +71,4 @@ var useRowExpander = function useRowExpander(hooks) {
 };
 var useRowExpander$1 = useRowExpander;
 
-exports["default"] = useRowExpander$1;
+exports.default = useRowExpander$1;

package/lib/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/lib/components/Datagrid/useRowIsMouseOver.js

@@ -13,10 +13,6 @@ var _rollupPluginBabelHelpers = require('../../_virtual/_rollupPluginBabelHelper
 var React = require('react');
 var debounce = require('lodash/debounce');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var debounce__default = /*#__PURE__*/_interopDefaultLegacy(debounce);
-
 var useRowIsMouseOver = function useRowIsMouseOver(hooks) {
   var useInstance = function useInstance(instance) {
     var _useState = React.useState(),
@@ -53,9 +49,8 @@ var useRowIsMouseOver = function useRowIsMouseOver(hooks) {
 var useDebounce = function useDebounce(fn, wait) {
   return (
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    React.useCallback(debounce__default["default"](fn, wait), [])
+    React.useCallback(debounce(fn, wait), [])
   );
 };
-var useRowIsMouseOver$1 = useRowIsMouseOver;
 
-exports["default"] = useRowIsMouseOver$1;
+exports.default = useRowIsMouseOver;

package/lib/components/Datagrid/useRowRenderer.js

@@ -9,18 +9,60 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _rollupPluginBabelHelpers = require('../../_virtual/_rollupPluginBabelHelpers.js');
 var DatagridRow = require('./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(_rollupPluginBabelHelpers.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], _rollupPluginBabelHelpers.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["default"],
+        RowRenderer: DatagridRow.default,
         subRows: (row.subRows || []).map(addRowRenderer)
       });
     };
-    var rowsWithRenderer = rows.map(addRowRenderer);
+    var rowsWithRenderer = newRows.map(addRowRenderer);
     Object.assign(instance, {
       rows: rowsWithRenderer
     });
@@ -29,4 +71,4 @@ var useRowRenderer = function useRowRenderer(hooks) {
 };
 var useRowRenderer$1 = useRowRenderer;
 
-exports["default"] = useRowRenderer$1;
+exports.default = useRowRenderer$1;

package/lib/components/Datagrid/useRowSize.js

@@ -40,7 +40,7 @@ var useRowSize = function useRowSize(hooks) {
         },
         tableId: tableId
       }),
-      RowSizeDropdown: RowSizeDropdown["default"]
+      RowSizeDropdown: RowSizeDropdown.default
     });
   });
   var getTableProps = function getTableProps(props, _ref2) {
@@ -57,4 +57,4 @@ var useRowSize = function useRowSize(hooks) {
 };
 var useRowSize$1 = useRowSize;
 
-exports["default"] = useRowSize$1;
+exports.default = useRowSize$1;

package/lib/components/Datagrid/useSelectAllToggle.js

@@ -17,11 +17,6 @@ var DatagridSelectAllWithToggle = require('./Datagrid/DatagridSelectAllWithToggl
 var settings = require('../../settings.js');
 var useIsomorphicEffect = require('../../global/js/hooks/useIsomorphicEffect.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
-
 var blockClass = "".concat(settings.pkg.prefix, "--datagrid__select-all");
 var useSelectAllToggle = function useSelectAllToggle(hooks) {
   useSelectAllWithToggleComponent(hooks);
@@ -71,7 +66,7 @@ var useAddClassNameToSelectRow = function useAddClassNameToSelectRow(hooks) {
     var isFirstColumnStickyLeft = ((_columns$ = columns[0]) === null || _columns$ === void 0 ? void 0 : _columns$.sticky) === 'left' && withStickyColumn;
     if (column.id === commonColumnIds.selectionColumnId && DatagridPagination) {
       return [props, {
-        className: cx__default["default"]("".concat(blockClass, "-toggle-on"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "-sticky-left"), isFirstColumnStickyLeft && windowSize > 671))
+        className: cx("".concat(blockClass, "-toggle-on"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "-sticky-left"), isFirstColumnStickyLeft && windowSize > 671))
       }];
     }
     return [props];
@@ -96,8 +91,7 @@ var Header = function Header(gridState) {
     withStickyColumn: withStickyColumn,
     columns: columns
   };
-  return /*#__PURE__*/React__default["default"].createElement(DatagridSelectAllWithToggle["default"], props);
+  return /*#__PURE__*/React.createElement(DatagridSelectAllWithToggle.default, props);
 };
-var useSelectAllToggle$1 = useSelectAllToggle;
 
-exports["default"] = useSelectAllToggle$1;
+exports.default = useSelectAllToggle;