@carbon/ibm-products 1.44.1 → 1.46.0

package/lib/components/Datagrid/Datagrid/addons/Filtering/hooks/useFilters.js

@@ -0,0 +1,280 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
+var _carbonComponentsReact = require("carbon-components-react");
+var _constants = require("../constants");
+var _useInitialStateFromFilters = _interopRequireDefault(require("./useInitialStateFromFilters"));
+var _utils = require("../utils");
+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; }
+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 useFilters = function useFilters(_ref) {
+  var updateMethod = _ref.updateMethod,
+    _ref$filters = _ref.filters,
+    filters = _ref$filters === void 0 ? [] : _ref$filters,
+    setAllFilters = _ref.setAllFilters,
+    variation = _ref.variation;
+  /** State */
+  var _useInitialStateFromF = (0, _useInitialStateFromFilters.default)(filters, variation),
+    _useInitialStateFromF2 = (0, _slicedToArray2.default)(_useInitialStateFromF, 2),
+    filtersState = _useInitialStateFromF2[0],
+    setFiltersState = _useInitialStateFromF2[1];
+  var _useState = (0, _react.useState)([]),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    filtersObjectArray = _useState2[0],
+    setFiltersObjectArray = _useState2[1];
+
+  // When using batch actions we have to store the filters to then apply them later
+  var prevFiltersRef = (0, _react.useRef)(JSON.stringify(filtersState));
+  var prevFiltersObjectArrayRef = (0, _react.useRef)(JSON.stringify(filtersObjectArray));
+
+  /** Methods */
+  // If the user decides to cancel or click outside the flyout, it reverts back to the filters that were
+  // there when they opened the flyout
+  var revertToPreviousFilters = function revertToPreviousFilters() {
+    setFiltersState(JSON.parse(prevFiltersRef.current));
+    setFiltersObjectArray(JSON.parse(prevFiltersObjectArrayRef.current));
+  };
+  var reset = function reset() {
+    // Get the initial values for the filters
+    var initialFiltersState = (0, _utils.getInitialStateFromFilters)(filters, variation);
+    var initialFiltersObjectArray = [];
+
+    // Set the state to the initial values
+    setFiltersState(initialFiltersState);
+    setFiltersObjectArray(initialFiltersObjectArray);
+    setAllFilters([]);
+
+    // Update their respective refs so everything is in sync
+    prevFiltersRef.current = JSON.stringify(initialFiltersState);
+    prevFiltersObjectArrayRef.current = JSON.stringify(initialFiltersObjectArray);
+  };
+  var applyFilters = function applyFilters(_ref2) {
+    var column = _ref2.column,
+      value = _ref2.value,
+      type = _ref2.type;
+    // If no end date is selected return because we need the end date to do computations
+    if (type === _constants.DATE && value.length > 0 && !value[1]) {
+      return;
+    }
+    var filtersObjectArrayCopy = (0, _toConsumableArray2.default)(filtersObjectArray);
+    // // check if the filter already exists in the array
+    var filter = filtersObjectArrayCopy.find(function (item) {
+      return item.id === column;
+    });
+
+    // // if filter exists in array then update the filter's new value
+    if (filter) {
+      filter.value = value;
+    } else {
+      filtersObjectArrayCopy.push({
+        id: column,
+        value: value,
+        type: type
+      });
+    }
+
+    // ATTENTION: this is where you would reset or remove individual filters from the filters array
+    if (type === _constants.CHECKBOX) {
+      /**
+      When all checkboxes of a group are all unselected the value still exists in the filtersObjectArray
+      This checks if all the checkboxes are selected = false and removes it from the array
+      */
+      var index = filtersObjectArrayCopy.findIndex(function (filter) {
+        return filter.id === column;
+      });
+
+      // If all the selected state is false remove from array
+      var shouldRemoveFromArray = filtersObjectArrayCopy[index].value.every(function (val) {
+        return val.selected === false;
+      });
+      if (shouldRemoveFromArray) {
+        filtersObjectArrayCopy.splice(index, 1);
+      }
+    } else if (type === _constants.DATE) {
+      if (value.length === 0) {
+        /**
+        Checks to see if the date value is an empty array, if it is that means the user wants
+        to reset the date filter
+        */
+        var _index = filtersObjectArrayCopy.findIndex(function (filter) {
+          return filter.id === column;
+        });
+
+        // Remove it from the filters array since there is nothing to filter
+        filtersObjectArrayCopy.splice(_index, 1);
+      }
+    } else if (type === _constants.DROPDOWN || type === _constants.RADIO) {
+      if (value === 'Any') {
+        /**
+        Checks to see if the selected value is 'Any', that means the user wants
+        to reset specific filter
+        */
+        var _index2 = filtersObjectArrayCopy.findIndex(function (filter) {
+          return filter.id === column;
+        });
+
+        // Remove it from the filters array
+        filtersObjectArrayCopy.splice(_index2, 1);
+      }
+    }
+    setFiltersObjectArray(filtersObjectArrayCopy);
+
+    // // Automatically apply the filters if the updateMethod is instant
+    if (updateMethod === _constants.INSTANT) {
+      setAllFilters(filtersObjectArrayCopy);
+    }
+  };
+  /** Render the individual filter component */
+  var renderFilter = function renderFilter(_ref3) {
+    var _filtersState$column, _filtersState$column2;
+    var type = _ref3.type,
+      column = _ref3.column,
+      components = _ref3.props;
+    var isPanel = variation === _constants.PANEL;
+    switch (type) {
+      case _constants.DATE:
+        return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.DatePicker, (0, _extends2.default)({}, components.DatePicker, {
+          onChange: function onChange(value) {
+            var _components$DatePicke, _components$DatePicke2;
+            setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, (0, _defineProperty2.default)({}, column, {
+              value: value,
+              type: type
+            })));
+            applyFilters({
+              column: column,
+              value: value,
+              type: type
+            });
+            (_components$DatePicke = (_components$DatePicke2 = components.DatePicker).onChange) === null || _components$DatePicke === void 0 ? void 0 : _components$DatePicke.call(_components$DatePicke2, value);
+          },
+          value: filtersState[column].value,
+          datePickerType: "range",
+          light: isPanel
+        }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.DatePickerInput, (0, _extends2.default)({
+          placeholder: "mm/dd/yyyy",
+          labelText: "Start date"
+        }, components.DatePickerInput.start)), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.DatePickerInput, (0, _extends2.default)({
+          placeholder: "mm/dd/yyyy",
+          labelText: "End date"
+        }, components.DatePickerInput.end)));
+      case _constants.NUMBER:
+        return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.NumberInput, (0, _extends2.default)({
+          step: 1,
+          allowEmpty: true,
+          hideSteppers: true
+        }, components.NumberInput, {
+          onChange: function onChange(event) {
+            var _components$NumberInp, _components$NumberInp2;
+            setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, (0, _defineProperty2.default)({}, column, {
+              value: event.target.value,
+              type: type
+            })));
+            applyFilters({
+              column: column,
+              value: event.target.value,
+              type: type
+            });
+            (_components$NumberInp = (_components$NumberInp2 = components.NumberInput).onChange) === null || _components$NumberInp === void 0 ? void 0 : _components$NumberInp.call(_components$NumberInp2, event);
+          },
+          value: filtersState[column].value,
+          light: isPanel
+        }));
+      case _constants.CHECKBOX:
+        return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.FormGroup, components.FormGroup, filtersState[column].value.map(function (option) {
+          return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Checkbox, (0, _extends2.default)({
+            key: option.labelText
+          }, option, {
+            onChange: function onChange(isSelected) {
+              var _option$onChange;
+              var checkboxCopy = filtersState[column].value;
+              var foundCheckbox = checkboxCopy.find(function (checkbox) {
+                return checkbox.value === option.value;
+              });
+              foundCheckbox.selected = isSelected;
+              setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, (0, _defineProperty2.default)({}, column, {
+                value: checkboxCopy,
+                type: type
+              })));
+              applyFilters({
+                column: column,
+                value: (0, _toConsumableArray2.default)(filtersState[column].value),
+                type: type
+              });
+              (_option$onChange = option.onChange) === null || _option$onChange === void 0 ? void 0 : _option$onChange.call(option, isSelected);
+            },
+            checked: option.selected
+          }));
+        }));
+      case _constants.RADIO:
+        return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.FormGroup, components.FormGroup, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.RadioButtonGroup, (0, _extends2.default)({}, components.RadioButtonGroup, {
+          valueSelected: ((_filtersState$column = filtersState[column]) === null || _filtersState$column === void 0 ? void 0 : _filtersState$column.value) === '' ? 'Any' : (_filtersState$column2 = filtersState[column]) === null || _filtersState$column2 === void 0 ? void 0 : _filtersState$column2.value,
+          onChange: function onChange(selected) {
+            var _components$RadioButt, _components$RadioButt2;
+            setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, (0, _defineProperty2.default)({}, column, {
+              value: selected,
+              type: type
+            })));
+            applyFilters({
+              column: column,
+              value: selected,
+              type: type
+            });
+            (_components$RadioButt = (_components$RadioButt2 = components.RadioButtonGroup).onChange) === null || _components$RadioButt === void 0 ? void 0 : _components$RadioButt.call(_components$RadioButt2, selected);
+          }
+        }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.RadioButton, {
+          id: "any",
+          labelText: "Any",
+          value: "Any"
+        }), components.RadioButton.map(function (radio) {
+          var _ref4, _radio$id;
+          return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.RadioButton, (0, _extends2.default)({
+            key: (_ref4 = (_radio$id = radio.id) !== null && _radio$id !== void 0 ? _radio$id : radio.labelText) !== null && _ref4 !== void 0 ? _ref4 : radio.value
+          }, radio));
+        })));
+      case _constants.DROPDOWN:
+        return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Dropdown, (0, _extends2.default)({}, components.Dropdown, {
+          items: ['Any'].concat((0, _toConsumableArray2.default)(components.Dropdown.items)),
+          selectedItem: filtersState[column].value === '' ? 'Any' : filtersState[column].value,
+          onChange: function onChange(_ref5) {
+            var _components$Dropdown$, _components$Dropdown;
+            var selectedItem = _ref5.selectedItem;
+            setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, (0, _defineProperty2.default)({}, column, {
+              value: selectedItem,
+              type: type
+            })));
+            applyFilters({
+              column: column,
+              value: selectedItem,
+              type: type
+            });
+            (_components$Dropdown$ = (_components$Dropdown = components.Dropdown).onChange) === null || _components$Dropdown$ === void 0 ? void 0 : _components$Dropdown$.call(_components$Dropdown, selectedItem);
+          },
+          light: isPanel
+        }));
+    }
+  };
+  return {
+    filtersState: filtersState,
+    setFiltersState: setFiltersState,
+    prevFiltersObjectArrayRef: prevFiltersObjectArrayRef,
+    prevFiltersRef: prevFiltersRef,
+    revertToPreviousFilters: revertToPreviousFilters,
+    reset: reset,
+    renderFilter: renderFilter,
+    filtersObjectArray: filtersObjectArray
+  };
+};
+var _default = useFilters;
+exports.default = _default;

