@carbon/ibm-products 1.70.0 → 1.72.0

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

@@ -96,7 +96,7 @@ var stateReducer = function stateReducer(newState, action) {
         if (rows) {
           var newSelectedRowData = {};
           rows.forEach(function (row) {
-            newSelectedRowData[getRowId(row, row.index)] = row;
+            newSelectedRowData[getRowId(row.original, row.index)] = row.original;
           });
           return _objectSpread(_objectSpread({}, newState), {}, {
             selectedRowData: indeterminate || !isChecked ? {} : newSelectedRowData
@@ -115,7 +115,7 @@ var stateReducer = function stateReducer(newState, action) {
         }
         if (_isChecked) {
           return _objectSpread(_objectSpread({}, newState), {}, {
-            selectedRowData: _objectSpread(_objectSpread({}, newState.selectedRowData), {}, (0, _defineProperty2.default)({}, _getRowId(rowData, rowData.index), rowData))
+            selectedRowData: _objectSpread(_objectSpread({}, newState.selectedRowData), {}, (0, _defineProperty2.default)({}, _getRowId(rowData.original, rowData.index), rowData.original))
           });
         }
         if (rowData && !_isChecked) {
@@ -123,7 +123,7 @@ var stateReducer = function stateReducer(newState, action) {
           var dataWithRemovedRow = Object.fromEntries(Object.entries(newData).filter(function (_ref5) {
             var _ref6 = (0, _slicedToArray2.default)(_ref5, 1),
               key = _ref6[0];
-            return parseInt(key) !== parseInt(rowData.index);
+            return parseInt(key) !== parseInt(_getRowId(rowData.original, rowData.index));
           }));
           return _objectSpread(_objectSpread({}, newState), {}, {
             selectedRowData: dataWithRemovedRow
@@ -181,10 +181,7 @@ var stateReducer = function stateReducer(newState, action) {
         var currentColumn = {};
         currentColumn[_headerId2] = newState.columnResizing.columnWidths[_headerId2];
         var allChangedColumns = newState.columnResizing.columnWidths;
-        var isResizing = newState.isResizing;
-        if (isResizing) {
-          onColResizeEnd === null || onColResizeEnd === void 0 ? void 0 : onColResizeEnd(currentColumn, allChangedColumns);
-        }
+        onColResizeEnd === null || onColResizeEnd === void 0 ? void 0 : onColResizeEnd(currentColumn, allChangedColumns);
         if (!isKeyEvent) {
           if (typeof isKeyEvent === 'undefined') {
             // Blur resizer input if it has focus and is not from a key event resize

package/lib/components/Datagrid/useDisableSelectRows.js

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

package/lib/components/Datagrid/useFiltering.js

@@ -9,65 +9,62 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
-var _settings = require("../../settings");
 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 useFiltering = function useFiltering(hooks) {
-  (0, _react.useEffect)(function () {
-    _settings.pkg.checkReportFeatureEnabled('Datagrid.useFiltering');
-  }, []);
+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/useInfiniteScroll.js

@@ -10,7 +10,7 @@ var _debounce = _interopRequireDefault(require("lodash/debounce"));
 var _useParentDimensions = _interopRequireDefault(require("./useParentDimensions"));
 var _useResizeTable = _interopRequireDefault(require("./useResizeTable"));
 /**
- * Copyright IBM Corp. 2020, 2023
+ * Copyright IBM Corp. 2020, 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.
@@ -20,14 +20,18 @@ var useInfiniteScroll = function useInfiniteScroll(hooks) {
   (0, _useParentDimensions.default)(hooks);
   (0, _useResizeTable.default)(hooks);
   var useInstance = function useInstance(instance) {
+    var _tableElement;
     var isFetching = instance.isFetching,
       tableHeight = instance.tableHeight,
       innerListRef = instance.innerListRef,
       fetchMoreData = instance.fetchMoreData,
       tableId = instance.tableId,
       loadMoreThreshold = instance.loadMoreThreshold;
-    var tableElement = document.querySelector("#".concat(tableId));
-    var totalTableHeight = tableHeight || (tableElement === null || tableElement === void 0 ? void 0 : tableElement.clientHeight);
+    var tableElement;
+    if (typeof document !== 'undefined') {
+      tableElement = document.querySelector("#".concat(tableId));
+    }
+    var totalTableHeight = tableHeight || ((_tableElement = tableElement) === null || _tableElement === void 0 ? void 0 : _tableElement.clientHeight);
     var loadMoreThresholdValue = typeof loadMoreThreshold === 'number' ? loadMoreThreshold : 200;
     var emptyFetchData = function emptyFetchData() {};
     // eslint-disable-next-line react-hooks/exhaustive-deps

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/useSelectAllToggle.js

@@ -13,16 +13,15 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _commonColumnIds = require("./common-column-ids");
 var _DatagridSelectAllWithToggle = _interopRequireDefault(require("./Datagrid/DatagridSelectAllWithToggle"));
 var _settings = require("../../settings");
+var _hooks = require("../../global/js/hooks");
 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; }
-/*
- * Licensed Materials - Property of IBM
- * 5724-Q36
- * (c) Copyright IBM Corp. 2021
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
+/**
+ * Copyright IBM Corp. 2021, 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.
  */
-// @flow
 
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid__select-all");
 var useSelectAllToggle = function useSelectAllToggle(hooks) {
@@ -48,11 +47,12 @@ var useSelectAllWithToggleComponent = function useSelectAllWithToggleComponent(h
   hooks.useInstance.push(useInstance);
 };
 var useAddClassNameToSelectRow = function useAddClassNameToSelectRow(hooks) {
-  var _useState = (0, _react.useState)(window.innerWidth),
+  var _useState = (0, _react.useState)(0),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     windowSize = _useState2[0],
     setWindowSize = _useState2[1];
-  (0, _react.useLayoutEffect)(function () {
+  (0, _hooks.useIsomorphicEffect)(function () {
+    setWindowSize(window.innerWidth);
     function updateSize() {
       setWindowSize(window.innerWidth);
     }

package/lib/components/Datagrid/useSelectRows.js

@@ -90,7 +90,7 @@ var SelectRow = function SelectRow(datagridState) {
     withStickyColumn = datagridState.withStickyColumn,
     dispatch = datagridState.dispatch,
     getRowId = datagridState.getRowId;
-  var _useState = (0, _react.useState)(window.innerWidth),
+  var _useState = (0, _react.useState)(typeof window !== 'undefined' ? window.innerWidth : ''),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     windowSize = _useState2[0],
     setWindowSize = _useState2[1];
@@ -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/lib/components/Tearsheet/TearsheetShell.js

@@ -20,6 +20,7 @@ var _pconsole = _interopRequireDefault(require("../../global/js/utils/pconsole")
 var _carbonComponentsReact = require("carbon-components-react");
 var _ActionSet = require("../ActionSet");
 var _Wrap = require("../../global/js/utils/Wrap");
+var _useFocus2 = require("../../global/js/hooks/useFocus");
 var _excluded = ["actions", "children", "className", "closeIconDescription", "description", "hasCloseIcon", "headerActions", "influencer", "influencerPosition", "influencerWidth", "label", "navigation", "onClose", "open", "selectorPrimaryFocus", "size", "portalTarget", "title", "verticalPosition"];
 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; }
@@ -97,6 +98,9 @@ var TearsheetShell = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref)
   var modalRef = ref || localRef;
   var _useResizeObserver = (0, _useResizeObserver2.useResizeObserver)(resizer),
     width = _useResizeObserver.width;
+  var _useFocus = (0, _useFocus2.useFocus)(modalRef),
+    firstElement = _useFocus.firstElement,
+    keyDownListener = _useFocus.keyDownListener;
 
   // Keep track of the stack depth and our position in it (1-based, 0=closed)
   var _useState3 = (0, _react.useState)(0),
@@ -133,10 +137,7 @@ var TearsheetShell = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref)
 
   // Callback to give the tearsheet the opportunity to claim focus
   handleStackChange.claimFocus = function () {
-    var element = selectorPrimaryFocus ? modalRef.current.innerModal.current.querySelector(selectorPrimaryFocus) : modalRef.current.startSentinel.current;
-    setTimeout(function () {
-      return element.focus();
-    }, 1);
+    firstElement === null || firstElement === void 0 ? void 0 : firstElement.focus();
   };
   (0, _react.useEffect)(function () {
     var notify = function notify() {
@@ -204,6 +205,7 @@ var TearsheetShell = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref)
       open: open,
       selectorPrimaryFocus: selectorPrimaryFocus,
       onFocus: handleFocus,
+      onKeyDown: keyDownListener,
       preventCloseOnClickOutside: !isPassive,
       ref: modalRef,
       selectorsFloatingMenus: [".".concat(_settings.carbon.prefix, "--overflow-menu-options"), ".".concat(_settings.carbon.prefix, "--tooltip"), '.flatpickr-calendar', ".".concat(bc, "__container")],

package/lib/global/js/hooks/index.js

@@ -33,6 +33,12 @@ Object.defineProperty(exports, "useCreateComponentStepChange", {
     return _useCreateComponentStepChange.useCreateComponentStepChange;
   }
 });
+Object.defineProperty(exports, "useIsomorphicEffect", {
+  enumerable: true,
+  get: function get() {
+    return _useIsomorphicEffect.useIsomorphicEffect;
+  }
+});
 Object.defineProperty(exports, "useNearestScroll", {
   enumerable: true,
   get: function get() {
@@ -92,4 +98,5 @@ var _useResetCreateComponent = require("./useResetCreateComponent");
 var _useRetrieveStepData = require("./useRetrieveStepData");
 var _useValidCreateStepCount = require("./useValidCreateStepCount");
 var _useControllableState = require("./useControllableState");
-var _usePrefix = require("./usePrefix");
+var _usePrefix = require("./usePrefix");
+var _useIsomorphicEffect = require("./useIsomorphicEffect");

package/lib/global/js/hooks/useFocus.js

@@ -0,0 +1,79 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useFocus = void 0;
+var _settings = require("../../../settings");
+var _react = require("react");
+/**
+ * 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 useFocus = function useFocus(modalRef) {
+  var tearsheetBaseClass = "".concat(_settings.pkg.prefix, "--tearsheet");
+  // Querying focusable element in the modal
+  // Query to exclude hidden elements in the modal from querySelectorAll() method
+  // feel free to include more if needed :)
+  var notQuery = ":not(.".concat(_settings.carbon.prefix, "--visually-hidden,.").concat(tearsheetBaseClass, "__header--no-close-icon,.").concat(_settings.carbon.prefix, "--btn--disabled,[aria-hidden=\"true\"],[tabindex=\"-1\"])");
+  // Queries to include element types button, input, select, textarea
+  var queryButton = "button".concat(notQuery);
+  var queryInput = "input".concat(notQuery);
+  var querySelect = "select".concat(notQuery);
+  var queryTextarea = "textarea".concat(notQuery);
+  var queryLink = "[href]".concat(notQuery);
+  // Final query
+  var query = "".concat(queryButton, ",").concat(queryLink, ",").concat(queryInput, ",").concat(querySelect, ",").concat(queryTextarea);
+  var getFocusable = (0, _react.useCallback)(function () {
+    var _modalRef$current, _modalRef$current$inn, _modalRef$current$inn2;
+    // Selecting all focusable elements based on the above conditions
+    var focusableElements = modalRef === null || modalRef === void 0 ? void 0 : (_modalRef$current = modalRef.current) === null || _modalRef$current === void 0 ? void 0 : (_modalRef$current$inn = _modalRef$current.innerModal) === null || _modalRef$current$inn === void 0 ? void 0 : (_modalRef$current$inn2 = _modalRef$current$inn.current) === null || _modalRef$current$inn2 === void 0 ? void 0 : _modalRef$current$inn2.querySelectorAll("".concat(query));
+    var first = focusableElements === null || focusableElements === void 0 ? void 0 : focusableElements[0];
+    var last = focusableElements === null || focusableElements === void 0 ? void 0 : focusableElements[(focusableElements === null || focusableElements === void 0 ? void 0 : focusableElements.length) - 1];
+    var all = focusableElements;
+    return {
+      first: first,
+      last: last,
+      all: all
+    };
+  }, [modalRef, query]);
+  (0, _react.useEffect)(function () {
+    getFocusable();
+  }, [getFocusable]);
+  var handleKeyDown = function handleKeyDown(event) {
+    // Checking whether the key is tab or not
+    if (event.key === 'Tab') {
+      // updating the focusable elements list
+      var _getFocusable = getFocusable(),
+        first = _getFocusable.first,
+        last = _getFocusable.last,
+        all = _getFocusable.all;
+      event.persist();
+      setTimeout(function () {
+        var _document, _document2;
+        if (event.shiftKey && !Array.prototype.includes.call(all, (_document = document) === null || _document === void 0 ? void 0 : _document.activeElement)) {
+          // Prevents the default "Tab" behavior
+          event.preventDefault();
+          // if the user press shift+tab and the current element not in focusable items
+          last === null || last === void 0 ? void 0 : last.focus();
+        } else if (!Array.prototype.includes.call(all, (_document2 = document) === null || _document2 === void 0 ? void 0 : _document2.activeElement)) {
+          event.preventDefault();
+          // user pressing tab key only then
+          // focusing the first element if the current element is not in focusable items
+          first === null || first === void 0 ? void 0 : first.focus();
+        }
+      }, 0);
+    }
+  };
+  return {
+    firstElement: getFocusable().first,
+    lastElement: getFocusable().last,
+    allElements: getFocusable().all,
+    keyDownListener: handleKeyDown,
+    getFocusable: getFocusable
+  };
+};
+exports.useFocus = useFocus;

package/lib/global/js/hooks/useIsomorphicEffect.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useIsomorphicEffect = void 0;
+var _react = require("react");
+/**
+ * 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.
+ */
+
+// Originally from `@carbon/react`, https://github.com/carbon-design-system/carbon/blob/main/packages/react/src/internal/useIsomorphicEffect.js
+// useLayoutEffect on the client, useEffect on the server
+var useIsomorphicEffect = typeof window !== 'undefined' ? _react.useLayoutEffect : _react.useEffect;
+exports.useIsomorphicEffect = useIsomorphicEffect;

package/lib/global/js/package-settings.js

@@ -101,7 +101,6 @@ var defaults = {
     'a-new-feature': false,
     'default-portal-target-body': true,
     'Datagrid.useInlineEdit': false,
-    'Datagrid.useFiltering': false,
     'Datagrid.useCustomizeColumns': false,
     'ExampleComponent.secondaryIcon': false,
     'ExampleComponent.useExample': false

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "1.70.0",
+  "version": "1.72.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -20,7 +20,8 @@
     "css",
     "es",
     "lib",
-    "scss"
+    "scss",
+    "telemetry.yml"
   ],
   "keywords": [
     "carbon",
@@ -45,7 +46,7 @@
     "ci-check": "node scripts/import",
     "clean": "rimraf es lib css scss",
     "generate": "cross-env FORCE_COLOR=1 node scripts/generate",
-    "postinstall": "carbon-telemetry collect --install",
+    "postinstall": "ibmtelemetry --config=telemetry.yml",
     "test": "jest --colors",
     "//upgrade-dependencies": "# don't upgrade carbon (done globally), react/react-dom (explicit range peer dependency), chalk (issue #1596)",
     "upgrade-dependencies": "npm-check-updates -u --dep dev,peer,prod --color --reject '/(carbon|^react$|^react-dom$|^chalk$|^namor)/'"
@@ -72,10 +73,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@carbon/telemetry": "^0.1.0",
     "@dnd-kit/core": "^6.0.8",
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
+    "@ibm/telemetry-js": "^1.2.0",
     "framer-motion": "^6.5.1 <7",
     "immutability-helper": "^3.1.1",
     "lodash": "^4.17.21",
@@ -85,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": "6d7df818e1c885de18818e6a173eab60209186d8"
+  "gitHead": "56038c1f0af3f39489f7345600699857090d31c6"
 }

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

@@ -1,10 +1,9 @@
-/*
-* Licensed Materials - Property of IBM
-* 5724-Q36
-* (c) Copyright IBM Corp. 2022
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*/
+//
+// Copyright IBM Corp. 2022, 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.
+//
 
 @import '../variables';
 
@@ -35,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;
 }