@carbon/ibm-products 1.39.0 → 1.41.0

package/lib/components/Datagrid/Datagrid/DatagridContent.js

@@ -51,7 +51,8 @@ var DatagridContent = function DatagridContent(_ref) {
     withInlineEdit = datagridState.withInlineEdit,
     tableId = datagridState.tableId,
     DatagridActions = datagridState.DatagridActions,
-    totalColumnsWidth = datagridState.totalColumnsWidth;
+    totalColumnsWidth = datagridState.totalColumnsWidth,
+    gridRef = datagridState.gridRef;
   var rows = DatagridPagination && datagridState.page || datagridState.rows;
   var gridActive = state.gridActive,
     editId = state.editId;
@@ -91,7 +92,7 @@ var DatagridContent = function DatagridContent(_ref) {
       onFocus: withInlineEdit ? function () {
         return (0, _handleGridFocus.handleGridFocus)(state, dispatch);
       } : null
-    }), /*#__PURE__*/_react.default.createElement(_DatagridHead.default, datagridState), /*#__PURE__*/_react.default.createElement(_DatagridBody.default, (0, _extends2.default)({}, datagridState, {
+    }), !withVirtualScroll ? /*#__PURE__*/_react.default.createElement(_DatagridHead.default, datagridState) : null, /*#__PURE__*/_react.default.createElement(_DatagridBody.default, (0, _extends2.default)({}, datagridState, {
       rows: rows
     })));
   };
@@ -126,6 +127,9 @@ var DatagridContent = function DatagridContent(_ref) {
     className: "".concat(blockClass, "__datagridLeftPanel")
   }, leftPanel.panelContent), withInlineEdit ? /*#__PURE__*/_react.default.createElement("div", {
     ref: multiKeyTrackingRef
+  }, renderTable()) : withVirtualScroll ? /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(blockClass, "__virtualScrollContainer"),
+    ref: gridRef
   }, renderTable()) : renderTable())), (rows === null || rows === void 0 ? void 0 : rows.length) > 0 && !isFetching && DatagridPagination && /*#__PURE__*/_react.default.createElement(DatagridPagination, datagridState), CustomizeColumnsModal && /*#__PURE__*/_react.default.createElement(CustomizeColumnsModal, {
     instance: datagridState
   }));
@@ -150,6 +154,7 @@ DatagridContent.propTypes = {
     page: _propTypes.default.arrayOf(_propTypes.default.object),
     rows: _propTypes.default.arrayOf(_propTypes.default.object),
     tableId: _propTypes.default.string,
-    totalColumnsWidth: _propTypes.default.number
+    totalColumnsWidth: _propTypes.default.number,
+    gridRef: _propTypes.default.object
   })
 };

package/lib/components/Datagrid/Datagrid/DatagridEmptyBody.js

@@ -9,7 +9,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _react = _interopRequireDefault(require("react"));
 var _settings = require("../../../settings");
 var _carbonComponentsReact = require("carbon-components-react");
-var _NoDataEmptyState = require("../../EmptyStates/NoDataEmptyState");
+var _EmptyStates = require("../../EmptyStates");
 /*
  * Licensed Materials - Property of IBM
  * 5724-Q36
@@ -28,16 +28,29 @@ var DatagridEmptyBody = function DatagridEmptyBody(datagridState) {
     emptyStateTitle = datagridState.emptyStateTitle,
     emptyStateDescription = datagridState.emptyStateDescription,
     emptyStateSize = datagridState.emptyStateSize,
-    illustrationTheme = datagridState.illustrationTheme;
+    _datagridState$emptyS = datagridState.emptyStateType,
+    emptyStateType = _datagridState$emptyS === void 0 ? 'noData' : _datagridState$emptyS,
+    illustrationTheme = datagridState.illustrationTheme,
+    emptyStateAction = datagridState.emptyStateAction,
+    emptyStateLink = datagridState.emptyStateLink;
   return /*#__PURE__*/_react.default.createElement(TableBody, (0, _extends2.default)({}, getTableBodyProps(), {
     className: "".concat(blockClass, "__empty-state-body")
   }), /*#__PURE__*/_react.default.createElement(TableRow, null, /*#__PURE__*/_react.default.createElement(TableCell, {
     colSpan: headers.length
-  }, /*#__PURE__*/_react.default.createElement(_NoDataEmptyState.NoDataEmptyState, {
+  }, emptyStateType === 'error' && /*#__PURE__*/_react.default.createElement(_EmptyStates.ErrorEmptyState, {
     illustrationTheme: illustrationTheme,
     size: emptyStateSize,
     title: emptyStateTitle,
-    subtitle: emptyStateDescription
+    subtitle: emptyStateDescription,
+    action: emptyStateAction,
+    link: emptyStateLink
+  }), emptyStateType === 'noData' && /*#__PURE__*/_react.default.createElement(_EmptyStates.NoDataEmptyState, {
+    illustrationTheme: illustrationTheme,
+    size: emptyStateSize,
+    title: emptyStateTitle,
+    subtitle: emptyStateDescription,
+    action: emptyStateAction,
+    link: emptyStateLink
   }))));
 };
 var _default = DatagridEmptyBody;