package/lib/components/Datagrid/Datagrid/addons/Filtering/hooks/useShouldDisableButtons.js

@@ -0,0 +1,41 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
+/**
+ * Copyright IBM Corp. 2023, 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.
+ */
+/* eslint-disable jsdoc/check-param-names */
+
+/**
+ * Keeps track of the button disabled state
+ * @param  {string} initialValue - the initial value if the buttons should be enabled or disabled
+ * @param  {object} filtersState - the filter state from the filter panel or flyout
+ * @param  {object} prevFiltersRef - reference of the prev filterState
+ * @returns {Array} returns a tuple of the state and setter function
+ */
+var useShouldDisableButtons = function useShouldDisableButtons(_ref) {
+  var _ref$initialValue = _ref.initialValue,
+    initialValue = _ref$initialValue === void 0 ? true : _ref$initialValue,
+    filtersState = _ref.filtersState,
+    prevFiltersRef = _ref.prevFiltersRef;
+  var _useState = (0, _react.useState)(initialValue),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    shouldDisableButtons = _useState2[0],
+    setShouldDisableButtons = _useState2[1];
+  (0, _react.useEffect)(function updateDisabledButtonsState() {
+    setShouldDisableButtons((0, _isEqual.default)(filtersState, JSON.parse(prevFiltersRef.current)));
+  }, [filtersState, prevFiltersRef]);
+  return [shouldDisableButtons, setShouldDisableButtons];
+};
+var _default = useShouldDisableButtons;
+exports.default = _default;

