@carbon/ibm-products 2.12.0 → 2.12.1

package/es/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditCell/InlineEditCell.js

@@ -33,14 +33,12 @@ export var InlineEditCell = function InlineEditCell(_ref) {
     value = _ref.value,
     _ref$nonEditCell = _ref.nonEditCell,
     nonEditCell = _ref$nonEditCell === void 0 ? false : _ref$nonEditCell,
-    totalInlineEditColumns = _ref.totalInlineEditColumns,
     type = _ref.type;
   var columnId = cell.column.id;
   var columnIndex = instance.columns.findIndex(function (col) {
     return col.id === columnId;
   });
   var cellId = "column-".concat(columnIndex, "-row-").concat(cell.row.index);
-  var totalColumns = instance.columns.length;
   var _useContext = useContext(InlineEditContext),
     state = _useContext.state,
     dispatch = _useContext.dispatch;
@@ -450,8 +448,6 @@ export var InlineEditCell = function InlineEditCell(_ref) {
       tabIndex: tabIndex,
       nonEditCell: nonEditCell,
       columnConfig: cell.column,
-      totalInlineEditColumns: totalInlineEditColumns,
-      totalColumns: totalColumns,
       type: type
     }), !nonEditCell && inEditMode && cellId === activeCellId && /*#__PURE__*/React.createElement(React.Fragment, null, type === 'text' && renderTextInput(), type === 'number' && renderNumberInput(), type === 'selection' && renderSelectCell(), type === 'date' && renderDateCell()))
   );
@@ -469,7 +465,6 @@ InlineEditCell.propTypes = {
   nonEditCell: PropTypes.bool,
   placeholder: PropTypes.string,
   tabIndex: PropTypes.number,
-  totalInlineEditColumns: PropTypes.number,
   type: PropTypes.oneOf(['text', 'number', 'selection', 'date']),
   value: PropTypes.oneOfType([PropTypes.string, PropTypes.node, PropTypes.object])
 };

package/es/components/Datagrid/Datagrid.docs-page.js

@@ -116,7 +116,7 @@ export var DocsPage = function DocsPage() {
       title: 'Sortable columns',
       description: "To add sortable columns to your Datagrid, simply add the `useSortableColumns` hook. This will allow each column header to be clickable and sort each column in either ascending or descending order.\n- Include `useSortableColumns` hook\n        ",
       source: {
-        code: "\nconst [data] = useState(makeData(10));\nconst columns = React.useMemo(() => getColumns(data), []);\nconst datagridState = useDatagrid(\n  {\n    columns,\n    data,\n  },\n  useSortableColumns\n);\n\nreturn <Datagrid datagridState={datagridState} />;\n          "
+        code: "\nconst [data] = useState(makeData(10));\nconst columns = React.useMemo(() => getColumns(data), []);\nconst datagridState = useDatagrid(\n  {\n    columns,\n    data,\n    ascendingSortableLabelText: 'none',\n    descendingSortableLabelText: 'ascending',\n    defaultSortableLabelText: 'descending',\n  },\n  useSortableColumns\n);\n\nreturn <Datagrid datagridState={datagridState} />;\n          "
       }
     }, {
       title: 'Sticky column',

package/es/components/Datagrid/useDisableSelectRows.js

@@ -13,7 +13,7 @@ var useDisableSelectRows = function useDisableSelectRows(hooks) {
     var row = _ref.row,
       instance = _ref.instance;
     return [props, {
-      selectDisabled: instance.shouldDisableSelectRow && instance.shouldDisableSelectRow(row)
+      disabled: instance.shouldDisableSelectRow && instance.shouldDisableSelectRow(row)
     }];
   };
   hooks.getRowProps.push(getRowProps);

package/es/components/Datagrid/useInlineEdit.js

@@ -21,14 +21,11 @@ var useInlineEdit = function useInlineEdit(hooks, usingEditableCell) {
     }
   }, [usingEditableCell]);
   var addInlineEdit = function addInlineEdit(props, _ref) {
-    var _cell$column, _instance$columns$fil;
+    var _cell$column;
     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 totalInlineEditColumns = (_instance$columns$fil = instance.columns.filter(function (item) {
-      return item.inlineEdit;
-    })) === null || _instance$columns$fil === void 0 ? void 0 : _instance$columns$fil.length;
     var renderInlineEditComponent = function renderInlineEditComponent(type) {
       return /*#__PURE__*/React.createElement(InlineEditCell, {
         config: columnInlineEditConfig,
@@ -36,7 +33,6 @@ var useInlineEdit = function useInlineEdit(hooks, usingEditableCell) {
         value: cell.value,
         cell: cell,
         instance: instance,
-        totalInlineEditColumns: totalInlineEditColumns,
         type: type
       });
     };
@@ -56,7 +52,6 @@ var useInlineEdit = function useInlineEdit(hooks, usingEditableCell) {
         instance: instance,
         disabled: true,
         nonEditCell: true,
-        totalInlineEditColumns: totalInlineEditColumns,
         type: "text"
       }))
     }];