package/lib/components/Datagrid/Datagrid/DatagridRow.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,17 +8,13 @@ exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _carbonComponentsReact = require("carbon-components-react");
 var _layout = require("@carbon/layout");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _commonColumnIds = require("../common-column-ids");
 var _settings = require("../../../settings");
-var _InlineEditContext = require("./addons/InlineEdit/InlineEditContext/InlineEditContext");
-var _getCellIdAsObject = require("./addons/InlineEdit/InlineEditContext/getCellIdAsObject");
 var _excluded = ["children"];
-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; }
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var TableRow = _carbonComponentsReact.DataTable.TableRow,
   TableCell = _carbonComponentsReact.DataTable.TableCell;
@@ -37,10 +32,6 @@ var DatagridRow = function DatagridRow(datagridState) {
   var row = datagridState.row,
     rowSize = datagridState.rowSize,
     withNestedRows = datagridState.withNestedRows;
-  var _useContext = (0, _react.useContext)(_InlineEditContext.InlineEditContext),
-    state = _useContext.state;
-  var activeCellId = state.activeCellId;
-  var activeCellObject = activeCellId && (0, _getCellIdAsObject.getCellIdAsObject)(activeCellId);
   var getVisibleNestedRowCount = function getVisibleNestedRowCount(_ref) {
     var isExpanded = _ref.isExpanded,
       subRows = _ref.subRows;
@@ -54,7 +45,7 @@ var DatagridRow = function DatagridRow(datagridState) {
     return size;
   };
   return /*#__PURE__*/_react.default.createElement(TableRow, (0, _extends2.default)({
-    className: (0, _classnames.default)("".concat(blockClass, "__carbon-row"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expandable"), row.canExpand), (0, _defineProperty2.default)(_cx, "".concat(_settings.carbon.prefix, "--data-table--selected"), row.isSelected), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-hover-active"), activeCellObject && row.index === activeCellObject.row), _cx))
+    className: (0, _classnames.default)("".concat(blockClass, "__carbon-row"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expandable"), row.canExpand), (0, _defineProperty2.default)(_cx, "".concat(_settings.carbon.prefix, "--data-table--selected"), row.isSelected), _cx))
   }, row.getRowProps(), {
     key: row.id,
     onMouseEnter: function onMouseEnter(event) {

package/lib/components/Datagrid/Datagrid/DatagridVirtualBody.js

@@ -12,6 +12,8 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactWindow = require("react-window");
 var _carbonComponentsReact = require("carbon-components-react");
 var _settings = require("../../../settings");
+var _DatagridHead = _interopRequireDefault(require("./DatagridHead"));
+var _layout = require("@carbon/layout");
 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; }
@@ -32,6 +34,7 @@ var rowSizeMap = {
 };
 var defaultRowHeight = rowSizeMap.lg;
 var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
+  var _gridRef$current, _gridRef$current2;
   var getTableBodyProps = datagridState.getTableBodyProps,
     rows = datagridState.rows,
     prepareRow = datagridState.prepareRow,
@@ -45,7 +48,14 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
     DatagridPagination = datagridState.DatagridPagination,
     page = datagridState.page,
     handleResize = datagridState.handleResize,
-    withOverflowRow = datagridState.withOverflowRow;
+    gridRef = datagridState.gridRef;
+  var syncScroll = function syncScroll(e) {
+    var virtualBody = e.target;
+    document.querySelector(".".concat(blockClass, "__head-warp")).scrollLeft = virtualBody.scrollLeft;
+    var spacerColumn = document.querySelector(".".concat(blockClass, "__head-warp thead th:last-child"));
+    spacerColumn.style.width = (0, _layout.px)(32 + (virtualBody.offsetWidth - virtualBody.clientWidth)); // scrollbar width to header column to fix header alignment
+  };
+
   (0, _react.useEffect)(function () {
     handleResize();
   }, [handleResize]);
@@ -54,8 +64,16 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
     listRef.current.resetAfterIndex(0);
   }
   var visibleRows = DatagridPagination && page || rows;
-  return /*#__PURE__*/_react.default.createElement(TableBody, (0, _extends2.default)({}, getTableBodyProps(), {
-    onScroll: onScroll
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(blockClass, "__head-warp"),
+    style: {
+      width: (_gridRef$current = gridRef.current) === null || _gridRef$current === void 0 ? void 0 : _gridRef$current.clientWidth,
+      overflow: 'hidden'
+    }
+  }, /*#__PURE__*/_react.default.createElement(_DatagridHead.default, datagridState)), /*#__PURE__*/_react.default.createElement(TableBody, (0, _extends2.default)({}, getTableBodyProps(), {
+    onScroll: function onScroll(e) {
+      return syncScroll(e);
+    }
   }), /*#__PURE__*/_react.default.createElement(_reactWindow.VariableSizeList, {
     height: virtualHeight || tableHeight,
     itemCount: visibleRows.length,
@@ -66,20 +84,21 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
     onScroll: onScroll,
     innerRef: innerListRef,
     ref: listRef,
-    className: "".concat(blockClass, "__virtual-scrollbar")
+    className: "".concat(blockClass, "__virtual-scrollbar"),
+    style: {
+      width: (_gridRef$current2 = gridRef.current) === null || _gridRef$current2 === void 0 ? void 0 : _gridRef$current2.clientWidth
+    }
   }, function (_ref) {
     var index = _ref.index,
       style = _ref.style;
     var row = visibleRows[index];
     prepareRow(row);
     return /*#__PURE__*/_react.default.createElement("div", {
-      style: _objectSpread(_objectSpread({}, style), {}, {
-        overflow: withOverflowRow ? 'visible' : 'hidden'
-      })
+      style: _objectSpread({}, style)
     }, row.RowRenderer(_objectSpread(_objectSpread({}, datagridState), {}, {
       row: row
     })));
-  }));
+  })));
 };
 var _default = DatagridVirtualBody;
 exports.default = _default;

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