package/lib/components/Datagrid/Datagrid/addons/Filtering/utils.js

@@ -20,7 +20,7 @@ var getInitialStateFromFilters = function getInitialStateFromFilters(filters) {
     var type = _ref.type,
       column = _ref.column,
       props = _ref.props;
-    if (type === 'checkbox') {
+    if (type === _constants.CHECKBOX) {
       initialFilterState[column] = {
         value: props.Checkbox.map(function (_ref2) {
           var id = _ref2.id,
@@ -35,22 +35,22 @@ var getInitialStateFromFilters = function getInitialStateFromFilters(filters) {
         }),
         type: type
       };
-    } else if (type === 'date') {
+    } else if (type === _constants.DATE) {
       initialFilterState[column] = {
         value: [null, null],
         type: type
       };
-    } else if (type === 'number') {
+    } else if (type === _constants.NUMBER) {
       initialFilterState[column] = {
         value: '',
         type: type
       };
-    } else if (type === 'radio') {
+    } else if (type === _constants.RADIO) {
       initialFilterState[column] = {
         value: '',
         type: type
       };
-    } else if (type === 'dropdown') {
+    } else if (type === _constants.DROPDOWN) {
       initialFilterState[column] = {
         value: '',
         type: type

package/lib/components/Datagrid/useSortableColumns.js

@@ -8,10 +8,13 @@ exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
+var _classnames = _interopRequireDefault(require("classnames"));
+var _settings = require("../../settings");
 var _carbonComponentsReact = require("carbon-components-react");
 var _iconsReact = require("@carbon/icons-react");
 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 ordering = {
   ASC: 'ASC',
   DESC: 'DESC',
@@ -39,7 +42,7 @@ var useSortableColumns = function useSortableColumns(hooks) {
             case false:
               return _iconsReact.ArrowUp16;
             case true:
-              return _iconsReact.ArrowDown16;
+              return _iconsReact.ArrowUp16;
             default:
               return _iconsReact.Arrows16;
           }
@@ -47,16 +50,19 @@ var useSortableColumns = function useSortableColumns(hooks) {
         return _iconsReact.Arrows16;
       };
       var Header = function Header(headerProp) {
+        var _cx;
         return column.disableSortBy === true ? column.Header : /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
           onClick: function onClick() {
             return onSortClick(headerProp.column);
           },
           kind: "ghost",
-          renderIcon: icon(headerProp.column)
+          renderIcon: icon(headerProp.column),
+          className: (0, _classnames.default)("".concat(_settings.carbon.prefix, "--table-sort ").concat(blockClass, "--table-sort"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--table-sort--desc"), headerProp.column.isSortedDesc), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--table-sort--asc"), headerProp.column.isSortedDesc === false), _cx))
         }, column.Header);
       };
       return _objectSpread(_objectSpread({}, column), {}, {
-        Header: Header
+        Header: Header,
+        minWidth: column.disableSortBy === true ? 0 : 90
       });
     });
     return (0, _toConsumableArray2.default)(sortableColumns);