package/es/components/Datagrid/useSelectRows.js

@@ -87,7 +87,7 @@ var SelectRow = function SelectRow(datagridState) {
       return window.removeEventListener('resize', updateSize);
     };
   }, []);
-  var selectDisabled = isFetching || row.getRowProps().selectDisabled;
+  var selectDisabled = isFetching || row.getRowProps().disabled;
   var _row$getToggleRowSele = row.getToggleRowSelectedProps(),
     onChange = _row$getToggleRowSele.onChange,
     selectProps = _objectWithoutProperties(_row$getToggleRowSele, _excluded);

package/es/components/Datagrid/useSortableColumns.js

@@ -1,6 +1,5 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _extends from "@babel/runtime/helpers/extends";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
@@ -15,6 +14,7 @@ import cx from 'classnames';
 import { pkg, carbon } from '../../settings';
 import { Button } from '@carbon/react';
 import { ArrowUp, ArrowDown, ArrowsVertical } from '@carbon/react/icons';
+import { SelectAll } from './Datagrid/DatagridSelectAll';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var ordering = {
   ASC: 'ASC',
@@ -32,13 +32,13 @@ var getAriaSortValue = function getAriaSortValue(col, _ref) {
     isSorted = _ref2.isSorted,
     isSortedDesc = _ref2.isSortedDesc;
   if (!isSorted) {
-    return defaultSortableLabelText || 'none';
+    return defaultSortableLabelText;
   }
   if (isSorted && !isSortedDesc) {
-    return ascendingSortableLabelText || 'ascending';
+    return ascendingSortableLabelText;
   }
   if (isSorted && isSortedDesc) {
-    return descendingSortableLabelText || 'descending';
+    return descendingSortableLabelText;
   }
 };
 var getAriaPressedValue = function getAriaPressedValue(col) {
@@ -73,37 +73,26 @@ var useSortableColumns = function useSortableColumns(hooks) {
     };
     var sortableColumns = visibleColumns.map(function (column) {
       var icon = function icon(col, props) {
+        var iconProps = _objectSpread(_objectSpread({
+          size: 16
+        }, props), {}, {
+          className: "".concat(blockClass, "__sortable-icon ").concat(carbon.prefix, "--btn__icon")
+        });
         if (col !== null && col !== void 0 && col.isSorted) {
           switch (col.isSortedDesc) {
             case false:
-              return /*#__PURE__*/React.createElement(ArrowUp, _extends({
-                size: 16
-              }, props, {
-                className: "".concat(blockClass, "__sortable-icon ").concat(carbon.prefix, "--btn__icon")
-              }));
+              return /*#__PURE__*/React.createElement(ArrowUp, iconProps);
             case true:
-              return /*#__PURE__*/React.createElement(ArrowDown, _extends({
-                size: 16
-              }, props, {
-                className: "".concat(blockClass, "__sortable-icon ").concat(carbon.prefix, "--btn__icon")
-              }));
+              return /*#__PURE__*/React.createElement(ArrowDown, iconProps);
             default:
-              return /*#__PURE__*/React.createElement(ArrowsVertical, _extends({
-                size: 16
-              }, props, {
-                className: "".concat(blockClass, "__sortable-icon ").concat(carbon.prefix, "--btn__icon")
-              }));
+              return /*#__PURE__*/React.createElement(ArrowsVertical, iconProps);
           }
         }
-        return /*#__PURE__*/React.createElement(ArrowsVertical, _extends({
-          size: 16
-        }, props, {
-          className: "".concat(blockClass, "__sortable-icon ").concat(carbon.prefix, "--btn__icon")
-        }));
+        return /*#__PURE__*/React.createElement(ArrowsVertical, iconProps);
       };
       var Header = function Header(headerProp) {
         var _cx;
-        return column.disableSortBy === true ? column.Header : /*#__PURE__*/React.createElement(Button, {
+        return column.disableSortBy === true || column.id === 'datagridSelection' ? column.disableSortBy ? column.Header : /*#__PURE__*/React.createElement(SelectAll, instance) : /*#__PURE__*/React.createElement(Button, {
           "aria-sort": getAriaSortValue(headerProp === null || headerProp === void 0 ? void 0 : headerProp.column, {
             ascendingSortableLabelText: ascendingSortableLabelText,
             descendingSortableLabelText: descendingSortableLabelText,

package/es/global/js/hooks/useCreateComponentStepChange.js

@@ -101,38 +101,32 @@ export var useCreateComponentStepChange = function useCreateComponentStepChange(
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              if (!(componentName === 'CreateFullPage')) {
-                _context2.next = 2;
-                break;
-              }
-              return _context2.abrupt("return");
-            case 2:
-              setLoadingPrevious(true);
+              setLoadingPrevious === null || setLoadingPrevious === void 0 || setLoadingPrevious(true);
               if (!(typeof onPrevious === 'function')) {
-                _context2.next = 15;
+                _context2.next = 13;
                 break;
               }
-              _context2.prev = 4;
-              _context2.next = 7;
+              _context2.prev = 2;
+              _context2.next = 5;
               return onPrevious();
-            case 7:
+            case 5:
               moveToPreviousStep();
-              _context2.next = 13;
+              _context2.next = 11;
               break;
-            case 10:
-              _context2.prev = 10;
-              _context2.t0 = _context2["catch"](4);
+            case 8:
+              _context2.prev = 8;
+              _context2.t0 = _context2["catch"](2);
               console.warn("".concat(componentName, " onBack error: ").concat(_context2.t0));
-            case 13:
-              _context2.next = 16;
+            case 11:
+              _context2.next = 14;
               break;
-            case 15:
+            case 13:
               moveToPreviousStep();
-            case 16:
+            case 14:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, null, [[4, 10]]);
+        }, _callee2, null, [[2, 8]]);
       }))).apply(this, arguments);
     };
     var handleNext = function handleNext() {

package/es/global/js/utils/getNodeTextContent.js

@@ -40,6 +40,10 @@ export var getNodeTextContent = function getNodeTextContent(node) {
         // Ignore any other JavaScript 'object' types.
         return '';
       }
+    case 'function':
+      {
+        return getNodeTextContent(node());
+      }
     default:
       // Ignore all other JavaScript types.
       return '';

package/lib/components/Datagrid/Datagrid/DatagridEmptyBody.js

@@ -38,9 +38,7 @@ var DatagridEmptyBody = function DatagridEmptyBody(datagridState) {
     link: emptyStateLink
   };
   var validEmptyStates = ['error', 'noData', 'notFound'];
-  return /*#__PURE__*/_react.default.createElement(_react2.TableBody, (0, _extends2.default)({}, getTableBodyProps({
-    role: false
-  }), {
+  return /*#__PURE__*/_react.default.createElement(_react2.TableBody, (0, _extends2.default)({}, getTableBodyProps(), {
     className: "".concat(blockClass, "__empty-state-body")
   }), /*#__PURE__*/_react.default.createElement(_react2.TableRow, null, /*#__PURE__*/_react.default.createElement(_react2.TableCell, {
     colSpan: headers.length,

package/lib/components/Datagrid/Datagrid/DatagridHeaderRow.js

@@ -15,8 +15,8 @@ var _react2 = require("@carbon/react");
 var _layout = require("@carbon/layout");
 var _commonColumnIds = require("../common-column-ids");
 var _settings = require("../../../settings");
-var _getColTitle = _interopRequireDefault(require("../utils/getColTitle"));
 var _stateReducer = require("./addons/stateReducer");
+var _getNodeTextContent = require("../../../global/js/utils/getNodeTextContent");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /**
@@ -31,7 +31,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var getAccessibilityProps = function getAccessibilityProps(header) {
   var props = {};
-  var title = (0, _getColTitle.default)(header);
+  var title = (0, _getNodeTextContent.getNodeTextContent)(header.Header);
   if (title) {
     props.title = title;
   } else {
@@ -101,9 +101,7 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [datagridState.state.isResizing]);
-  return /*#__PURE__*/_react.default.createElement(_react2.TableRow, (0, _extends2.default)({}, headerGroup.getHeaderGroupProps({
-    role: false
-  }), {
+  return /*#__PURE__*/_react.default.createElement(_react2.TableRow, (0, _extends2.default)({}, headerGroup.getHeaderGroupProps(), {
     className: (0, _classnames.default)("".concat(blockClass, "__head"), headerGroup.getHeaderGroupProps().className),
     ref: headRef
   }), datagridState.headers.filter(function (_ref2) {

package/lib/components/Datagrid/Datagrid/DatagridRefBody.js

@@ -28,9 +28,7 @@ var DatagridRefBody = function DatagridRefBody(datagridState) {
   var getTableBodyProps = datagridState.getTableBodyProps,
     rows = datagridState.rows,
     prepareRow = datagridState.prepareRow;
-  return /*#__PURE__*/_react.default.createElement("tbody", (0, _extends2.default)({}, getTableBodyProps({
-    role: false
-  }), {
+  return /*#__PURE__*/_react.default.createElement("tbody", (0, _extends2.default)({}, getTableBodyProps(), {
     className: (0, _classnames.default)("".concat(blockClass, "__simple-body"), getTableBodyProps().className)
   }), rows.map(function (row) {
     prepareRow(row);

package/lib/components/Datagrid/Datagrid/DatagridRow.js

@@ -97,9 +97,7 @@ var DatagridRow = function DatagridRow(datagridState) {
   var rowClassNames = (0, _classnames.default)("".concat(blockClass, "__carbon-row"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expandable"), row.canExpand), (0, _defineProperty2.default)(_cx, "".concat(_settings.carbon.prefix, "--data-table--selected"), row.isSelected), _cx));
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_react2.TableRow, (0, _extends2.default)({
     className: rowClassNames
-  }, row.getRowProps({
-    role: false
-  }), {
+  }, row.getRowProps(), {
     key: row.id,
     onMouseEnter: hoverHandler,
     onMouseLeave: handleMouseLeave,
@@ -108,9 +106,7 @@ var DatagridRow = function DatagridRow(datagridState) {
     onKeyUp: handleOnKeyUp
   }), row.cells.map(function (cell, index) {
     var _cell$column;
-    var cellProps = cell.getCellProps({
-      role: false
-    });
+    var cellProps = cell.getCellProps();
     var children = cellProps.children,
       restProps = (0, _objectWithoutProperties2.default)(cellProps, _excluded);
     var content = children || /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !row.isSkeleton && cell.render('Cell'), row.isSkeleton && /*#__PURE__*/_react.default.createElement(_react2.SkeletonText, null));

package/lib/components/Datagrid/Datagrid/DatagridSimpleBody.js

@@ -24,9 +24,7 @@ var DatagridSimpleBody = function DatagridSimpleBody(datagridState) {
   var getTableBodyProps = datagridState.getTableBodyProps,
     rows = datagridState.rows,
     prepareRow = datagridState.prepareRow;
-  return /*#__PURE__*/_react.default.createElement(_react2.TableBody, (0, _extends2.default)({}, getTableBodyProps({
-    role: false
-  }), {
+  return /*#__PURE__*/_react.default.createElement(_react2.TableBody, (0, _extends2.default)({}, getTableBodyProps(), {
     className: (0, _classnames.default)("".concat(blockClass, "__simple-body"), getTableBodyProps().className)
   }), rows.map(function (row) {
     prepareRow(row);

package/lib/components/Datagrid/Datagrid/DatagridVirtualBody.js

@@ -81,9 +81,7 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
       width: (_gridRef$current = gridRef.current) === null || _gridRef$current === void 0 ? void 0 : _gridRef$current.clientWidth,
       overflow: 'hidden'
     }
-  }, /*#__PURE__*/_react.default.createElement(_DatagridHead.default, datagridState)), /*#__PURE__*/_react.default.createElement(_react2.TableBody, (0, _extends2.default)({}, getTableBodyProps({
-    role: false
-  }), {
+  }, /*#__PURE__*/_react.default.createElement(_DatagridHead.default, datagridState)), /*#__PURE__*/_react.default.createElement(_react2.TableBody, (0, _extends2.default)({}, getTableBodyProps(), {
     onScroll: function onScroll(e) {
       return syncScroll(e);
     }

package/lib/components/Datagrid/Datagrid/addons/CustomizeColumns/DraggableItemsList.js

@@ -13,9 +13,9 @@ var _react2 = require("@carbon/react");
 var _common = require("./common");
 var _DraggableElement = _interopRequireDefault(require("../../DraggableElement"));
 var _settings = require("../../../../../settings");
-var _getColTitle2 = _interopRequireDefault(require("../../../utils/getColTitle"));
 var _core = require("@dnd-kit/core");
 var _sortable = require("@dnd-kit/sortable");
+var _getNodeTextContent = require("../../../../../global/js/utils/getNodeTextContent");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /**
                                                                                                                                                                                                                                                                                                                                                                                                                                                                        * Copyright IBM Corp. 2023, 2023
@@ -38,12 +38,13 @@ var DraggableItemsList = function DraggableItemsList(_ref) {
   var visibleCols = columns
   // hide the columns without Header, e.g the sticky actions, spacer
   .filter(function (colDef) {
-    return !!(0, _getColTitle2.default)(colDef);
+    return (0, _getNodeTextContent.getNodeTextContent)(colDef.Header).trim().length !== 0;
   }).filter(Boolean).filter(function (colDef) {
     return !colDef.isAction;
   }).filter(function (colDef) {
-    var _getColTitle;
-    return filterString.length === 0 || ((_getColTitle = (0, _getColTitle2.default)(colDef)) === null || _getColTitle === void 0 ? void 0 : _getColTitle.toLowerCase().includes(filterString)) && colDef.id !== 'spacer';
+    return colDef.id !== 'spacer';
+  }).filter(function (colDef) {
+    return filterString.length === 0 || (0, _getNodeTextContent.getNodeTextContent)(colDef.Header).toLowerCase().includes(filterString);
   });
   var getUpdatedDragCols = function getUpdatedDragCols() {
     var tempCols = (0, _toConsumableArray2.default)(visibleCols);
@@ -76,7 +77,7 @@ var DraggableItemsList = function DraggableItemsList(_ref) {
     var toVisibleIndex = columns.findIndex(function (col) {
       return matchedColsById(col, over);
     });
-    var colTitle = (0, _getColTitle2.default)(updatedDragCols[fromVisibleIndex]);
+    var colTitle = (0, _getNodeTextContent.getNodeTextContent)(updatedDragCols[fromVisibleIndex].Header);
     setAriaRegionText("".concat(colTitle, " dropped. New position ").concat(toVisibleIndex + 1, " of ").concat(updatedDragCols.length, "."));
     var fromIndex = columns.findIndex(function (col) {
       return matchedColsById(col, active);
@@ -91,7 +92,7 @@ var DraggableItemsList = function DraggableItemsList(_ref) {
     var fromIndex = updatedDragCols.findIndex(function (col) {
       return matchedColsById(col, active);
     });
-    var colTitle = (0, _getColTitle2.default)(updatedDragCols[fromIndex]);
+    var colTitle = (0, _getNodeTextContent.getNodeTextContent)(updatedDragCols[fromIndex].Header);
     setAriaRegionText("".concat(colTitle, " grabbed. Current position ").concat(fromIndex + 1, " of ").concat(updatedDragCols.length, "."));
   };
   var handleDragUpdate = function handleDragUpdate(event) {
@@ -103,7 +104,7 @@ var DraggableItemsList = function DraggableItemsList(_ref) {
     var toIndex = updatedDragCols.findIndex(function (col) {
       return matchedColsById(col, over);
     });
-    var colTitle = (0, _getColTitle2.default)(updatedDragCols[fromIndex]);
+    var colTitle = (0, _getNodeTextContent.getNodeTextContent)(updatedDragCols[fromIndex].Header);
     setAriaRegionText("".concat(colTitle, " grabbed. Original position ").concat(fromIndex + 1, ", new position ").concat(toIndex + 1, " of ").concat(updatedDragCols.length, "."));
   };
   var pointerSensor = (0, _core.useSensor)(_core.PointerSensor, {
@@ -166,7 +167,7 @@ var DraggableItemsList = function DraggableItemsList(_ref) {
     items: updatedDragCols,
     strategy: _sortable.verticalListSortingStrategy
   }, visibleCols.map(function (colDef) {
-    var colHeaderTitle = (0, _getColTitle2.default)(colDef);
+    var colHeaderTitle = (0, _getNodeTextContent.getNodeTextContent)(colDef.Header);
     var searchString = new RegExp('(' + filterString + ')');
     var res = filterString.length ? colHeaderTitle.toLowerCase().split(searchString) : null;
     var firstWord = res !== null ? res[0] === '' ? res[1].charAt(0).toUpperCase() + res[1].substring(1) : res[0].charAt(0).toUpperCase() + res[0].substring(1) : null;

package/lib/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditButton/InlineEditButton.js

@@ -10,12 +10,11 @@ var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _settings = require("../../../../../../settings");
-/*
- * Licensed Materials - Property of IBM
- * 5724-Q36
- * (c) Copyright IBM Corp. 2022
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
+/**
+ * Copyright IBM Corp. 2022, 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
@@ -29,12 +28,9 @@ var InlineEditButton = function InlineEditButton(_ref) {
     nonEditCell = _ref.nonEditCell,
     isActiveCell = _ref.isActiveCell,
     columnConfig = _ref.columnConfig,
-    totalInlineEditColumns = _ref.totalInlineEditColumns,
-    totalColumns = _ref.totalColumns,
     type = _ref.type;
-  var inlineEditColsLessThanHalfOfTotal = totalInlineEditColumns < totalColumns / 2;
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)("".concat(blockClass, "__inline-edit-button"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__inline-edit-button--disabled"), disabled || nonEditCell), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__inline-edit-button--with-label-icon"), LabelIcon), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__inline-edit-button--non-edit"), nonEditCell), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__inline-edit-button--active"), isActiveCell), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__inline-edit-button--edit-less-than-half-of-total-cols"), inlineEditColsLessThanHalfOfTotal), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__inline-edit-button--").concat(type), type === 'date' || type === 'selection'), _cx)),
+    className: (0, _classnames.default)("".concat(blockClass, "__inline-edit-button"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__inline-edit-button--disabled"), disabled || nonEditCell), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__inline-edit-button--with-label-icon"), LabelIcon), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__inline-edit-button--non-edit"), nonEditCell), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__inline-edit-button--active"), isActiveCell), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__inline-edit-button--").concat(type), type === 'date' || type === 'selection'), _cx)),
     tabIndex: isActiveCell ? 0 : -1,
     "data-disabled": disabled || nonEditCell,
     "aria-disabled": disabled || nonEditCell,
@@ -60,8 +56,6 @@ InlineEditButton.propTypes = {
   nonEditCell: _propTypes.default.bool,
   placeholder: _propTypes.default.string,
   renderIcon: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object]),
-  totalColumns: _propTypes.default.number,
-  totalInlineEditColumns: _propTypes.default.number,
   type: _propTypes.default.oneOf(['text', 'number', 'selection', 'date']),
   value: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node])
 };

package/lib/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditCell/InlineEditCell.js

@@ -41,14 +41,12 @@ var InlineEditCell = function InlineEditCell(_ref) {
     value = _ref.value,
     _ref$nonEditCell = _ref.nonEditCell,
     nonEditCell = _ref$nonEditCell === void 0 ? false : _ref$nonEditCell,
-    totalInlineEditColumns = _ref.totalInlineEditColumns,
     type = _ref.type;
   var columnId = cell.column.id;
   var columnIndex = instance.columns.findIndex(function (col) {
     return col.id === columnId;
   });
   var cellId = "column-".concat(columnIndex, "-row-").concat(cell.row.index);
-  var totalColumns = instance.columns.length;
   var _useContext = (0, _react.useContext)(_InlineEditContext.InlineEditContext),
     state = _useContext.state,
     dispatch = _useContext.dispatch;
@@ -458,8 +456,6 @@ var InlineEditCell = function InlineEditCell(_ref) {
       tabIndex: tabIndex,
       nonEditCell: nonEditCell,
       columnConfig: cell.column,
-      totalInlineEditColumns: totalInlineEditColumns,
-      totalColumns: totalColumns,
       type: type
     }), !nonEditCell && inEditMode && cellId === activeCellId && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, type === 'text' && renderTextInput(), type === 'number' && renderNumberInput(), type === 'selection' && renderSelectCell(), type === 'date' && renderDateCell()))
   );
@@ -478,7 +474,6 @@ InlineEditCell.propTypes = {
   nonEditCell: _propTypes.default.bool,
   placeholder: _propTypes.default.string,
   tabIndex: _propTypes.default.number,
-  totalInlineEditColumns: _propTypes.default.number,
   type: _propTypes.default.oneOf(['text', 'number', 'selection', 'date']),
   value: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node, _propTypes.default.object])
 };

package/lib/components/Datagrid/Datagrid.docs-page.js

@@ -126,7 +126,7 @@ var DocsPage = function DocsPage() {
       title: 'Sortable columns',
       description: "To add sortable columns to your Datagrid, simply add the `useSortableColumns` hook. This will allow each column header to be clickable and sort each column in either ascending or descending order.\n- Include `useSortableColumns` hook\n        ",
       source: {
-        code: "\nconst [data] = useState(makeData(10));\nconst columns = React.useMemo(() => getColumns(data), []);\nconst datagridState = useDatagrid(\n  {\n    columns,\n    data,\n  },\n  useSortableColumns\n);\n\nreturn <Datagrid datagridState={datagridState} />;\n          "
+        code: "\nconst [data] = useState(makeData(10));\nconst columns = React.useMemo(() => getColumns(data), []);\nconst datagridState = useDatagrid(\n  {\n    columns,\n    data,\n    ascendingSortableLabelText: 'none',\n    descendingSortableLabelText: 'ascending',\n    defaultSortableLabelText: 'descending',\n  },\n  useSortableColumns\n);\n\nreturn <Datagrid datagridState={datagridState} />;\n          "
       }
     }, {
       title: 'Sticky column',

package/lib/components/Datagrid/useDisableSelectRows.js

@@ -19,7 +19,7 @@ var useDisableSelectRows = function useDisableSelectRows(hooks) {
     var row = _ref.row,
       instance = _ref.instance;
     return [props, {
-      selectDisabled: instance.shouldDisableSelectRow && instance.shouldDisableSelectRow(row)
+      disabled: instance.shouldDisableSelectRow && instance.shouldDisableSelectRow(row)
     }];
   };
   hooks.getRowProps.push(getRowProps);

package/lib/components/Datagrid/useInlineEdit.js

@@ -31,14 +31,11 @@ var useInlineEdit = function useInlineEdit(hooks, usingEditableCell) {
     }
   }, [usingEditableCell]);
   var addInlineEdit = function addInlineEdit(props, _ref) {
-    var _cell$column, _instance$columns$fil;
+    var _cell$column;
     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 totalInlineEditColumns = (_instance$columns$fil = instance.columns.filter(function (item) {
-      return item.inlineEdit;
-    })) === null || _instance$columns$fil === void 0 ? void 0 : _instance$columns$fil.length;
     var renderInlineEditComponent = function renderInlineEditComponent(type) {
       return /*#__PURE__*/_react.default.createElement(_InlineEditCell.InlineEditCell, {
         config: columnInlineEditConfig,
@@ -46,7 +43,6 @@ var useInlineEdit = function useInlineEdit(hooks, usingEditableCell) {
         value: cell.value,
         cell: cell,
         instance: instance,
-        totalInlineEditColumns: totalInlineEditColumns,
         type: type
       });
     };
@@ -66,7 +62,6 @@ var useInlineEdit = function useInlineEdit(hooks, usingEditableCell) {
         instance: instance,
         disabled: true,
         nonEditCell: true,
-        totalInlineEditColumns: totalInlineEditColumns,
         type: "text"
       }))
     }];

package/lib/components/Datagrid/useSelectRows.js

@@ -95,7 +95,7 @@ var SelectRow = function SelectRow(datagridState) {
       return window.removeEventListener('resize', updateSize);
     };
   }, []);
-  var selectDisabled = isFetching || row.getRowProps().selectDisabled;
+  var selectDisabled = isFetching || row.getRowProps().disabled;
   var _row$getToggleRowSele = row.getToggleRowSelectedProps(),
     onChange = _row$getToggleRowSele.onChange,
     selectProps = (0, _objectWithoutProperties2.default)(_row$getToggleRowSele, _excluded);

package/lib/components/Datagrid/useSortableColumns.js

@@ -7,12 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _settings = require("../../settings");
 var _react2 = require("@carbon/react");
 var _icons = require("@carbon/react/icons");
+var _DatagridSelectAll = require("./Datagrid/DatagridSelectAll");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /**
                                                                                                                                                                                                                                                                                                                                                                                                                                                                        * Copyright IBM Corp. 2020, 2023
@@ -37,13 +37,13 @@ var getAriaSortValue = function getAriaSortValue(col, _ref) {
     isSorted = _ref2.isSorted,
     isSortedDesc = _ref2.isSortedDesc;
   if (!isSorted) {
-    return defaultSortableLabelText || 'none';
+    return defaultSortableLabelText;
   }
   if (isSorted && !isSortedDesc) {
-    return ascendingSortableLabelText || 'ascending';
+    return ascendingSortableLabelText;
   }
   if (isSorted && isSortedDesc) {
-    return descendingSortableLabelText || 'descending';
+    return descendingSortableLabelText;
   }
 };
 var getAriaPressedValue = function getAriaPressedValue(col) {
@@ -78,37 +78,26 @@ var useSortableColumns = function useSortableColumns(hooks) {
     };
     var sortableColumns = visibleColumns.map(function (column) {
       var icon = function icon(col, props) {
+        var iconProps = _objectSpread(_objectSpread({
+          size: 16
+        }, props), {}, {
+          className: "".concat(blockClass, "__sortable-icon ").concat(_settings.carbon.prefix, "--btn__icon")
+        });
         if (col !== null && col !== void 0 && col.isSorted) {
           switch (col.isSortedDesc) {
             case false:
-              return /*#__PURE__*/_react.default.createElement(_icons.ArrowUp, (0, _extends2.default)({
-                size: 16
-              }, props, {
-                className: "".concat(blockClass, "__sortable-icon ").concat(_settings.carbon.prefix, "--btn__icon")
-              }));
+              return /*#__PURE__*/_react.default.createElement(_icons.ArrowUp, iconProps);
             case true:
-              return /*#__PURE__*/_react.default.createElement(_icons.ArrowDown, (0, _extends2.default)({
-                size: 16
-              }, props, {
-                className: "".concat(blockClass, "__sortable-icon ").concat(_settings.carbon.prefix, "--btn__icon")
-              }));
+              return /*#__PURE__*/_react.default.createElement(_icons.ArrowDown, iconProps);
             default:
-              return /*#__PURE__*/_react.default.createElement(_icons.ArrowsVertical, (0, _extends2.default)({
-                size: 16
-              }, props, {
-                className: "".concat(blockClass, "__sortable-icon ").concat(_settings.carbon.prefix, "--btn__icon")
-              }));
+              return /*#__PURE__*/_react.default.createElement(_icons.ArrowsVertical, iconProps);
           }
         }
-        return /*#__PURE__*/_react.default.createElement(_icons.ArrowsVertical, (0, _extends2.default)({
-          size: 16
-        }, props, {
-          className: "".concat(blockClass, "__sortable-icon ").concat(_settings.carbon.prefix, "--btn__icon")
-        }));
+        return /*#__PURE__*/_react.default.createElement(_icons.ArrowsVertical, iconProps);
       };
       var Header = function Header(headerProp) {
         var _cx;
-        return column.disableSortBy === true ? column.Header : /*#__PURE__*/_react.default.createElement(_react2.Button, {
+        return column.disableSortBy === true || column.id === 'datagridSelection' ? column.disableSortBy ? column.Header : /*#__PURE__*/_react.default.createElement(_DatagridSelectAll.SelectAll, instance) : /*#__PURE__*/_react.default.createElement(_react2.Button, {
           "aria-sort": getAriaSortValue(headerProp === null || headerProp === void 0 ? void 0 : headerProp.column, {
             ascendingSortableLabelText: ascendingSortableLabelText,
             descendingSortableLabelText: descendingSortableLabelText,