@carbon/ibm-products 1.62.0 → 1.62.1

package/es/components/Datagrid/Datagrid/DatagridToolbar.js

@@ -14,6 +14,7 @@ import { useResizeObserver } from '../../../global/js/hooks/useResizeObserver';
 import { ButtonMenu, ButtonMenuItem } from '../../ButtonMenu';
 import { pkg, carbon } from '../../../settings';
 import cx from 'classnames';
+import { handleSelectAllRowData } from './addons/stateReducer';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var toolbarClass = "".concat(blockClass, "__table-toolbar");
 var menuClass = "".concat(blockClass, "__button-menu");
@@ -35,8 +36,11 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
     toggleAllRowsSelected = datagridState.toggleAllRowsSelected,
     toolbarBatchActions = datagridState.toolbarBatchActions,
     setGlobalFilter = datagridState.setGlobalFilter,
+    dispatch = datagridState.dispatch,
+    getRowId = datagridState.getRowId,
     batchActionMenuButtonLabel = datagridState.batchActionMenuButtonLabel,
-    translateWithIdBatchActions = datagridState.translateWithIdBatchActions;
+    translateWithIdBatchActions = datagridState.translateWithIdBatchActions,
+    rows = datagridState.rows;
   var batchActionMenuButtonLabelText = batchActionMenuButtonLabel !== null && batchActionMenuButtonLabel !== void 0 ? batchActionMenuButtonLabel : 'More';
   var selectedKeys = Object.keys(selectedRowIds || {});
   var totalSelected = selectedKeys.length;
@@ -84,6 +88,11 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
             batchAction.onClick();
             if (batchAction.type === 'select_all') {
               toggleAllRowsSelected(true);
+              handleSelectAllRowData({
+                dispatch: dispatch,
+                rows: rows,
+                getRowId: getRowId
+              });
             }
           }
         });
@@ -111,6 +120,11 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
           batchAction.onClick();
           if (batchAction.type === 'select_all') {
             toggleAllRowsSelected(true);
+            handleSelectAllRowData({
+              dispatch: dispatch,
+              rows: rows,
+              getRowId: getRowId
+            });
           }
         },
         iconDescription: batchAction.label

package/es/components/Datagrid/Datagrid/addons/stateReducer.js

@@ -16,6 +16,7 @@ var COLUMN_RESIZING = 'columnResizing';
 var COLUMN_RESIZE_END = 'columnDoneResizing';
 var INIT = 'init';
 var TOGGLE_ROW_SELECTED = 'toggleRowSelected';
+var TOGGLE_ALL_ROWS_SELECTED = 'toggleAllRowsSelected';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 export var handleColumnResizeEndEvent = function handleColumnResizeEndEvent(dispatch, onColResizeEnd, headerId, isKeyEvent) {
   dispatch({
@@ -47,35 +48,77 @@ export var handleColumnResizingEvent = function handleColumnResizingEvent(dispat
     }
   });
 };