package/lib/components/Datagrid/utils/DatagridActions.js

@@ -26,7 +26,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var DatagridActions = function DatagridActions(datagridState) {
   var _useContext = (0, _react.useContext)(_Filtering.FilterContext),
-    setLeftPanelOpen = _useContext.setLeftPanelOpen;
+    setPanelOpen = _useContext.setPanelOpen;
   var selectedFlatRows = datagridState.selectedFlatRows,
     setGlobalFilter = datagridState.setGlobalFilter,
     CustomizeColumnsButton = datagridState.CustomizeColumnsButton,
@@ -68,7 +68,7 @@ var DatagridActions = function DatagridActions(datagridState) {
       iconDescription: filterProps.panelIconDescription,
       className: "".concat(blockClass, "-filter-panel-open-button"),
       onClick: function onClick() {
-        return setLeftPanelOpen(function (open) {
+        return setPanelOpen(function (open) {
           return !open;
         });
       },
@@ -150,7 +150,7 @@ var DatagridActions = function DatagridActions(datagridState) {
     onChange: function onChange(e) {
       return setGlobalFilter(e.target.value);
     }
-  }), renderFilterFlyout(), /*#__PURE__*/_react.default.createElement(RowSizeDropdown, rowSizeDropdownProps), /*#__PURE__*/_react.default.createElement("div", {
+  }), renderFilterFlyout(), /*#__PURE__*/_react.default.createElement("div", {
     style: style
   }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
     kind: "ghost",
@@ -170,7 +170,7 @@ var DatagridActions = function DatagridActions(datagridState) {
     onClick: downloadCsv
   })), CustomizeColumnsButton && /*#__PURE__*/_react.default.createElement("div", {
     style: style
-  }, /*#__PURE__*/_react.default.createElement(CustomizeColumnsButton, null)), /*#__PURE__*/_react.default.createElement(_ButtonMenu.ButtonMenu, {
+  }, /*#__PURE__*/_react.default.createElement(CustomizeColumnsButton, null)), /*#__PURE__*/_react.default.createElement(RowSizeDropdown, rowSizeDropdownProps), /*#__PURE__*/_react.default.createElement(_ButtonMenu.ButtonMenu, {
     label: "Primary button",
     size: "lg",
     light: true,
@@ -184,7 +184,7 @@ var DatagridActions = function DatagridActions(datagridState) {
   }), /*#__PURE__*/_react.default.createElement(_ButtonMenu.ButtonMenuItem, {
     itemText: "Option 3",
     onClick: (0, _addonActions.action)("Click on ButtonMenu Option 3")
-  }))) : /*#__PURE__*/_react.default.createElement(TableToolbarContent, null, renderFilterPanelButton(), /*#__PURE__*/_react.default.createElement(TableToolbarSearch, {
+  }))) : /*#__PURE__*/_react.default.createElement(TableToolbarContent, null, /*#__PURE__*/_react.default.createElement(TableToolbarSearch, {
     size: "xl",
     id: "columnSearch",
     persistent: true,
@@ -192,39 +192,7 @@ var DatagridActions = function DatagridActions(datagridState) {
     onChange: function onChange(e) {
       return setGlobalFilter(e.target.value);
     }
-  }), renderFilterFlyout(), /*#__PURE__*/_react.default.createElement(RowSizeDropdown, rowSizeDropdownProps), /*#__PURE__*/_react.default.createElement("div", {
-    style: style
-  }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
-    kind: "ghost",
-    hasIconOnly: true,
-    tooltipPosition: "bottom",
-    renderIcon: _iconsReact.Restart16,
-    iconDescription: 'Refresh',
-    onClick: refreshColumns
-  })), /*#__PURE__*/_react.default.createElement("div", {
-    style: style
-  }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
-    kind: "ghost",
-    hasIconOnly: true,
-    tooltipPosition: "bottom",
-    renderIcon: _iconsReact.Download16,
-    iconDescription: 'Download CSV',
-    onClick: downloadCsv
-  })), CustomizeColumnsButton && /*#__PURE__*/_react.default.createElement("div", {
-    style: style
-  }, /*#__PURE__*/_react.default.createElement(CustomizeColumnsButton, null)), /*#__PURE__*/_react.default.createElement(_ButtonMenu.ButtonMenu, {
-    label: "Primary button",
-    renderIcon: _iconsReact.Add16
-  }, /*#__PURE__*/_react.default.createElement(_ButtonMenu.ButtonMenuItem, {
-    itemText: "Option 1",
-    onClick: (0, _addonActions.action)("Click on ButtonMenu Option 1")
-  }), /*#__PURE__*/_react.default.createElement(_ButtonMenu.ButtonMenuItem, {
-    itemText: "Option 2",
-    onClick: (0, _addonActions.action)("Click on ButtonMenu Option 2")
-  }), /*#__PURE__*/_react.default.createElement(_ButtonMenu.ButtonMenuItem, {
-    itemText: "Option 3",
-    onClick: (0, _addonActions.action)("Click on ButtonMenu Option 3")
-  })), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenu, {
+  }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenu, {
     ariaLabel: "Tools",
     size: "lg",
     flipped: true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "1.44.1",
+  "version": "1.46.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -53,21 +53,21 @@
   "devDependencies": {
     "@babel/cli": "^7.20.7",
     "@babel/core": "^7.20.12",
-    "babel-preset-ibm-cloud-cognitive": "^0.14.26",
+    "babel-preset-ibm-cloud-cognitive": "^0.14.27",
     "chalk": "^4.1.2",
     "change-case": "^4.1.2",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
     "fs-extra": "^11.1.0",
     "glob": "^8.1.0",
-    "jest": "^29.4.1",
-    "jest-config-ibm-cloud-cognitive": "^0.24.12",
-    "jest-environment-jsdom": "^29.4.1",
+    "jest": "^29.4.2",
+    "jest-config-ibm-cloud-cognitive": "^0.24.13",
+    "jest-environment-jsdom": "^29.4.2",
     "namor": "^1.1.2",
-    "npm-check-updates": "^16.6.3",
+    "npm-check-updates": "^16.7.4",
     "npm-run-all": "^4.1.5",
     "rimraf": "~3 || > 4.1",
-    "sass": "^1.58.0",
+    "sass": "^1.58.1",
     "yargs": "^17.6.2"
   },
   "dependencies": {
@@ -95,5 +95,5 @@
     "react": "^16.8.6 || ^17.0.1",
     "react-dom": "^16.8.6 || ^17.0.1"
   },
-  "gitHead": "fc263168325ad92efaa868582b43760e317d9a33"
+  "gitHead": "ff776c9f98e52d84bf0f50a60bb113e3d6f64c10"
 }