@@ -48,12 +48,9 @@ var FilterFlyout = function FilterFlyout(_ref) {
     onApply = _ref$onApply === void 0 ? function () {} : _ref$onApply,
     _ref$onCancel = _ref.onCancel,
     onCancel = _ref$onCancel === void 0 ? function () {} : _ref$onCancel,
-    _ref$shouldClickOutsi = _ref.shouldClickOutsideToClose,
-    shouldClickOutsideToClose = _ref$shouldClickOutsi === void 0 ? false : _ref$shouldClickOutsi,
     _ref$secondaryActionL = _ref.secondaryActionLabel,
     secondaryActionLabel = _ref$secondaryActionL === void 0 ? 'Cancel' : _ref$secondaryActionL,
-    setAllFilters = _ref.setAllFilters,
-    setFilter = _ref.setFilter;
+    setAllFilters = _ref.setAllFilters;
   /** Context state and methods */
   var _useContext = (0, _react.useContext)(_FilterProvider.FilterContext),
     EventEmitter = _useContext.EventEmitter;
@@ -100,8 +97,11 @@ var FilterFlyout = function FilterFlyout(_ref) {
     prevFiltersObjectArrayRef.current = JSON.stringify(filtersObjectArray);
   };
   var cancel = function cancel() {
-    revertToPreviousFilters();
-    onCancel();
+    // Reverting to previous filters only applies when using batch actions
+    if (updateMethod === _constants.BATCH) {
+      revertToPreviousFilters();
+      onCancel();
+    }
     closeFlyout();
   };
   var reset = function reset() {
@@ -133,34 +133,32 @@ var FilterFlyout = function FilterFlyout(_ref) {
     if (type === _constants.DATE && !value[1]) {
       return;
     }
-    if (updateMethod === _constants.BATCH) {
-      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;
+    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
       });
+    }
+    setFiltersObjectArray(filtersObjectArrayCopy);
 
-      // 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
-        });
-      }
-      setFiltersObjectArray(filtersObjectArrayCopy);
-    } else if (updateMethod === _constants.INSTANT) {
-      setFilter(column, value);
+    // Automatically apply the filters if the updateMethod is instant
+    if (updateMethod === _constants.INSTANT) {
+      setAllFilters(filtersObjectArrayCopy);
     }
-  }, [setFilter, updateMethod, filtersObjectArray]);
+  }, [setAllFilters, updateMethod, filtersObjectArray]);
 
   /** Effects */
   (0, _hooks.useClickOutside)(filterFlyoutRef, function (target) {
-    if (shouldClickOutsideToClose === false) {
-      return;
-    }
     var hasClickedOnDatePicker = target.closest('.flatpickr-calendar');
     if (!open || hasClickedOnDatePicker) {
       return;
@@ -222,7 +220,7 @@ var FilterFlyout = function FilterFlyout(_ref) {
           key: option.labelText
         }, option, {
           onChange: function onChange(isSelected) {
-            var _components$option$on, _components$option;
+            var _option$onChange;
             var checkboxCopy = filtersState[column];
             var foundCheckbox = checkboxCopy.find(function (checkbox) {
               return checkbox.value === option.value;
@@ -234,7 +232,7 @@ var FilterFlyout = function FilterFlyout(_ref) {
               value: (0, _toConsumableArray2.default)(filtersState[column]),
               type: type
             });
-            (_components$option$on = (_components$option = components.option).onChange) === null || _components$option$on === void 0 ? void 0 : _components$option$on.call(_components$option, isSelected);
+            (_option$onChange = option.onChange) === null || _option$onChange === void 0 ? void 0 : _option$onChange.call(option, isSelected);
           },
           checked: option.selected
         }));
@@ -260,10 +258,11 @@ var FilterFlyout = function FilterFlyout(_ref) {
       })));
     } else if (type === _constants.DROPDOWN) {
       return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Dropdown, (0, _extends2.default)({}, components.Dropdown, {
+        selectedItem: filtersState[column],
         onChange: function onChange(_ref5) {
-          var _objectSpread6, _components$Dropdown$, _components$Dropdown;
+          var _components$Dropdown$, _components$Dropdown;
           var selectedItem = _ref5.selectedItem;
-          setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, (_objectSpread6 = {}, (0, _defineProperty2.default)(_objectSpread6, column, selectedItem), (0, _defineProperty2.default)(_objectSpread6, "type", type), _objectSpread6)));
+          setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, (0, _defineProperty2.default)({}, column, selectedItem)));
           applyFilters({
             column: column,
             value: selectedItem,
@@ -320,10 +319,6 @@ var FilterFlyout = function FilterFlyout(_ref) {
   }, renderFilters())), renderActionSet()));
 };
 FilterFlyout.propTypes = {
-  /**
-   * React children of carbon filters
-   */
-  children: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.node), _propTypes.default.node]).isRequired,
   /**
    * Array of filters to render
    */