-export var handleToggleRowSelected = function handleToggleRowSelected(dispatch, rowData, isChecked) {
+export var handleToggleRowSelected = function handleToggleRowSelected(_ref) {
+  var dispatch = _ref.dispatch,
+    rowData = _ref.rowData,
+    isChecked = _ref.isChecked,
+    getRowId = _ref.getRowId,
+    selectAll = _ref.selectAll;
   return dispatch({
     type: TOGGLE_ROW_SELECTED,
     payload: {
       rowData: rowData,
+      isChecked: isChecked,
+      getRowId: getRowId,
+      selectAll: selectAll
+    }
+  });
+};
+export var handleSelectAllRowData = function handleSelectAllRowData(_ref2) {
+  var dispatch = _ref2.dispatch,
+    rows = _ref2.rows,
+    getRowId = _ref2.getRowId,
+    indeterminate = _ref2.indeterminate,
+    isChecked = _ref2.isChecked;
+  return dispatch({
+    type: TOGGLE_ALL_ROWS_SELECTED,
+    payload: {
+      rows: rows,
+      getRowId: getRowId,
+      indeterminate: indeterminate,
       isChecked: isChecked
     }
   });
 };
 export var stateReducer = function stateReducer(newState, action) {
   switch (action.type) {
+    case TOGGLE_ALL_ROWS_SELECTED:
+      {
+        var _ref3 = action.payload || {},
+          rows = _ref3.rows,
+          getRowId = _ref3.getRowId,
+          indeterminate = _ref3.indeterminate,
+          isChecked = _ref3.isChecked;
+        if (rows) {
+          var newSelectedRowData = {};
+          rows.forEach(function (row) {
+            newSelectedRowData[getRowId(row, row.index)] = row;
+          });
+          return _objectSpread(_objectSpread({}, newState), {}, {
+            selectedRowData: indeterminate || !isChecked ? {} : newSelectedRowData
+          });
+        }
+        return _objectSpread({}, newState);
+      }
     case TOGGLE_ROW_SELECTED:
       {
-        var _ref = action.payload || {},
-          rowData = _ref.rowData,
-          isChecked = _ref.isChecked;
+        var _ref4 = action.payload || {},
+          rowData = _ref4.rowData,
+          _isChecked = _ref4.isChecked,
+          _getRowId = _ref4.getRowId;
         if (!rowData) {
           return;
         }
-        if (isChecked) {
+        if (_isChecked) {
           return _objectSpread(_objectSpread({}, newState), {}, {
-            selectedRowData: _objectSpread(_objectSpread({}, newState.selectedRowData), {}, _defineProperty({}, rowData.index, rowData))
+            selectedRowData: _objectSpread(_objectSpread({}, newState.selectedRowData), {}, _defineProperty({}, _getRowId(rowData, rowData.index), rowData))
           });
         }
-        if (rowData && !isChecked) {
+        if (rowData && !_isChecked) {
           var newData = _objectSpread({}, newState.selectedRowData);
-          var dataWithRemovedRow = Object.fromEntries(Object.entries(newData).filter(function (_ref2) {
-            var _ref3 = _slicedToArray(_ref2, 1),
-              key = _ref3[0];
+          var dataWithRemovedRow = Object.fromEntries(Object.entries(newData).filter(function (_ref5) {
+            var _ref6 = _slicedToArray(_ref5, 1),
+              key = _ref6[0];
             return parseInt(key) !== parseInt(rowData.index);
           }));
           return _objectSpread(_objectSpread({}, newState), {}, {
@@ -92,27 +135,27 @@ export var stateReducer = function stateReducer(newState, action) {
       }
     case COLUMN_RESIZE_START:
       {
-        var _ref4 = action.payload || {},
-          headerId = _ref4.headerId;
+        var _ref7 = action.payload || {},
+          headerId = _ref7.headerId;
         return _objectSpread(_objectSpread({}, newState), {}, {
           isResizing: headerId
         });
       }
     case COLUMN_RESIZING:
       {
-        var _ref5 = action.payload || {},
-          _headerId = _ref5.headerId,
-          newWidth = _ref5.newWidth,
-          defaultWidth = _ref5.defaultWidth;
+        var _ref8 = action.payload || {},
+          _headerId = _ref8.headerId,
+          newWidth = _ref8.newWidth,
+          defaultWidth = _ref8.defaultWidth;
         var newColumnWidth = {};
         if (typeof _headerId === 'undefined') {
           return _objectSpread({}, newState);
         }
         newColumnWidth[_headerId] = newWidth;
-        var cleanedWidths = Object.fromEntries(Object.entries(newState.columnResizing.columnWidths).filter(function (_ref6) {
-          var _ref7 = _slicedToArray(_ref6, 2),
-            _ = _ref7[0],
-            value = _ref7[1];
+        var cleanedWidths = Object.fromEntries(Object.entries(newState.columnResizing.columnWidths).filter(function (_ref9) {
+          var _ref10 = _slicedToArray(_ref9, 2),
+            _ = _ref10[0],
+            value = _ref10[1];
           return !isNaN(value);
         }));
         var headerIdArray = newState.columnResizing.headerIdWidths || [];
@@ -127,10 +170,10 @@ export var stateReducer = function stateReducer(newState, action) {
       }
     case COLUMN_RESIZE_END:
       {
-        var _ref8 = action.payload || {},
-          onColResizeEnd = _ref8.onColResizeEnd,
-          _headerId2 = _ref8.headerId,
-          isKeyEvent = _ref8.isKeyEvent;
+        var _ref11 = action.payload || {},
+          onColResizeEnd = _ref11.onColResizeEnd,
+          _headerId2 = _ref11.headerId,
+          isKeyEvent = _ref11.isKeyEvent;
         var currentColumn = {};
         currentColumn[_headerId2] = newState.columnResizing.columnWidths[_headerId2];
         var allChangedColumns = newState.columnResizing.columnWidths;

package/es/components/Datagrid/useExpandedRow.js

@@ -9,14 +9,10 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  * LICENSE file in the root directory of this source tree.
  */
 
-import { useEffect, useState } from 'react';
-import { pkg } from '../../settings';
+import { useState } from 'react';
 import DatagridExpandedRow from './Datagrid/DatagridExpandedRow';
 import useRowExpander from './useRowExpander';
 var useExpandedRow = function useExpandedRow(hooks) {
-  useEffect(function () {
-    pkg.checkReportFeatureEnabled('Datagrid.useExpandedRow');
-  }, []);
   useRowExpander(hooks);
   var useInstance = function useInstance(instance) {
     var rows = instance.rows,
@@ -38,7 +34,8 @@ var useExpandedRow = function useExpandedRow(hooks) {
     });
     Object.assign(instance, {
       rows: rowsWithExpand,
-      setExpandedRowHeight: setExpandedRowHeight
+      setExpandedRowHeight: setExpandedRowHeight,
+      withExpandedRows: true
     });
   };
   hooks.useInstance.push(useInstance);

package/es/components/Datagrid/useFocusRowExpander.js

@@ -0,0 +1,40 @@
+/**
+ * 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.
+ */
+
+import { useEffect } from 'react';
+
+// Focuses the row expander after a nested/expandable row state change.
+// We have to add this workaround because react-table is re-rendering the entire row
+// which removes the focus from the expander and interrupts the keyboard navigation
+// flow.
+export var useFocusRowExpander = function useFocusRowExpander(_ref) {
+  var instance = _ref.instance,
+    _ref$lastExpandedRowI = _ref.lastExpandedRowIndex,
+    lastExpandedRowIndex = _ref$lastExpandedRowI === void 0 ? 0 : _ref$lastExpandedRowI,
+    blockClass = _ref.blockClass,
+    activeElement = _ref.activeElement;
+  useEffect(function () {
+    // We need to return at this point so that the focus is not stolen from
+    // other interactive elements in the Datagrid
+    if (!activeElement.classList.contains("".concat(blockClass, "__row-expander"))) {
+      return;
+    }
+    var tableId = instance === null || instance === void 0 ? void 0 : instance.tableId;
+    var rowElements = document.querySelectorAll("#".concat(tableId, " tbody tr"));
+    var rowElementsArray = Array.from(rowElements);
+    var activeRow = rowElementsArray.filter(function (r) {
+      if (r.getAttribute('data-nested-row-id') === lastExpandedRowIndex) {
+        return r;
+      }
+      return null;
+    });
+    if (activeRow.length) {
+      var rowExpander = activeRow[0].querySelector(".".concat(blockClass, "__row-expander"));
+      rowExpander.focus();
+    }
+  }, [instance === null || instance === void 0 ? void 0 : instance.tableId, instance === null || instance === void 0 ? void 0 : instance.expandedRows, lastExpandedRowIndex, blockClass, activeElement]);
+};

package/es/components/Datagrid/useNestedRowExpander.js

@@ -15,12 +15,20 @@ import React, { useRef } from 'react';
 import { ChevronRight16 } from '@carbon/icons-react';
 import cx from 'classnames';
 import { pkg, carbon } from '../../settings';
+import { useFocusRowExpander } from './useFocusRowExpander';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var useNestedRowExpander = function useNestedRowExpander(hooks) {
   var tempState = useRef();
+  var lastExpandedRowIndex = useRef();
   var useInstance = function useInstance(instance) {
     tempState.current = instance;
   };
+  useFocusRowExpander({
+    instance: tempState === null || tempState === void 0 ? void 0 : tempState.current,
+    lastExpandedRowIndex: lastExpandedRowIndex === null || lastExpandedRowIndex === void 0 ? void 0 : lastExpandedRowIndex.current,
+    blockClass: blockClass,
+    activeElement: document.activeElement
+  });
   var visibleColumns = function visibleColumns(columns) {
     var expanderColumn = {
       id: 'expander',
@@ -32,6 +40,7 @@ var useNestedRowExpander = function useNestedRowExpander(hooks) {
             // Prevents `onRowClick` from being called if `useOnRowClick` is included
             event.stopPropagation();
             row.toggleRowExpanded();
+            lastExpandedRowIndex.current = row.id;
           }
         });
         var _ref2 = (tempState === null || tempState === void 0 ? void 0 : tempState.current) || {},

package/es/components/Datagrid/useNestedRows.js

@@ -6,15 +6,11 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
  * LICENSE file in the root directory of this source tree.
  */
 
-import { useEffect } from 'react';
 import { pkg } from '../../settings';
 import cx from 'classnames';
 import useNestedRowExpander from './useNestedRowExpander';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var useNestedRows = function useNestedRows(hooks) {
-  useEffect(function () {
-    pkg.checkReportFeatureEnabled('Datagrid.useNestedRows');
-  }, []);
   useNestedRowExpander(hooks);
   var marginLeft = 24;
   var getRowProps = function getRowProps(props, _ref) {

package/es/components/Datagrid/useRowExpander.js

@@ -15,12 +15,20 @@ import React, { useRef } from 'react';
 import { ChevronDown16, ChevronUp16 } from '@carbon/icons-react';
 import cx from 'classnames';
 import { pkg, carbon } from '../../settings';
+import { useFocusRowExpander } from './useFocusRowExpander';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var useRowExpander = function useRowExpander(hooks) {
   var tempState = useRef();
+  var lastExpandedRowIndex = useRef();
   var useInstance = function useInstance(instance) {
     tempState.current = instance;
   };
+  useFocusRowExpander({
+    instance: tempState === null || tempState === void 0 ? void 0 : tempState.current,
+    lastExpandedRowIndex: lastExpandedRowIndex === null || lastExpandedRowIndex === void 0 ? void 0 : lastExpandedRowIndex.current,
+    blockClass: blockClass,
+    activeElement: document.activeElement
+  });
   var visibleColumns = function visibleColumns(columns) {
     var expanderColumn = {
       id: 'expander',
@@ -31,6 +39,7 @@ var useRowExpander = function useRowExpander(hooks) {
             // Prevents `onRowClick` from being called if `useOnRowClick` is included
             event.stopPropagation();
             row.toggleRowExpanded();
+            lastExpandedRowIndex.current = row.id;
           }
         });
         var _ref2 = (tempState === null || tempState === void 0 ? void 0 : tempState.current) || {},

package/es/components/Datagrid/useSelectRows.js

@@ -6,14 +6,13 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _excluded = ["onChange", "title"];
 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) { _defineProperty(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; }
-/*
- * Licensed Materials - Property of IBM
- * 5724-Q36
- * (c) Copyright IBM Corp. 2023
- * 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.
  */
-// @flow
+
 import React, { useLayoutEffect, useState } from 'react';
 import cx from 'classnames';
 import { TableSelectRow } from 'carbon-components-react';
@@ -43,7 +42,14 @@ var useSelectRows = function useSelectRows(hooks) {
     });
   });
   hooks.visibleColumns.push(function (columns) {
-    return [{
+    // Ensures that the first column is the row expander in the
+    // case of selected rows and expandable rows being used together
+    var newColOrder = _toConsumableArray(columns);
+    var expanderColumnIndex = newColOrder.findIndex(function (col) {
+      return col.id === 'expander';
+    });
+    var expanderCol = expanderColumnIndex > -1 ? newColOrder.splice(expanderColumnIndex, 1) : [];
+    return [].concat(_toConsumableArray(expanderColumnIndex > -1 && expanderCol && expanderCol.length ? expanderCol : []), [{
       id: selectionColumnId,
       Header: function Header(gridState) {
         return /*#__PURE__*/React.createElement(SelectAll, gridState);
@@ -51,7 +57,7 @@ var useSelectRows = function useSelectRows(hooks) {
       Cell: function Cell(gridState) {
         return /*#__PURE__*/React.createElement(SelectRow, gridState);
       }
-    }].concat(_toConsumableArray(columns));
+    }], _toConsumableArray(newColOrder));
   });
 };
 var useHighlightSelection = function useHighlightSelection(hooks) {
@@ -79,7 +85,8 @@ var SelectRow = function SelectRow(datagridState) {
     onRowSelect = datagridState.onRowSelect,
     columns = datagridState.columns,
     withStickyColumn = datagridState.withStickyColumn,
-    dispatch = datagridState.dispatch;
+    dispatch = datagridState.dispatch,
+    getRowId = datagridState.getRowId;
   var _useState = useState(window.innerWidth),
     _useState2 = _slicedToArray(_useState, 2),
     windowSize = _useState2[0],
@@ -110,7 +117,12 @@ var SelectRow = function SelectRow(datagridState) {
     }
     onChange(event);
     onRowSelect === null || onRowSelect === void 0 ? void 0 : onRowSelect(row, event);
-    handleToggleRowSelected(dispatch, row, event.target.checked);
+    handleToggleRowSelected({
+      dispatch: dispatch,
+      rowData: row,
+      isChecked: event.target.checked,
+      getRowId: getRowId
+    });
   };
   var rowId = "".concat(tableId, "-").concat(row.index);
   return /*#__PURE__*/React.createElement(TableSelectRow, _extends({}, cellProps, selectProps, {

package/es/components/Guidebanner/Guidebanner.js

@@ -74,9 +74,6 @@ export var Guidebanner = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     isCollapsed = _useState6[0],
     setIsCollapsed = _useState6[1];
-  var handleScrollableChange = function handleScrollableChange(value) {
-    setShowNavigation(value);
-  };
   var handleClickToggle = function handleClickToggle() {
     setScrollPosition(0);
     scrollRef.current.scrollToView(0);
@@ -101,9 +98,13 @@ export var Guidebanner = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       left: blue90,
       right: purple70
     },
-    ref: scrollRef,
-    scrollableChange: handleScrollableChange,
-    scrollTune: -450
+    onChangeIsScrollable: function onChangeIsScrollable(value) {
+      setShowNavigation(value);
+    },
+    onScroll: function onScroll(scrollPercent) {
+      setScrollPosition(scrollPercent);
+    },
+    ref: scrollRef
   }, children), /*#__PURE__*/React.createElement("div", {
     className: cx([collapsible || showNavigation ? "".concat(blockClass, "__navigation") : null])
   }, collapsible && /*#__PURE__*/React.createElement(Button, {
@@ -122,9 +123,7 @@ export var Guidebanner = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     tooltipPosition: "top",
     iconDescription: previousIconDescription,
     onClick: function onClick() {
-      scrollRef.current.scrollPrev().then(function (scrollPercentage) {
-        return setScrollPosition(scrollPercentage);
-      });
+      scrollRef.current.scrollPrev();
     }
   }), /*#__PURE__*/React.createElement(Button, {
     kind: "ghost",
@@ -137,9 +136,7 @@ export var Guidebanner = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     tooltipAlignment: "end",
     iconDescription: nextIconDescription,
     onClick: function onClick() {
-      scrollRef.current.scrollNext().then(function (scrollPercentage) {
-        return setScrollPosition(scrollPercentage);
-      });
+      scrollRef.current.scrollNext();
     }
   }))), onClose && /*#__PURE__*/React.createElement(Button, {
     className: "".concat(blockClass, "__close-button"),

package/es/global/js/package-settings.js

@@ -95,8 +95,6 @@ var defaults = {
   feature: {
     'a-new-feature': false,
     'default-portal-target-body': true,
-    'Datagrid.useExpandedRow': false,
-    'Datagrid.useNestedRows': false,
     'Datagrid.useInlineEdit': false,
     'Datagrid.useFiltering': false,
     'Datagrid.useCustomizeColumns': false,