@carbon/ibm-products 1.22.0 → 1.23.0

package/lib/components/AddSelect/AddSelectList.js

@@ -21,16 +21,17 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _UserProfileImage = require("../UserProfileImage");
-
 var _settings = require("../../settings");
 
+var _UserProfileImage = require("../UserProfileImage");
+
 //
 // Copyright IBM Corp. 2022
 //
 // 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 blockClass = "".concat(_settings.pkg.prefix, "--add-select__selections");
 var componentName = 'AddSelectList';
 
 var AddSelectList = function AddSelectList(_ref) {
@@ -43,14 +44,13 @@ var AddSelectList = function AddSelectList(_ref) {
       multi = _ref.multi,
       multiSelection = _ref.multiSelection,
       navIconDescription = _ref.navIconDescription,
-      path = _ref.path,
+      parentId = _ref.parentId,
       setAppliedModifiers = _ref.setAppliedModifiers,
       setDisplayMetaPanel = _ref.setDisplayMetaPanel,
       setMultiSelection = _ref.setMultiSelection,
-      setPath = _ref.setPath,
+      setParentSelected = _ref.setParentSelected,
       setSingleSelection = _ref.setSingleSelection,
       singleSelection = _ref.singleSelection;
-  var blockClass = "".concat(_settings.pkg.prefix, "--add-select__selections");
   var hasModifiers = (modifiers === null || modifiers === void 0 ? void 0 : (_modifiers$options = modifiers.options) === null || _modifiers$options === void 0 ? void 0 : _modifiers$options.length) > 0;
 
   var handleSingleSelection = function handleSingleSelection(value) {
@@ -72,59 +72,8 @@ var AddSelectList = function AddSelectList(_ref) {
 
   var onNavigateItem = function onNavigateItem(_ref2) {
     var id = _ref2.id,
-        title = _ref2.title,
-        parent = _ref2.parent;
-
-    // if multi select
-    if (multi) {
-      // if top level reset the path
-      if (!parent) {
-        setPath([{
-          id: id,
-          title: title
-        }]);
-      } else {
-        var pathIds = path.map(function (p) {
-          return p.id;
-        }); // if item is already selected somewhere go back to that item
-
-        if (pathIds.includes(id)) {
-          var pathIdx = pathIds.findIndex(function (pathId) {
-            return pathId === id;
-          });
-          var newPath = (0, _toConsumableArray2.default)(path).splice(0, pathIdx + 1);
-          setPath((0, _toConsumableArray2.default)(newPath));
-        } else {
-          // if the item is on the same level as another selected item start from the parent level
-          if (path.find(function (p) {
-            return p.parent === parent;
-          })) {
-            var parentIdx = path.findIndex(function (p) {
-              return p.id === parent;
-            });
-
-            var _newPath = (0, _toConsumableArray2.default)(path).splice(0, parentIdx + 1);
-
-            setPath([].concat((0, _toConsumableArray2.default)(_newPath), [{
-              id: id,
-              title: title,
-              parent: parent
-            }]));
-          } else {
-            setPath([].concat((0, _toConsumableArray2.default)(path), [{
-              id: id,
-              title: title,
-              parent: parent
-            }]));
-          }
-        }
-      }
-    } else {
-      setPath([].concat((0, _toConsumableArray2.default)(path), [{
-        id: id,
-        title: title
-      }]));
-    }
+        title = _ref2.title;
+    setParentSelected(id, title, parentId);
   };
 
   var isSelected = function isSelected(id) {
@@ -220,6 +169,7 @@ var AddSelectList = function AddSelectList(_ref) {
       },
       selected: item.id === singleSelection
     }), item.children && /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
+      className: "".concat(blockClass, "-view-children"),
       renderIcon: _iconsReact.ChevronRight16,
       iconDescription: navIconDescription,
       tooltipPosition: "left",
@@ -233,6 +183,7 @@ var AddSelectList = function AddSelectList(_ref) {
     }), item.meta && /*#__PURE__*/_react.default.createElement("div", {
       className: "".concat(blockClass, "-hidden-hover")
     }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
+      className: "".concat(blockClass, "-view-meta"),
       renderIcon: _iconsReact.View16,
       iconDescription: metaIconDescription,
       tooltipPosition: "left",
@@ -256,11 +207,11 @@ AddSelectList.propTypes = {
   multi: _propTypes.default.bool,
   multiSelection: _propTypes.default.array,
   navIconDescription: _propTypes.default.string,
-  path: _propTypes.default.array,
+  parentId: _propTypes.default.string,
   setAppliedModifiers: _propTypes.default.func,
   setDisplayMetaPanel: _propTypes.default.func,
   setMultiSelection: _propTypes.default.func,
-  setPath: _propTypes.default.func,
+  setParentSelected: _propTypes.default.func,
   setSingleSelection: _propTypes.default.func,
   singleSelection: _propTypes.default.string
 };

package/lib/components/AddSelect/AddSelectMetaPanel.js

@@ -23,6 +23,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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, "--add-select__meta-panel");
 var componentName = 'AddSelectMetaPanel';
 
 var AddSelectMetaPanel = function AddSelectMetaPanel(_ref) {
@@ -30,7 +31,6 @@ var AddSelectMetaPanel = function AddSelectMetaPanel(_ref) {
       meta = _ref.meta,
       setDisplayMetaPanel = _ref.setDisplayMetaPanel,
       title = _ref.title;
-  var blockClass = "".concat(_settings.pkg.prefix, "--add-select__meta-panel");
 
   var onCloseHandler = function onCloseHandler() {
     setDisplayMetaPanel({});

package/lib/components/AddSelect/AddSelectSidebar.js

@@ -24,6 +24,7 @@ var _settings = require("../../settings");
 var _AddSelectMetaPanel = require("./AddSelectMetaPanel");
 
 var _excluded = ["meta", "icon", "avatar"];
+var blockClass = "".concat(_settings.pkg.prefix, "--add-select__sidebar");
 var componentName = 'AddSelectSidebar';
 
 var AddSelectSidebar = function AddSelectSidebar(_ref) {
@@ -42,7 +43,6 @@ var AddSelectSidebar = function AddSelectSidebar(_ref) {
       removeIconDescription = _ref.removeIconDescription,
       setDisplayMetaPanel = _ref.setDisplayMetaPanel,
       setMultiSelection = _ref.setMultiSelection;
-  var blockClass = "".concat(_settings.pkg.prefix, "--add-select__sidebar");
   var hasModifiers = (modifiers === null || modifiers === void 0 ? void 0 : (_modifiers$options = modifiers.options) === null || _modifiers$options === void 0 ? void 0 : _modifiers$options.length) > 0;
   var hasSelections = multiSelection.length > 0;
 
@@ -53,19 +53,26 @@ var AddSelectSidebar = function AddSelectSidebar(_ref) {
     setMultiSelection(newSelections);
   };
 
-  var sidebarItems = multiSelection.reduce(function (acc, cur) {
-    var selectedItem = items.find(function (item) {
-      return item.id === cur;
-    }); // certain properties should not be displayed in the sidebar
+  var getNewItem = function getNewItem(item) {
+    // certain properties should not be displayed in the sidebar
     // eslint-disable-next-line no-unused-vars
+    var meta = item.meta,
+        icon = item.icon,
+        avatar = item.avatar,
+        newItem = (0, _objectWithoutProperties2.default)(item, _excluded);
+    return newItem;
+  };
+
+  var sidebarItems = multiSelection.map(function (selectionId) {
+    if (Array.isArray(items)) {
+      var selectedItem = items.find(function (item) {
+        return item.id === selectionId;
+      });
+      return getNewItem(selectedItem);
+    }
 
-    var meta = selectedItem.meta,
-        icon = selectedItem.icon,
-        avatar = selectedItem.avatar,
-        newItem = (0, _objectWithoutProperties2.default)(selectedItem, _excluded);
-    acc.push(newItem);
-    return acc;
-  }, []);
+    return getNewItem(items[selectionId]);
+  });
 
   var getTitle = function getTitle(item) {
     return /*#__PURE__*/_react.default.createElement("div", {
@@ -140,7 +147,7 @@ AddSelectSidebar.propTypes = {
   closeIconDescription: _propTypes.default.string,
   displayMetalPanel: _propTypes.default.object,
   influencerTitle: _propTypes.default.string,
-  items: _propTypes.default.array,
+  items: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.array]),
   metaPanelTitle: _propTypes.default.string,
   modifiers: _propTypes.default.object,
   multiSelection: _propTypes.default.array,

package/lib/components/AddSelect/AddSelectSort.js

@@ -25,13 +25,13 @@ var _settings = require("../../settings");
 // 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 componentName = 'AddSelect';
+var blockClass = "".concat(_settings.pkg.prefix, "--add-select-sort");
+var componentName = 'AddSelectSort';
 
 var AddSelectSort = function AddSelectSort(_ref) {
   var setSortAttribute = _ref.setSortAttribute,
       setSortDirection = _ref.setSortDirection,
       sortBy = _ref.sortBy;
-  var blockClass = "".concat(_settings.pkg.prefix, "--add-select-sort");
   var sortByOpts = sortBy ? sortBy.reduce(function (acc, cur) {
     var opts = [{
       id: "".concat(cur, "-asc"),

package/lib/components/AddSelect/add-select-utils.js

@@ -5,74 +5,39 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.sortItems = exports.normalize = exports.getSortBy = exports.getGlobalFilterValues = exports.flatten = void 0;
+exports.sortItems = exports.normalize = exports.getGlobalFilterValues = exports.getFilteredItems = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
-var _excluded = ["children"],
-    _excluded2 = ["children"];
+var _excluded = ["children"];
 
 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; }
 
 /**
- * used to normalize nested data into a single object
- * @param {Array} items - list of entries
- * @returns an object of normalized item data
+ * to be able to more easily and efficiently the child entries the data needs to be
+ * normalized. this function recursively goes through the data array to build a single
+ * object who's keys are the id's of every single entry
+ * @param {object} data
+ * @returns an object of normalized data
  */
-var normalize = function normalize(items) {
-  var entries = items.entries,
-      parentId = items.parentId,
-      sortBy = items.sortBy,
-      filterBy = items.filterBy;
-  return entries.reduce(function (acc, cur) {
+var normalize = function normalize(data) {
+  var items = data.entries.reduce(function (prev, cur) {
     var children = cur.children,
-        entry = (0, _objectWithoutProperties2.default)(cur, _excluded);
-    acc[cur.id] = _objectSpread({}, entry);
-
-    if (parentId) {
-      acc[cur.id].parent = parentId;
-    }
-
-    if (sortBy !== null && sortBy !== void 0 && sortBy.length) {
-      acc[cur.id].sortBy = sortBy;
-    }
-
-    if (filterBy) {
-      acc[cur.id].filterBy = filterBy;
-    }
+        item = (0, _objectWithoutProperties2.default)(cur, _excluded);
+    prev[item.id] = item;
 
     if (children) {
-      acc[cur.id].children = children.entries.map(function (child) {
-        return child.id;
-      });
-      var child = normalize(_objectSpread(_objectSpread({}, children), {}, {
-        parentId: cur.id
-      }));
-      return _objectSpread(_objectSpread({}, acc), child);
+      var childItems = normalize(children);
+      return _objectSpread(_objectSpread({}, prev), childItems);
     }
 
-    return acc;
+    return prev;
   }, {});
-};
-/**
- * used to create a single searchable array of nested items
- * @param {Array} entries - list of entries
- * @returns an array of items
- */
-
-
-exports.normalize = normalize;
-
-var flatten = function flatten(entries) {
-  return entries.reduce(function (prev, cur) {
-    var children = cur.children,
-        item = (0, _objectWithoutProperties2.default)(cur, _excluded2);
-    return prev.concat(item).concat(children ? flatten(children.entries) : []);
-  }, []);
+  return items;
 };
 /**
  * takes in a global filters array and a flat list of items
@@ -86,26 +51,28 @@ var flatten = function flatten(entries) {
  */
 
 
-exports.flatten = flatten;
+exports.normalize = normalize;
 
 var getGlobalFilterValues = function getGlobalFilterValues(globalFilters, items) {
-  var filterOpts = globalFilters.reduce(function (prevFilter, curFilter) {
+  var itemIds = Object.keys(items);
+  var results = globalFilters.reduce(function (prevFilter, curFilter) {
     var filterId = curFilter.id;
-    var opts = items.reduce(function (prevItem, curItem) {
+    var filterOpts = itemIds.reduce(function (prevId, curId) {
+      var curItem = items[curId];
       var value = curItem[filterId];
 
-      if (value && !prevItem.includes(value)) {
-        prevItem.push(value);
+      if (value && !prevId.includes(value)) {
+        prevId.push(value);
       }
 
-      return prevItem;
+      return prevId;
     }, []);
     prevFilter.push(_objectSpread({
-      opts: opts
+      opts: filterOpts
     }, curFilter));
     return prevFilter;
   }, []);
-  return filterOpts;
+  return results;
 };
 
 exports.getGlobalFilterValues = getGlobalFilterValues;
@@ -127,12 +94,69 @@ var sortItems = function sortItems(attribute, direction) {
 
 exports.sortItems = sortItems;
 
-var getSortBy = function getSortBy(items) {
-  var _items$find;
+var getFilteredItems = function getFilteredItems(useNormalizedItems, normalizedItems, searchTerm, globalFiltersApplied, globalFilterKeys, appliedGlobalFilters, sortFn, multi, items, path) {
+  /**
+   * useNormalizedItems just specifies if the data is hierarchical. the data structure
+   * is an object and not an array.
+   */
+  if (useNormalizedItems) {
+    var itemIds = Object.keys(normalizedItems);
+
+    if (searchTerm || globalFiltersApplied) {
+      var results = itemIds.reduce(function (prev, cur) {
+        if (normalizedItems[cur].title.toLowerCase().includes(searchTerm)) {
+          prev.push(normalizedItems[cur]);
+        }
+
+        return prev;
+      }, []).filter(function (item) {
+        return globalFilterKeys.every(function (filter) {
+          return item[filter] === appliedGlobalFilters[filter];
+        });
+      }).sort(sortFn);
+      return results;
+    }
+    /**
+     * multi select with hierarchy requires special consideration because columns
+     * are built recursively, so the items are just returned
+     */
+
+
+    if (multi) {
+      return items;
+    }
+    /**
+     * because single add select with hierarchy isn't recursively built the data
+     * structure has to be built around the path to maintain the folder structure
+     */
+
+
+    if (path.length > 1) {
+      return path.reduce(function (prev, cur, curIdx) {
+        var _prev$find, _prev$find$children;
+
+        // because the root of the path never changes we can skip it
+        if (curIdx === 0) {
+          return prev;
+        }
+
+        var item = (_prev$find = prev.find(function (item) {
+          return item.id === cur.id;
+        })) === null || _prev$find === void 0 ? void 0 : (_prev$find$children = _prev$find.children) === null || _prev$find$children === void 0 ? void 0 : _prev$find$children.entries;
+        return item;
+      }, items.entries);
+    }
+
+    return items.entries;
+  } else {
+    if (searchTerm) {
+      return items.entries.filter(function (item) {
+        return item.title.toLowerCase().includes(searchTerm);
+      });
+    }
 
-  return (_items$find = items.find(function (item) {
-    return item.sortBy;
-  })) === null || _items$find === void 0 ? void 0 : _items$find.sortBy;
+    return items.entries;
+  }
 };
 
-exports.getSortBy = getSortBy;
+exports.getFilteredItems = getFilteredItems;

package/lib/components/AddSelect/hooks/useParentSelect.js

@@ -0,0 +1,27 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = require("react");
+
+var useParentSelect = function useParentSelect() {
+  var _useState = (0, _react.useState)(null),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      parentSelected = _useState2[0],
+      setParentSelected = _useState2[1];
+
+  return {
+    parentSelected: parentSelected,
+    setParentSelected: setParentSelected
+  };
+};
+
+var _default = useParentSelect;
+exports.default = _default;

package/lib/components/AddSelect/hooks/usePath.js

@@ -0,0 +1,75 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = require("react");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+var usePath = function usePath() {
+  var itemsLabel = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+
+  var _useState = (0, _react.useState)([{
+    id: 'base_of_path',
+    title: itemsLabel
+  }]),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      path = _useState2[0],
+      setPath = _useState2[1];
+
+  var handler = function handler(id, title, parentId) {
+    if (path.find(function (entry) {
+      return entry.id === id;
+    })) {
+      return;
+    }
+
+    var pathEntry = _objectSpread({
+      id: id,
+      title: title
+    }, parentId && {
+      parentId: parentId
+    });
+
+    if (path.find(function (entry) {
+      return entry.parentId === parentId;
+    })) {
+      var parentIdx = path.findIndex(function (entry) {
+        return entry.id === parentId;
+      });
+      var pathCopy = (0, _toConsumableArray2.default)(path);
+      pathCopy.length = parentIdx + 1;
+      setPath([].concat((0, _toConsumableArray2.default)(pathCopy), [pathEntry]));
+    } else {
+      setPath([].concat((0, _toConsumableArray2.default)(path), [pathEntry]));
+    }
+  };
+
+  var pathClickHandler = function pathClickHandler(idx) {
+    var pathCopy = (0, _toConsumableArray2.default)(path);
+    pathCopy.length = idx + 1;
+    setPath((0, _toConsumableArray2.default)(pathCopy));
+  };
+
+  return {
+    path: path,
+    setPath: handler,
+    pathOnclick: pathClickHandler
+  };
+};
+
+var _default = usePath;
+exports.default = _default;

package/lib/components/CreateTearsheet/preview-components/MultiStepTearsheet.js

@@ -204,11 +204,7 @@ var MultiStepTearsheet = function MultiStepTearsheet(_ref2) {
     },
     invalid: isInvalid,
     invalidText: "This is a required field",
-    onBlur: function onBlur() {
-      if (!stepOneTextInputValue.length) {
-        setIsInvalid(true);
-      }
-    }
+    onBlur: function onBlur() {}
   }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.TextInput, {
     labelText: "Topic description (optional)",
     id: "tearsheet-multi-step-story-text-input-multi-step-1-input-2",

package/lib/components/CreateTearsheet/preview-components/MultiStepWithIntro.js

@@ -226,11 +226,7 @@ var MultiStepWithIntro = function MultiStepWithIntro(_ref) {
     },
     invalid: isInvalid,
     invalidText: "This is a required field",
-    onBlur: function onBlur() {
-      if (!stepOneTextInputValue.length) {
-        setIsInvalid(true);
-      }
-    }
+    onBlur: function onBlur() {}
   }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.TextInput, {
     labelText: "Topic description (optional)",
     id: "tearsheet-multi-step-story-text-input-multi-step-1-input-2",

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

@@ -81,7 +81,7 @@ var Datagrid = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
     ref: ref,
     className: (0, _classnames.default)(className, blockClass, withVirtualScroll ? "".concat(blockClass, "__datagridWrap") : "".concat(blockClass, "__datagridWrap-simple"), !isFetching && rows.length === 0 ? "".concat(blockClass, "__empty-state") : '')
   }, (0, _devtools.getDevtoolsProps)(componentName)), /*#__PURE__*/_react.default.createElement(_DatagridToolbar.default, datagridState), leftPanel && /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(blockClass, "__grid-container ").concat(blockClass, "__displayFlex")
+    className: "".concat(blockClass, "__grid-container ").concat(blockClass, "__displayFlex ").concat(blockClass, "__leftPanel-position")
   }, leftPanel && leftPanel.isOpen && /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "__datagridLeftPanel")
   }, leftPanel.panelContent), /*#__PURE__*/_react.default.createElement("div", {

package/lib/components/Datagrid/useExpandedRow.js

@@ -2,6 +2,8 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _typeof = require("@babel/runtime/helpers/typeof");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -11,23 +13,37 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
-var _react = require("react");
+var _react = _interopRequireWildcard(require("react"));
 
 var _DatagridExpandedRow = _interopRequireDefault(require("./Datagrid/DatagridExpandedRow"));
 
 var _useRowExpander = _interopRequireDefault(require("./useRowExpander"));
 
+var _settings = require("../../settings");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
+var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
+
+var expansionRenderer = function expansionRenderer(_ref) {
+  var row = _ref.row;
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(blockClass, "__expanded-row-content")
+  }, "Content for ", row.id);
+};
+
 var useExpandedRow = function useExpandedRow(hooks) {
   (0, _useRowExpander.default)(hooks);
 
   var useInstance = function useInstance(instance) {
     var rows = instance.rows,
-        expandedContentHeight = instance.expandedContentHeight,
-        ExpandedRowContentComponent = instance.ExpandedRowContentComponent;
+        expandedContentHeight = instance.expandedContentHeight;
 
     var _useState = (0, _react.useState)({}),
         _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -42,7 +58,7 @@ var useExpandedRow = function useExpandedRow(hooks) {
       return _objectSpread(_objectSpread({}, row), {}, {
         canExpand: row.original && !row.original.notExpandable,
         expandedContentHeight: expandedRowsHeight[row.index] || expandedContentHeight,
-        RowRenderer: (0, _DatagridExpandedRow.default)(row.RowRenderer, ExpandedRowContentComponent)
+        RowRenderer: (0, _DatagridExpandedRow.default)(row.RowRenderer, expansionRenderer)
       });
     });
     Object.assign(instance, {

package/lib/components/PageHeader/PageHeaderUtils.js

@@ -128,6 +128,11 @@ var utilCheckUpdateVerticalSpace = function utilCheckUpdateVerticalSpace(headerR
     if (!enableBreadcrumbScroll || !navigation) {
       // adjust sticky top if no navigation or breadcrumb is to stay on screen
       update.headerTopValue += update.breadcrumbRowHeight;
+    }
+
+    if (enableBreadcrumbScroll) {
+      // adjust header top value when scroll enabled for breadcrumb
+      update.headerTopValue -= navigation ? hasActionBar ? 0 : 10 : update.headerHeight;
     } // if (window) {