@@ -364,14 +359,6 @@ FilterFlyout.propTypes = {
    * Function that sets all the filters, this comes from the datagridState
    */
   setAllFilters: _propTypes.default.func.isRequired,
-  /**
-   * Function that sets an individual filter, this comes from the datagridState
-   */
-  setFilter: _propTypes.default.func.isRequired,
-  /**
-   * Boolean if you want the flyout to close when clicked outside of the parent
-   */
-  shouldClickOutsideToClose: _propTypes.default.bool,
   /**
    * Title of the filter flyout
    */

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

@@ -1,12 +1,13 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
+var _typeof3 = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.InlineEditCell = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
@@ -20,12 +21,12 @@ var _InlineEditContext = require("../InlineEditContext");
 var _hooks = require("../../../../../../global/js/hooks");
 var _propsHelper = require("../../../../../../global/js/utils/props-helper");
 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 _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(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 blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var InlineEditCell = function InlineEditCell(_ref) {
-  var _config$validator, _cx3;
+  var _config$validator, _cx3, _value$text;
   var cell = _ref.cell,
     config = _ref.config,
     instance = _ref.instance,
@@ -251,6 +252,11 @@ var InlineEditCell = function InlineEditCell(_ref) {
       className: (0, _classnames.default)("".concat(blockClass, "__inline-edit--select-item"))
     }, item === null || item === void 0 ? void 0 : item.text)) : item === null || item === void 0 ? void 0 : item.text;
   };