package/scss/components/Datagrid/styles/_datagrid.scss

@@ -447,7 +447,7 @@
   }
 
   .#{$block-class}__table-toolbar {
-    flex: 0 0 auto;
+    flex: 1 0 auto;
   }
   .#{$carbon-prefix}--table-toolbar {
     background: transparent;

package/scss/components/Datagrid/styles/_useSortableColumns.scss

@@ -1,10 +1,9 @@
-/*
-* Licensed Materials - Property of IBM
-* 5724-Q36
-* (c) Copyright IBM Corp. 2020
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*/
+/**
+ * Copyright IBM Corp. 2020, 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.
+ */
 
 @import './variables';
 
@@ -18,38 +17,55 @@
     width: 100%;
     height: 100%;
   }
-  .#{$carbon-prefix}--table-header-label button:focus,
-  .#{$carbon-prefix}--table-header-label button:active,
-  .#{$carbon-prefix}--table-header-label button:focus svg {
+  .#{$carbon-prefix}--table-header-label .#{$carbon-prefix}--table-sort:focus,
+  .#{$carbon-prefix}--table-header-label .#{$carbon-prefix}--table-sort:active,
+  .#{$carbon-prefix}--table-header-label
+    .#{$carbon-prefix}--table-sort:focus
+    svg {
     /* stylelint-disable-next-line declaration-no-important */
     background: none !important;
     /* stylelint-disable-next-line declaration-no-important */
     color: $text-01 !important;
-    /* stylelint-disable-next-line declaration-no-important */
-    outline: none !important;
   }
