@carbon/ibm-products 1.71.0 → 1.72.1

package/lib/components/Datagrid/useFiltering.js

@@ -13,56 +13,58 @@ var _Filtering = require("./Datagrid/addons/Filtering");
 var _constants = require("./Datagrid/addons/Filtering/constants");
 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 handleMultiFilter = function handleMultiFilter(rows, id, value) {
+  // gets all the items that are selected and returns their value
+  var selectedItems = value.filter(function (item) {
+    return item.selected;
+  }).map(function (item) {
+    return item.value;
+  });
+
+  // if the user removed all checkboxes then display all rows
+  if (selectedItems.length === 0) {
+    return rows;
+  }
+  return rows.filter(function (row) {
+    var rowValue = row.values[id];
+    return selectedItems.includes(rowValue);
+  });
+};
 var useFiltering = function useFiltering(hooks) {
   /* istanbul ignore next */
   var filterTypes = (0, _react.useMemo)(function () {
-    return {
-      date: function date(rows, id, _ref) {
-        var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
-          startDate = _ref2[0],
-          endDate = _ref2[1];
-        return rows.filter(function (row) {
-          var rowValue = row.values[id];
-          var startDateObj = (0, _typeof2.default)(startDate) === 'object' ? startDate : new Date(startDate);
-          var endDateObj = (0, _typeof2.default)(endDate) === 'object' ? endDate : new Date(endDate);
-          var rowValueDateObj = (0, _typeof2.default)(rowValue) === 'object' ? rowValue : new Date(rowValue);
-          if (rowValueDateObj.getTime() <= endDateObj.getTime() && rowValueDateObj.getTime() >= startDateObj.getTime()) {
-            // In date range
-            return true;
-          } else {
-            // Not in date range
-            return false;
-          }
-        });
-      },
-      number: function number(rows, id, value) {
-        if (value === '') {
-          return rows;
+    var _ref3;
+    return _ref3 = {}, (0, _defineProperty2.default)(_ref3, _constants.DATE, function (rows, id, _ref) {
+      var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
+        startDate = _ref2[0],
+        endDate = _ref2[1];
+      return rows.filter(function (row) {
+        var rowValue = row.values[id];
+        var startDateObj = (0, _typeof2.default)(startDate) === 'object' ? startDate : new Date(startDate);
+        var endDateObj = (0, _typeof2.default)(endDate) === 'object' ? endDate : new Date(endDate);
+        var rowValueDateObj = (0, _typeof2.default)(rowValue) === 'object' ? rowValue : new Date(rowValue);
+        if (rowValueDateObj.getTime() <= endDateObj.getTime() && rowValueDateObj.getTime() >= startDateObj.getTime()) {
+          // In date range
+          return true;
+        } else {
+          // Not in date range
+          return false;
         }
-        var parsedValue = parseInt(value);
-        return rows.filter(function (row) {
-          var rowValue = row.values[id];
-          return rowValue === parsedValue;
-        });
-      },
-      checkbox: function checkbox(rows, id, value) {
-        // gets all the items that are selected and returns their value
-        var selectedItems = value.filter(function (item) {
-          return item.selected;
-        }).map(function (item) {
-          return item.value;
-        });
-
-        // if the user removed all checkboxes then display all rows
-        if (selectedItems.length === 0) {
-          return rows;
-        }
-        return rows.filter(function (row) {
-          var rowValue = row.values[id];
-          return selectedItems.includes(rowValue);
-        });
+      });
+    }), (0, _defineProperty2.default)(_ref3, _constants.NUMBER, function (rows, id, value) {
+      if (value === '') {
+        return rows;
       }
-    };
+      var parsedValue = parseInt(value);
+      return rows.filter(function (row) {
+        var rowValue = row.values[id];
+        return rowValue === parsedValue;
+      });
+    }), (0, _defineProperty2.default)(_ref3, _constants.CHECKBOX, function (rows, id, value) {
+      return handleMultiFilter(rows, id, value);
+    }), (0, _defineProperty2.default)(_ref3, _constants.MULTISELECT, function (rows, id, value) {
+      return handleMultiFilter(rows, id, value);
+    }), _ref3;
   }, []);
   hooks.useInstance.push(function (instance) {
     var filterProps = instance.filterProps,

package/lib/components/Datagrid/useInitialColumnSort.js

@@ -0,0 +1,47 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useInitialColumnSort = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+var _useSortableColumns = require("./useSortableColumns");
+/**
+ * Copyright IBM Corp. 2024, 2024
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+var useInitialColumnSort = function useInitialColumnSort(instance) {
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    hasInitialSort = _useState2[0],
+    setHasInitialSort = _useState2[1];
+  (0, _react.useEffect)(function () {
+    var initialState = instance.initialState,
+      headers = instance.headers,
+      onSort = instance.onSort,
+      isTableSortable = instance.isTableSortable;
+    var sortableColumn = initialState.sortableColumn;
+    var foundSortedCol = headers.some(function (h) {
+      return h.isSorted;
+    });
+    if (foundSortedCol || hasInitialSort || !isTableSortable) {
+      return;
+    }
+    if (sortableColumn) {
+      var columnId = sortableColumn.id,
+        order = sortableColumn.order;
+      var _getNewSortOrder = (0, _useSortableColumns.getNewSortOrder)(order),
+        newSortDesc = _getNewSortOrder.newSortDesc,
+        newOrder = _getNewSortOrder.newOrder;
+      onSort === null || onSort === void 0 ? void 0 : onSort(columnId, newOrder);
+      instance.toggleSortBy(columnId, newSortDesc, false);
+      setHasInitialSort(true);
+    }
+  }, [instance, hasInitialSort]);
+};
+exports.useInitialColumnSort = useInitialColumnSort;

package/lib/components/Datagrid/useSelectRows.js

@@ -103,7 +103,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$getToggleRowSele2 = row.getToggleRowSelectedProps(),
     onChange = _row$getToggleRowSele2.onChange,
     title = _row$getToggleRowSele2.title,
@@ -127,7 +127,7 @@ var SelectRow = function SelectRow(datagridState) {
       getRowId: getRowId
     });
   };
-  var rowId = "".concat(tableId, "-").concat(row.index);
+  var rowId = "".concat(tableId, "-").concat(row.id, "-").concat(row.index);
   return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.TableSelectRow, (0, _extends2.default)({}, cellProps, selectProps, {
     radio: radio,
     onSelect: onSelectHandler,

package/lib/components/Datagrid/useSortableColumns.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.getNewSortOrder = 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"));
@@ -21,6 +21,22 @@ var ordering = {
   DESC: 'DESC',
   NONE: 'NONE'
 };
+var getNewSortOrder = function getNewSortOrder(sortOrder) {
+  var order = {
+    newSortDesc: undefined,
+    newOrder: ordering.NONE
+  };
+  if (sortOrder === false) {
+    order.newOrder = ordering.DESC;
+    order.newSortDesc = true;
+  }
+  if (sortOrder === undefined) {
+    order.newOrder = ordering.ASC;
+    order.newSortDesc = false;
+  }
+  return order;
+};
+exports.getNewSortOrder = getNewSortOrder;
 var getAriaSortValue = function getAriaSortValue(col, _ref) {
   var ascendingSortableLabelText = _ref.ascendingSortableLabelText,
     descendingSortableLabelText = _ref.descendingSortableLabelText,
@@ -91,7 +107,7 @@ var useSortableColumns = function useSortableColumns(hooks) {
       };
       var Header = function Header(headerProp) {
         var _cx;
-        return column.disableSortBy === true || column.id === 'datagridSelection' ? column.disableSortBy ? column.Header : /*#__PURE__*/_react.default.createElement(_DatagridSelectAll.SelectAll, instance) : /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
+        return column.disableSortBy === true || column.id === 'datagridSelection' || column.isAction ? column.disableSortBy || column.isAction ? column.Header : /*#__PURE__*/_react.default.createElement(_DatagridSelectAll.SelectAll, instance) : /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
           "aria-sort": getAriaSortValue(headerProp === null || headerProp === void 0 ? void 0 : headerProp.column, {
             ascendingSortableLabelText: ascendingSortableLabelText,
             descendingSortableLabelText: descendingSortableLabelText,
@@ -119,21 +135,6 @@ var useSortableColumns = function useSortableColumns(hooks) {
       isTableSortable: true
     });
   };
-  var getNewSortOrder = function getNewSortOrder(sortOrder) {
-    var order = {
-      newSortDesc: undefined,
-      newOrder: ordering.NONE
-    };
-    if (sortOrder === false) {
-      order.newOrder = ordering.DESC;
-      order.newSortDesc = true;
-    }
-    if (sortOrder === undefined) {
-      order.newOrder = ordering.ASC;
-      order.newSortDesc = false;
-    }
-    return order;
-  };
   hooks.visibleColumns.push(sortableVisibleColumns);
   hooks.useInstance.push(sortInstanceProps);
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "1.71.0",
+  "version": "1.72.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -86,17 +86,17 @@
   },
   "peerDependencies": {
     "@carbon/colors": "^10.37.2",
-    "@carbon/icons-react": "^10.49.2",
+    "@carbon/icons-react": "^10.49.3",
     "@carbon/import-once": "^10.7.0",
     "@carbon/layout": "^10.37.2",
     "@carbon/motion": "^10.29.2",
     "@carbon/themes": "^10.55.3",
     "@carbon/type": "^10.45.3",
-    "carbon-components": "^10.58.12",
-    "carbon-components-react": "^7.59.17",
+    "carbon-components": "^10.58.13",
+    "carbon-components-react": "^7.59.20",
     "carbon-icons": "^7.0.7",
     "react": "^16.8.6 || ^17.0.1",
     "react-dom": "^16.8.6 || ^17.0.1"
   },
-  "gitHead": "48db8a26c5e8f33a2f2056e175fee30e7aab2c85"
+  "gitHead": "4a4bf2a1dd6f15a09871cf84f634cd5cff095194"
 }

package/scss/components/Datagrid/styles/_useExpandedRow.scss

@@ -61,9 +61,17 @@
   + .#{$block-class}__expanded-row,
 .#{$block-class} .#{$block-class}__expanded-row:hover,
 .#{$block-class} .#{$block-class}__expandable-row--hover td {
+  border-top: none;
   background: $layer-hover;
 }
 
+.#{$block-class}
+  .#{$carbon-prefix}--data-table
+  .#{$block-class}__carbon-row-expandable
+  td {
+  border-top: none;
+}
+
 .#{$block-class}
   .#{$carbon-prefix}--data-table
   tbody
@@ -79,6 +87,23 @@
   border: none;
 }
 
+.#{$block-class}
+  .#{$carbon-prefix}--data-table
+  .#{$block-class}__carbon-row-expanded:hover
+  td:not(.#{$block-class}__expandable-row-cell) {
+  border-bottom: 1px solid $border-subtle;
+}
+
+.#{$block-class}
+  .#{$carbon-prefix}--data-table
+  .#{$block-class}__carbon-row-expanded:hover
+  + .#{$block-class}__expanded-row
+  .#{$block-class}__expanded-row-content,
+.#{$block-class}__expanded-row:hover .#{$block-class}__expanded-row-content {
+  background-color: $layer-hover;
+  transition: background-color $duration--fast-01 motion(entrance, productive);
+}
+
 .#{$block-class}
   .#{$carbon-prefix}--data-table
   td.#{$block-class}__expanded-row-cell-wrapper {

