@carbon/ibm-products 1.27.0 → 1.32.0

package/lib/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditContext/returnUpdatedActiveCell.js

@@ -0,0 +1,45 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.returnUpdatedActiveCell = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _settings = require("../../../../../../settings");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+var blockClass = "".concat(_settings.pkg.prefix, "--datagrid"); // This function returns the state back to the reducer after
+// determining the new active cell value
+
+var returnUpdatedActiveCell = function returnUpdatedActiveCell(_ref) {
+  var activeCellCoords = _ref.activeCellCoords,
+      direction = _ref.direction,
+      totalVisibleColumns = _ref.totalVisibleColumns,
+      state = _ref.state,
+      instance = _ref.instance;
+
+  var newActiveCoords = _objectSpread(_objectSpread({}, activeCellCoords), {}, {
+    column: direction === 'right' ? activeCellCoords.column < totalVisibleColumns.length - 1 ? activeCellCoords.column + 1 : activeCellCoords.column : direction === 'left' ? activeCellCoords.column === 0 ? 0 : activeCellCoords.column - 1 : activeCellCoords.column,
+    row: direction === 'up' ? activeCellCoords.row === 0 ? 0 : activeCellCoords.row - 1 : direction === 'down' ? activeCellCoords.row < instance.rows.length - 1 ? activeCellCoords.row + 1 : activeCellCoords.row : activeCellCoords.row
+  });
+
+  var newActiveCellId = "column-".concat(newActiveCoords.column, "-row-").concat(newActiveCoords.row);
+  var newCellIdButton = document.querySelector("#".concat(instance.tableId, " .").concat(blockClass, "__table-with-inline-edit [data-cell-id=\"").concat(newActiveCellId, "\"] .").concat(blockClass, "__inline-edit-button")); // Allows scrollable area to keep focused/active cell id visible
+
+  if (newCellIdButton) {
+    newCellIdButton === null || newCellIdButton === void 0 ? void 0 : newCellIdButton.focus();
+  }
+
+  return _objectSpread(_objectSpread({}, state), {}, {
+    activeCellId: newActiveCellId
+  });
+};
+
+exports.returnUpdatedActiveCell = returnUpdatedActiveCell;

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

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.handleGridFocus = void 0;
+
+/**
+ * Copyright IBM Corp. 2022, 2022
+ *
+ * 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 handleGridFocus = function handleGridFocus(state, dispatch) {
+  var gridActive = state.gridActive,
+      previousActiveCellId = state.previousActiveCellId;
+
+  if (!gridActive) {
+    // Initialize grid active state
+    dispatch({
+      type: 'ADD_GRID_ACTIVE_FOCUS',
+      payload: previousActiveCellId || 'column-0-row-0' // If there is a previous active cell id that is found use that, otherwise use the first cell in the grid area
+
+    });
+  }
+};
+
+exports.handleGridFocus = handleGridFocus;

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

@@ -0,0 +1,272 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.handleGridKeyPress = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _settings = require("../../../../../settings");
+
+var _handleMultipleKeys = require("./handleMultipleKeys");
+
+var _getCellIdAsObject = require("./InlineEditContext/getCellIdAsObject");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
+
+var handleGridKeyPress = function handleGridKeyPress(_ref) {
+  var event = _ref.event,
+      dispatch = _ref.dispatch,
+      state = _ref.state,
+      instance = _ref.instance,
+      keysPressedList = _ref.keysPressedList,
+      usingMac = _ref.usingMac;
+  var key = event.key;
+  var gridActive = state.gridActive,
+      activeCellId = state.activeCellId,
+      editId = state.editId;
+  var focusedCell = document.querySelector("#".concat(instance.tableId, " .").concat(blockClass, "__table-with-inline-edit [data-cell-id=\"").concat(activeCellId, "\"]")); // If we reach this it means that tab was pressed while in
+  // edit mode which should not remove the focus from the grid
+
+  if (activeCellId === editId && key === 'Tab') {
+    // Attempting to exit date picker
+    if (focusedCell.getAttribute('data-inline-type') === 'date') {
+      dispatch({
+        type: 'EXIT_EDIT_MODE',
+        payload: activeCellId
+      });
+    }
+
+    event.preventDefault();
+    var inlineEditArea = document.querySelector("#".concat(instance.tableId, " .").concat(blockClass, "__table-with-inline-edit"));
+    inlineEditArea.focus();
+    return;
+  }
+
+  if (activeCellId === editId && key === 'Escape') {
+    if (focusedCell.getAttribute('data-inline-type') === 'date') {
+      dispatch({
+        type: 'EXIT_EDIT_MODE',
+        payload: activeCellId
+      });
+      event.preventDefault();
+
+      var _inlineEditArea = document.querySelector("#".concat(instance.tableId, " .").concat(blockClass, "__table-with-inline-edit"));
+
+      _inlineEditArea.focus();
+
+      return;
+    }
+  } // Checks if the dropdown menu is open
+
+
+  var dropdownIsActive = function dropdownIsActive() {
+    var focusedElementRole = document.activeElement.getAttribute('role');
+
+    if (focusedElementRole === 'listbox' && document.activeElement.classList.contains("".concat(_settings.carbon.prefix, "--list-box__menu"))) {
+      // Prevents arrow keys from scrolling any other content when dropdown menu is open
+      event.preventDefault();
+      return true;
+    }
+
+    return false;
+  }; // Checks if the date picker is open
+
+
+  var datePickerIsActive = function datePickerIsActive() {
+    var focusedCalendarElement = document.querySelector(".".concat(_settings.carbon.prefix, "--date-picker__input.flatpickr-input.active"));
+
+    if (focusedCalendarElement || document.activeElement.classList.contains("flatpickr-day")) {
+      event.preventDefault();
+      return true;
+    }
+
+    return false;
+  }; // Stop grid key listener when in edit mode
+
+
+  var isEditing = document.activeElement.id === activeCellId && document.activeElement.id === editId || dropdownIsActive() || datePickerIsActive();
+
+  if (isEditing || !gridActive) {
+    return;
+  } // Command keys need to be returned as there is default browser behavior with these keys
+
+
+  if (key === 'Meta' || key === 'Control') {
+    return;
+  } // Prevent arrow keys, home key, and end key from scrolling the page when the data spreadsheet container has focus
+
+
+  if (['End', 'Home', 'ArrowLeft', 'ArrowUp', 'ArrowRight', 'ArrowDown'].indexOf(key) > -1 && !isEditing && keysPressedList.length < 2) {
+    event.preventDefault();
+  }
+
+  var isDisabledCell = !!focusedCell.getAttribute('data-disabled');
+  var sharedUpdateParams = {
+    oldId: activeCellId,
+    instance: instance
+  };
+
+  if (keysPressedList.length > 1) {
+    (0, _handleMultipleKeys.handleMultipleKeys)({
+      usingMac: usingMac,
+      keysPressedList: keysPressedList,
+      dispatch: dispatch,
+      activeCellId: activeCellId,
+      instance: instance
+    });
+  }
+
+  if (keysPressedList.length < 2) {
+    switch (key) {
+      case 'Tab':
+        {
+          if (!editId) {
+            dispatch({
+              type: 'REMOVE_GRID_ACTIVE_FOCUS',
+              payload: activeCellId
+            });
+          }
+
+          break;
+        }
+
+      case 'ArrowRight':
+        {
+          dispatch({
+            type: 'UPDATE_ACTIVE_CELL_ID',
+            payload: _objectSpread({
+              direction: 'right'
+            }, sharedUpdateParams)
+          });
+          break;
+        }
+
+      case 'ArrowLeft':
+        {
+          dispatch({
+            type: 'UPDATE_ACTIVE_CELL_ID',
+            payload: _objectSpread({
+              direction: 'left'
+            }, sharedUpdateParams)
+          });
+          break;
+        }
+
+      case 'ArrowUp':
+        {
+          dispatch({
+            type: 'UPDATE_ACTIVE_CELL_ID',
+            payload: _objectSpread({
+              direction: 'up'
+            }, sharedUpdateParams)
+          });
+          break;
+        }
+
+      case 'ArrowDown':
+        {
+          dispatch({
+            type: 'UPDATE_ACTIVE_CELL_ID',
+            payload: _objectSpread({
+              direction: 'down'
+            }, sharedUpdateParams)
+          });
+          break;
+        }
+      // Move active cell to first column in current row
+
+      case 'Home':
+        {
+          var activeCellObject = (0, _getCellIdAsObject.getCellIdAsObject)(activeCellId);
+
+          var newActiveCellCoords = _objectSpread(_objectSpread({}, activeCellObject), {}, {
+            column: 0
+          });
+
+          var newActiveCellId = "column-".concat(newActiveCellCoords.column, "-row-").concat(newActiveCellCoords.row);
+          var scrollElement = document.querySelector("#".concat(instance.tableId, " .").concat(_settings.pkg.prefix, "--datagrid__table-container")); // Scroll table container to the furthest left position
+
+          scrollElement.scrollLeft = 0;
+          dispatch({
+            type: 'UPDATE_ACTIVE_CELL_ID',
+            payload: newActiveCellId
+          });
+          break;
+        }
+      // Move active cell to last column in current row
+
+      case 'End':
+        {
+          var _activeCellObject = (0, _getCellIdAsObject.getCellIdAsObject)(activeCellId);
+
+          var totalVisibleColumns = instance.visibleColumns.filter(function (item) {
+            return item.id !== 'spacer';
+          });
+
+          var _newActiveCellCoords = _objectSpread(_objectSpread({}, _activeCellObject), {}, {
+            column: totalVisibleColumns.length - 1
+          });
+
+          var _newActiveCellId = "column-".concat(_newActiveCellCoords.column, "-row-").concat(_newActiveCellCoords.row);
+
+          var _scrollElement = document.querySelector("#".concat(instance.tableId, " .").concat(_settings.pkg.prefix, "--datagrid__table-container")); // Scroll table container to the furthest right position
+
+
+          _scrollElement.scrollLeft = _scrollElement.scrollWidth;
+          dispatch({
+            type: 'UPDATE_ACTIVE_CELL_ID',
+            payload: _newActiveCellId
+          });
+          break;
+        }
+
+      case ' ':
+      case 'F2':
+      case 'Enter':
+        {
+          // Disabled cells are not allowed to go into edit mode
+          if (isDisabledCell) {
+            return;
+          } // Only go into edit mode if there is no editId, meaning that we're not already in edit mode
+
+
+          if (!editId) {
+            var focusedType = focusedCell.getAttribute('data-inline-type'); // Open dropdown immediately after entering edit mode for selection type
+
+            if (focusedType === 'selection') {
+              setTimeout(function () {
+                var dropdownTrigger = focusedCell.querySelector('button');
+                dropdownTrigger === null || dropdownTrigger === void 0 ? void 0 : dropdownTrigger.click();
+              }, 1);
+            }
+
+            if (focusedType === 'date') {
+              setTimeout(function () {
+                var dateInputTrigger = focusedCell.querySelector('input');
+                dateInputTrigger === null || dateInputTrigger === void 0 ? void 0 : dateInputTrigger.click();
+                dateInputTrigger === null || dateInputTrigger === void 0 ? void 0 : dateInputTrigger.focus();
+              }, 1);
+            }
+
+            dispatch({
+              type: 'ENTER_EDIT_MODE',
+              payload: {
+                activeCellId: activeCellId,
+                editId: activeCellId
+              }
+            });
+          }
+        }
+    }
+  }
+};
+
+exports.handleGridKeyPress = handleGridKeyPress;

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

@@ -0,0 +1,78 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.handleMultipleKeys = void 0;
+
+var _handleMultipleKeys = require("../../../../DataSpreadsheet/utils/handleMultipleKeys");
+
+var _settings = require("../../../../../settings");
+
+/**
+ * Copyright IBM Corp. 2022, 2022
+ *
+ * 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");
+
+var handleMultipleKeys = function handleMultipleKeys(_ref) {
+  var usingMac = _ref.usingMac,
+      keysPressedList = _ref.keysPressedList,
+      dispatch = _ref.dispatch,
+      activeCellId = _ref.activeCellId,
+      instance = _ref.instance;
+
+  // Resource key and Home
+  // Move active cell to first cell in first row and column
+  if ((0, _handleMultipleKeys.includesResourceKey)(keysPressedList, usingMac) && keysPressedList.includes('Home')) {
+    var scrollElement = document.querySelector("#".concat(instance.tableId, " .").concat(_settings.pkg.prefix, "--datagrid__table-container")); // Scroll table container to the furthest top left position
+
+    scrollElement.scrollTop = 0;
+    scrollElement.scrollLeft = 0;
+    dispatch({
+      type: 'UPDATE_ACTIVE_CELL_ID',
+      payload: 'column-0-row-0'
+    });
+  } // Resource key and End
+  // Move active cell to last cell in in the last row and column
+
+
+  if ((0, _handleMultipleKeys.includesResourceKey)(keysPressedList, usingMac) && keysPressedList.includes('End')) {
+    var _instance$rows;
+
+    var totalVisibleColumns = instance.visibleColumns.filter(function (item) {
+      return item.id !== 'spacer';
+    }).length;
+    var totalRows = (_instance$rows = instance.rows) === null || _instance$rows === void 0 ? void 0 : _instance$rows.length;
+    var lastCellDataId = "column-".concat(totalVisibleColumns - 1, "-row-").concat(totalRows - 1);
+    var lastCellElement = document.querySelector("#".concat(instance.tableId, " .").concat(blockClass, "__table-with-inline-edit [data-cell-id=\"").concat(activeCellId, "\"]"));
+
+    var _scrollElement = document.querySelector("#".concat(instance.tableId, " .").concat(_settings.pkg.prefix, "--datagrid__table-container")); // Scroll table container to the furthest bottom right position
+
+
+    _scrollElement.scrollTop = _scrollElement.scrollHeight;
+    _scrollElement.scrollLeft = _scrollElement.scrollWidth;
+
+    if (lastCellElement) {
+      dispatch({
+        type: 'UPDATE_ACTIVE_CELL_ID',
+        payload: lastCellDataId
+      });
+    } else {
+      // If a Datagrid component is using virtualized data, it's possible that the last cell
+      // has not yet been rendered. In this case, we simply need to wait until the scrollable
+      // container has scrolled to the bottom/right most position, then we can dispatch the
+      // update active cell id action
+      setTimeout(function () {
+        dispatch({
+          type: 'UPDATE_ACTIVE_CELL_ID',
+          payload: lastCellDataId
+        });
+      }, 250);
+    }
+  }
+};
+
+exports.handleMultipleKeys = handleMultipleKeys;

package/lib/components/Datagrid/Datagrid/addons/RowSize/RowSizeDropdown.js

@@ -31,7 +31,7 @@ var _RowSizeRadioGroup = _interopRequireDefault(require("./RowSizeRadioGroup"));
 
 var _settings = require("../../../../../settings");
 
-var _excluded = ["buttonLabel"];
+var _excluded = ["legendText"];
 
 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); }
 
@@ -40,8 +40,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 
 var RowSizeDropdown = function RowSizeDropdown(_ref) {
-  var _ref$buttonLabel = _ref.buttonLabel,
-      buttonLabel = _ref$buttonLabel === void 0 ? 'Row height' : _ref$buttonLabel,
+  var _ref$legendText = _ref.legendText,
+      legendText = _ref$legendText === void 0 ? 'Row height' : _ref$legendText,
       props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var buttonRef = React.useRef({});
 
@@ -59,9 +59,10 @@ var RowSizeDropdown = function RowSizeDropdown(_ref) {
     onClick: function onClick() {
       return setIsOpen(!isOpen);
     },
-    iconDescription: buttonLabel,
+    iconDescription: legendText,
     className: (0, _classnames.default)((0, _defineProperty2.default)({}, "".concat(blockClass, "__row-size-button--open"), isOpen))
   }), isOpen && /*#__PURE__*/React.createElement(_RowSizeRadioGroup.default, (0, _extends2.default)({}, props, {
+    legendText: legendText,
     buttonRef: buttonRef,
     hideRadioGroup: function hideRadioGroup() {
       setIsOpen(false);
@@ -70,8 +71,8 @@ var RowSizeDropdown = function RowSizeDropdown(_ref) {
 };
 
 RowSizeDropdown.propTypes = {
-  buttonLabel: _propTypes.default.string,
   datagridName: _propTypes.default.string,
+  legendText: _propTypes.default.string,
   light: _propTypes.default.bool,
   onChange: _propTypes.default.func.isRequired,
   selectedOption: _propTypes.default.string

package/lib/components/Datagrid/Datagrid/addons/RowSize/RowSizeRadioGroup.js

@@ -42,8 +42,7 @@ var RowSizeRadioGroup = function RowSizeRadioGroup(_ref) {
       buttonRef = _ref.buttonRef,
       onChange = _ref.onChange,
       hideRadioGroup = _ref.hideRadioGroup,
-      _ref$legendText = _ref.legendText,
-      legendText = _ref$legendText === void 0 ? 'Row height' : _ref$legendText,
+      legendText = _ref.legendText,
       _ref$rowSizeLabels = _ref.rowSizeLabels,
       rowSizeLabels = _ref$rowSizeLabels === void 0 ? {
     xl: 'Extra large',

package/lib/components/Datagrid/index.js

@@ -23,6 +23,12 @@ Object.defineProperty(exports, "useColumnCenterAlign", {
     return _useColumnCenterAlign.default;
   }
 });
+Object.defineProperty(exports, "useColumnOrder", {
+  enumerable: true,
+  get: function get() {
+    return _useColumnOrder.default;
+  }
+});
 Object.defineProperty(exports, "useColumnRightAlign", {
   enumerable: true,
   get: function get() {
@@ -59,6 +65,12 @@ Object.defineProperty(exports, "useInfiniteScroll", {
     return _useInfiniteScroll.default;
   }
 });
+Object.defineProperty(exports, "useInlineEdit", {
+  enumerable: true,
+  get: function get() {
+    return _useInlineEdit.default;
+  }
+});
 Object.defineProperty(exports, "useNestedRows", {
   enumerable: true,
   get: function get() {
@@ -132,4 +144,8 @@ var _useCustomizeColumns = _interopRequireDefault(require("./useCustomizeColumns
 
 var _useSelectAllToggle = _interopRequireDefault(require("./useSelectAllToggle"));
 
-var _useColumnCenterAlign = _interopRequireDefault(require("./useColumnCenterAlign"));
+var _useColumnCenterAlign = _interopRequireDefault(require("./useColumnCenterAlign"));
+
+var _useColumnOrder = _interopRequireDefault(require("./useColumnOrder"));
+
+var _useInlineEdit = _interopRequireDefault(require("./useInlineEdit"));

package/lib/components/Datagrid/useActionsColumn.js

@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
 var _react = _interopRequireDefault(require("react"));
@@ -21,13 +21,15 @@ var _carbonComponentsReact = require("carbon-components-react");
 
 var _settings = require("../../settings");
 
-var _excluded = ["id", "onClick", "shouldHideMenuItem", "shouldDisableMenuItem", "disabled"];
+var _excluded = ["id", "itemText", "onClick", "icon"],
+    _excluded2 = ["id", "onClick", "shouldHideMenuItem", "shouldDisableMenuItem", "disabled"];
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 
 var useActionsColumn = function useActionsColumn(hooks) {
   var useAttachActionsOnInstance = function useAttachActionsOnInstance(instance) {
     var rowActions = instance.rowActions,
-        isFetching = instance.isFetching;
+        isFetching = instance.isFetching,
+        selectedFlatRows = instance.selectedFlatRows;
 
     if (rowActions && Array.isArray(rowActions)) {
       var addActionsMenu = function addActionsMenu(props, cellData) {
@@ -36,7 +38,7 @@ var useActionsColumn = function useActionsColumn(hooks) {
             column = cell.column;
 
         if (column.isAction) {
-          var _cx;
+          var _cx3;
 
           return [props, {
             children: /*#__PURE__*/_react.default.createElement("div", {
@@ -48,26 +50,36 @@ var useActionsColumn = function useActionsColumn(hooks) {
               style: {
                 display: 'flex'
               }
-            }, rowActions.map(function (action) {
+            }, rowActions.map(function (action, index) {
               var id = action.id,
                   itemText = action.itemText,
                   _onClick = action.onClick,
-                  icon = action.icon;
+                  icon = action.icon,
+                  rest = (0, _objectWithoutProperties2.default)(action, _excluded);
+              var selectedRowId = selectedFlatRows === null || selectedFlatRows === void 0 ? void 0 : selectedFlatRows.filter(function (item) {
+                return item.id === row.id ? item.id : null;
+              });
               return /*#__PURE__*/_react.default.createElement("div", {
-                className: "".concat(blockClass, "__actions-column-button"),
-                key: ""
-              }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenu, {
+                className: (0, _classnames.default)("".concat(blockClass, "__actions-column-button"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__disabled-row-action-button"), selectedFlatRows && selectedFlatRows.length && selectedRowId && selectedRowId.length)),
+                key: "".concat(itemText, "__").concat(index)
+              }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenu, (0, _extends2.default)({}, rest, {
                 renderIcon: icon,
                 hasIconOnly: true,
                 light: true,
                 iconDescription: itemText,
                 kind: "ghost",
+                className: (0, _classnames.default)((0, _defineProperty2.default)({}, "".concat(blockClass, "__disabled-row-action"), selectedFlatRows && selectedFlatRows.length && selectedRowId && selectedRowId.length)),
                 onClick: function onClick(e) {
+                  if (selectedFlatRows && selectedFlatRows.length && selectedRowId && selectedRowId.length) {
+                    // Row actions should be disabled if row is selected and batchActions toolbar is active
+                    return;
+                  }
+
                   e.stopPropagation();
 
                   _onClick(id, row, e);
                 }
-              }));
+              })));
             })), !isFetching && rowActions.length > 2 && /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenu, {
               size: "sm",
               light: true,
@@ -81,7 +93,7 @@ var useActionsColumn = function useActionsColumn(hooks) {
                   shouldHideMenuItem = action.shouldHideMenuItem,
                   shouldDisableMenuItem = action.shouldDisableMenuItem,
                   disabled = action.disabled,
-                  rest = (0, _objectWithoutProperties2.default)(action, _excluded);
+                  rest = (0, _objectWithoutProperties2.default)(action, _excluded2);
               var hidden = typeof shouldHideMenuItem === 'function' && shouldHideMenuItem(row); // shouldDisableMenuItem will override disabled because it's more specific
               // if shouldDisableMenuItem doesn't exists, fall back to disabled
 
@@ -101,7 +113,10 @@ var useActionsColumn = function useActionsColumn(hooks) {
                 key: id
               }));
             })))),
-            className: (0, _classnames.default)((_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__actions-column-cell"), true), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__cell"), true), _cx))
+            className: (0, _classnames.default)((_cx3 = {}, (0, _defineProperty2.default)(_cx3, "".concat(blockClass, "__actions-column-cell"), true), (0, _defineProperty2.default)(_cx3, "".concat(blockClass, "__cell"), true), _cx3)),
+            style: {
+              width: 96
+            }
           }];
         }
 

package/lib/components/Datagrid/useColumnOrder.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _reactTable = require("react-table");
+
+/**
+ * Copyright IBM Corp. 2022, 2022
+ *
+ * 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 _default = _reactTable.useColumnOrder;
+exports.default = _default;

package/lib/components/Datagrid/useCustomizeColumns.js

@@ -35,6 +35,10 @@ var useCustomizeColumns = function useCustomizeColumns(hooks) {
 
   hooks.useInstance.push(function (instance) {
     var customizeColumnsProps = instance.customizeColumnsProps;
+
+    var _ref = customizeColumnsProps || {},
+        labels = _ref.labels;
+
     Object.assign(instance, {
       customizeColumnsProps: _objectSpread(_objectSpread({}, customizeColumnsProps), {}, {
         isModalOpen: isModalOpen,
@@ -42,6 +46,7 @@ var useCustomizeColumns = function useCustomizeColumns(hooks) {
       }),
       CustomizeColumnsButton: function CustomizeColumnsButton(props) {
         return /*#__PURE__*/React.createElement(_CustomizeColumns.ToggleButtonWrapper, (0, _extends2.default)({
+          iconTooltipLabel: labels === null || labels === void 0 ? void 0 : labels.iconTooltipLabel,
           isModalOpen: isModalOpen,
           setIsModalOpen: setIsModalOpen
         }, props));