-  .#{$carbon-prefix}--table-header-label button {
+  .#{$carbon-prefix}--table-header-label .#{$carbon-prefix}--table-sort:focus,
+  .#{$carbon-prefix}--table-header-label .#{$carbon-prefix}--table-sort:active {
+    + .#{$block-class}__resizer {
+      z-index: -1;
+    }
+  }
+  .#{$carbon-prefix}--table-header-label .#{$carbon-prefix}--table-sort {
     width: 100%;
     min-width: 100%;
-    min-height: 0;
-    padding: 0;
+    padding: 0 $spacing-05;
     border: none;
     /* stylelint-disable-next-line declaration-no-important */
     background: none !important;
-    box-shadow: none;
     /* stylelint-disable-next-line declaration-no-important */
     color: $text-01 !important;
     font: inherit;
   }
-  .#{$carbon-prefix}--table-header-label button svg {
+  .#{$carbon-prefix}--table-header-label .#{$carbon-prefix}--table-sort svg {
     fill: $text-01;
+    opacity: 0;
+    transition: transform $duration--fast-02 motion(standard, productive);
     visibility: hidden;
   }
+
+  .#{$carbon-prefix}--table-sort.#{$block-class}--table-sort {
+    width: calc(100% + #{$spacing-07}); // offset due to inner label
+    margin: 0 calc(-1 * #{$spacing-05}); // fill width of parent table column header
+  }
 }
 
 .#{$block-class}__sortableColumn:hover,
+.#{$block-class}__sortableColumn:focus-within,
 .#{$block-class}__sortableColumn.#{$block-class}__isSorted {
   .#{$carbon-prefix}--table-header-label svg {
+    opacity: 1;
     visibility: visible;
   }
 }
+
+.#{$block-class}__sortableColumn .#{$block-class}--table-sort--desc svg {
+  transform: rotate(180deg);
+}

package/scss/components/Datagrid/styles/addons/_RowSizeDropdown.scss

@@ -16,7 +16,7 @@
   box-shadow: 1px 4px 8px -3px $overlay-01, -1px 6px 8px -5px $overlay-01;
 }
 
-.#{$block-class}__row-size-button--open {
+.#{$carbon-prefix}--btn--ghost.#{$block-class}__row-size-button--open {
   background-color: $ui-background;
 
   box-shadow: 1px 4px 8px -3px $overlay-01, -1px 6px 8px -5px $overlay-01;