package/scss/components/Datagrid/styles/_useNestedRows.scss

@@ -30,7 +30,10 @@
   border-bottom: none;
 }
 
-.#{$block-class} .#{$block-class}__carbon-row-expandable {
+.#{$block-class} .#{$block-class}__carbon-row-expandable,
+.#{$block-class}
+  tr.#{$block-class}__carbon-nested-row
+  td.#{$block-class}__cell:not(.#{$block-class}__expandable-row-cell) {
   position: relative;
 }
 
@@ -58,6 +61,64 @@
   padding-left: $spacing-03;
 }
 
+.#{$carbon-prefix}--data-table td.#{$block-class}__expandable-row-cell + td,
+.#{$carbon-prefix}--data-table
+  .#{$block-class}__carbon-nested-row:not(
+    .#{$block-class}__carbon-row-expandable
+  )
+  td.#{$block-class}__cell:nth-of-type(2) {
+  position: relative;
+}
+
+.#{$carbon-prefix}--data-table
+  td.#{$block-class}__expandable-row-cell.#{$block-class}__expandable-row-cell--is-expanded
+  + td.#{$block-class}__checkbox-cell__checkbox-cell {
+  border-top: none;
+}
+
+.#{$carbon-prefix}--data-table
+  td.#{$block-class}__expandable-row-cell.#{$block-class}__expandable-row-cell--is-expanded
+  + td::before,
+.#{$carbon-prefix}--data-table
+  .#{$block-class}__carbon-nested-row:not(
+    .#{$block-class}__carbon-row-expandable
+  )
+  td.#{$block-class}__cell:nth-of-type(2)::before,
+.#{$carbon-prefix}--data-table
+  .#{$block-class}__carbon-nested-row
+  td.#{$block-class}__expandable-row-cell
+  + td::before {
+  position: absolute;
+  /* stylelint-disable-next-line carbon/layout-token-use */
+  bottom: -1px;
+  left: 0;
+  width: 1rem;
+  height: 1px;
+  background-color: $ui-01;
+  content: '';
+  transition: background-color $duration--fast-01 motion(entrance, productive);
+}
+
+.#{$carbon-prefix}--data-table
+  tr:hover
+  td.#{$block-class}__expandable-row-cell.#{$block-class}__expandable-row-cell--is-expanded
+  + td::before,
+.#{$carbon-prefix}--data-table
+  .#{$block-class}__carbon-nested-row:hover
+  td.#{$block-class}__expandable-row-cell
+  + td::before,
+.#{$carbon-prefix}--data-table
+  .#{$block-class}__expandable-row--hover
+  td.#{$block-class}__expandable-row-cell
+  + td::before,
+.#{$carbon-prefix}--data-table
+  .#{$block-class}__carbon-nested-row:hover:not(
+    .#{$block-class}__carbon-row-expandable
+  )
+  td.#{$block-class}__cell:nth-of-type(2)::before {
+  background-color: $layer-hover;
+}
+
 .#{$block-class}__carbon-row-expanded {
   .#{$block-class}__expandable-row-cell {
     border-bottom: none;

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

@@ -34,7 +34,7 @@
   position: relative;
   z-index: 0;
   overflow: auto;
-  padding: 0 $spacing-05;
+  padding: 0 $spacing-05 $spacing-11 $spacing-05;
   overscroll-behavior: contain;
 }