+  var handleTransformedItem = function handleTransformedItem(items) {
+    return items !== null && items !== void 0 && items.length && (0, _typeof2.default)(items[0]) === 'object' ? function (item) {
+      return renderDropdownItem(item);
+    } : null;
+  };
   var renderSelectCell = function renderSelectCell() {
     var _ref5 = config || {},
       inputProps = _ref5.inputProps;
@@ -266,12 +272,8 @@ var InlineEditCell = function InlineEditCell(_ref) {
       className: (0, _classnames.default)("".concat(blockClass, "__inline-edit--select"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__inline-edit--select-").concat(rowSize), rowSize)),
       items: (inputProps === null || inputProps === void 0 ? void 0 : inputProps.items) || [],
       initialSelectedItem: cell.value,
-      itemToElement: function itemToElement(item) {
-        return renderDropdownItem(item);
-      },
-      renderSelectedItem: function renderSelectedItem(item) {
-        return renderDropdownItem(item);
-      },
+      itemToElement: handleTransformedItem(inputProps === null || inputProps === void 0 ? void 0 : inputProps.items),
+      renderSelectedItem: handleTransformedItem(inputProps === null || inputProps === void 0 ? void 0 : inputProps.items),
       onChange: function onChange(item) {
         var _inputProps$onChange;
         var newCellId = getNewCellId('Enter');
@@ -435,7 +437,7 @@ var InlineEditCell = function InlineEditCell(_ref) {
     }, !inEditMode && /*#__PURE__*/_react.default.createElement(_InlineEditButton.InlineEditButton, {
       isActiveCell: cellId === activeCellId,
       renderIcon: setRenderIcon(),
-      label: type === 'selection' ? value.text : type === 'date' ? buildDate(value) : value,
+      label: type === 'selection' ? (_value$text = value === null || value === void 0 ? void 0 : value.text) !== null && _value$text !== void 0 ? _value$text : value : type === 'date' ? buildDate(value) : value,
       labelIcon: (value === null || value === void 0 ? void 0 : value.icon) || null,
       placeholder: placeholder,
       tabIndex: tabIndex,

package/lib/components/Datagrid/Datagrid.stories/index.js

@@ -22,7 +22,7 @@ Object.defineProperty(exports, "RowSizeDropdownStory", {
     return _RowSizeDropdownStory.story;
   }
 });
-Object.defineProperty(exports, "SelectAllWitHToggle", {
+Object.defineProperty(exports, "SelectAllWithToggle", {
   enumerable: true,
   get: function get() {
     return _SelectAllWithToggleStory.story;

package/lib/components/Datagrid/useFiltering.js

@@ -60,7 +60,6 @@ var useFiltering = function useFiltering(hooks) {
   hooks.useInstance.push(function (instance) {
     var filterProps = instance.filterProps,
       setAllFilters = instance.setAllFilters,
-      setFilter = instance.setFilter,
       headers = instance.headers;
     var defaultProps = {
       variation: 'flyout'
@@ -68,7 +67,6 @@ var useFiltering = function useFiltering(hooks) {
     var getFilterFlyoutProps = function getFilterFlyoutProps() {
       return _objectSpread(_objectSpread(_objectSpread({}, defaultProps), filterProps), {}, {
         setAllFilters: setAllFilters,
-        setFilter: setFilter,
         headers: headers
       });
     };

package/lib/components/Datagrid/useParentDimensions.js

@@ -20,6 +20,7 @@ var useParentDimensions = function useParentDimensions(hooks) {
   var headRef = (0, _react.useRef)();
   var innerListRef = (0, _react.useRef)();
   var listRef = (0, _react.useRef)();
+  var gridRef = (0, _react.useRef)();
   var _useState = (0, _react.useState)(),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     tableHeight = _useState2[0],
@@ -55,7 +56,8 @@ var useParentDimensions = function useParentDimensions(hooks) {
       headRef: headRef,
       innerListRef: innerListRef,
       handleResize: handleResize,
-      listRef: listRef
+      listRef: listRef,
+      gridRef: gridRef
     });
   };
   hooks.useInstance.push(useInstance);

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

@@ -52,6 +52,10 @@ var ARG_TYPES = {
     control: 'select',
     options: ['sm', 'lg']
   },
+  emptyStateType: {
+    control: 'select',
+    options: ['error', 'noData']
+  },
   useDenseHeader: {
     control: {
       type: 'radio'
@@ -92,6 +96,11 @@ var ARG_TYPES = {
   customizeColumnsProps: {
     control: 'object',
     description: 'This is an object containing all of the props used with the column customization extension. _This value is set/passed inside of the `datagridState` object._'
+  },
+  filterProps: {
+    name: 'Filter props',
+    control: 'object',
+    description: 'This is an object for all the props passed into the filter flyout and filter panel'
   }
 };
 exports.ARG_TYPES = ARG_TYPES;

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

@@ -81,8 +81,13 @@ var getInlineEditColumns = function getInlineEditColumns() {
     accessor: 'visits',
     width: 120,
     inlineEdit: {
+      validator: function validator(n) {
+        return n && n < 10;
+      },
       type: 'number',
-      inputProps: {} // These props are passed to the Carbon component used for inline editing
+      inputProps: {
+        invalidText: 'Invalid number, must be 10 or greater'
+      } // These props are passed to the Carbon component used for inline editing
     }
   }, {
     Header: 'Active since',

package/lib/components/InlineEditV1/InlineEditV1.js

@@ -15,6 +15,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _devtools = require("../../global/js/utils/devtools");
+var _pconsole = _interopRequireDefault(require("../../global/js/utils/pconsole"));
 var _settings = require("../../settings");
 var _carbonComponentsReact = require("carbon-components-react");
 var _iconsReact = require("@carbon/icons-react");
@@ -34,7 +35,6 @@ var defaults = {
   size: 'md'
 };
 var buttons = ['cancel', 'edit', 'save'];
-console.warn('the v1 version of this component is being deprecated. please switch to the v2 component as soon as possible.');
 
 /**
  * TODO: A description of the component.
@@ -79,6 +79,7 @@ var InlineEditV1 = /*#__PURE__*/_react.default.forwardRef(function (_ref, refIn)
   var showValidation = invalid; // || warn;
   var validationText = invalidText; // || warnText;
   var validationIcon = showValidation ? /*#__PURE__*/_react.default.createElement(_iconsReact.WarningFilled16, null) : null;
+  _pconsole.default.warn("".concat(componentName, ": the v1 version of this component is being deprecated. please switch to the v2 component as soon as possible."));
 
   // sanitize the tooltip values
   var alignIsObject = (0, _typeof2.default)(buttonTooltipAlignment) === 'object';

package/lib/components/PageHeader/PageHeader.js

@@ -422,7 +422,7 @@ var PageHeader = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
     kind: "ghost",
     onClick: handleCollapseToggle,
     renderIcon: _iconsReact.ChevronUp16,
-    size: "field",
+    size: "md",
     tooltipPosition: "bottom",
     tooltipAlignment: "end",
     type: "button"

package/lib/components/RemoveModal/RemoveModal.js

@@ -18,7 +18,7 @@ var _devtools = require("../../global/js/utils/devtools");
 var _uuidv = _interopRequireDefault(require("../../global/js/utils/uuidv4"));
 var _settings = require("../../settings");
 var _hooks = require("../../global/js/hooks");
-var _excluded = ["body", "className", "iconDescription", "inputInvalidText", "inputLabelText", "inputPlaceholderText", "label", "onClose", "onRequestSubmit", "open", "preventCloseOnClickOutside", "primaryButtonText", "resourceName", "secondaryButtonText", "textConfirmation", "title"];
+var _excluded = ["body", "className", "iconDescription", "inputInvalidText", "inputLabelText", "inputPlaceholderText", "label", "onClose", "onRequestSubmit", "open", "preventCloseOnClickOutside", "primaryButtonDisabled", "primaryButtonText", "resourceName", "secondaryButtonText", "textConfirmation", "title"];
 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; }
@@ -36,6 +36,7 @@ var RemoveModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     onRequestSubmit = _ref.onRequestSubmit,
     open = _ref.open,
     preventCloseOnClickOutside = _ref.preventCloseOnClickOutside,
+    primaryButtonDisabled = _ref.primaryButtonDisabled,
     primaryButtonText = _ref.primaryButtonText,
     resourceName = _ref.resourceName,
     secondaryButtonText = _ref.secondaryButtonText,
@@ -53,7 +54,16 @@ var RemoveModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var onChangeHandler = function onChangeHandler(e) {
     setUserInput(e.target.value);
   };
-  var primaryButtonDisabled = textConfirmation && userInput !== resourceName;
+  var checkPrimaryButtonDisabled = function checkPrimaryButtonDisabled() {
+    // user control should be used primarily
+    if (primaryButtonDisabled) {
+      return true;
+    } else if (textConfirmation && userInput !== resourceName) {
+      return true;
+    }
+    return false;
+  };
+  var primaryButtonStatus = checkPrimaryButtonDisabled();
   var blockClass = "".concat(_settings.pkg.prefix, "--remove-modal");
 
   // Clear the user input this way so that if the onRequestSubmit handler fails for some reason
@@ -96,7 +106,7 @@ var RemoveModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     type: "submit",
     kind: "danger",
     onClick: onRequestSubmit,
-    disabled: primaryButtonDisabled
+    disabled: primaryButtonStatus
   }, primaryButtonText)));
 });
 
@@ -148,6 +158,10 @@ RemoveModal.propTypes = {
    * Prevent closing on click outside of modal
    */
   preventCloseOnClickOutside: _propTypes.default.bool,
+  /**
+   * Specify whether the primary button should be disabled. This value will override textConfirmation
+   */
+  primaryButtonDisabled: _propTypes.default.bool,
   /**
    * Specify the text for the primary button
    */

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

@@ -68,7 +68,8 @@ var defaults = {
     EditTearsheet: false,
     EditTearsheetNarrow: false,
     EditFullPage: false,
-    EditUpdateCards: false
+    EditUpdateCards: false,
+    ButtonMenu: false
     /* new component flags here - comment used by generate CLI */
   },
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "1.39.0",
+  "version": "1.41.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -95,5 +95,5 @@
     "react": "^16.8.6 || ^17.0.1",
     "react-dom": "^16.8.6 || ^17.0.1"
   },
-  "gitHead": "aa6bc71d9dc7286e586479f681a0de13ea58404b"
+  "gitHead": "e4bf28006ae17c6720e5142f6bafd8fe02586b00"
 }

package/scss/components/Datagrid/_storybook-styles.scss

@@ -101,3 +101,10 @@ $block-class: #{$pkg-prefix}--datagrid;
 .#{$block-class}__mobile-toolbar-modal .#{$carbon-prefix}--dropdown__wrapper {
   margin-bottom: $spacing-07;
 }
+
+.storybook-#{$block-class}__validation-code-snippet {
+  margin-right: $spacing-03;
+  // prevent code-snippet from inheriting font-size
+  // stylelint-disable-next-line carbon/type-token-use
+  font-size: 0;
+}