@carbon/ibm-products 1.8.0 → 1.11.0

package/es/components/AddSelect/AddSelect.js

@@ -2,14 +2,14 @@ import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["className", "description", "influencerTitle", "inputPlaceholder", "items", "itemsLabel", "multi", "noResultsDescription", "noResultsTitle", "noSelectionDescription", "noSelectionTitle", "onClose", "onCloseButtonText", "onSearchFilter", "onSubmit", "onSubmitButtonText", "open", "removeIconDescription", "textInputLabel", "title"];
+var _excluded = ["className", "columnInputPlaceholder", "description", "influencerTitle", "inputPlaceholder", "items", "itemsLabel", "multi", "noResultsDescription", "noResultsTitle", "noSelectionDescription", "noSelectionTitle", "onClose", "onCloseButtonText", "onSearchFilter", "onSubmit", "onSubmitButtonText", "open", "removeIconDescription", "textInputLabel", "title"];
 //
 // 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.
 //
-import React, { forwardRef, useState } from 'react';
+import React, { forwardRef, useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { TextInput, Tag } from 'carbon-components-react';
@@ -19,20 +19,18 @@ import { pkg } from '../../settings';
 import { AddSelectSidebar } from './AddSelectSidebar';
 import { AddSelectBreadcrumbs } from './AddSelectBreadcrumbs';
 import { AddSelectList } from './AddSelectList';
-var componentName = 'AddSelect'; // Default values for props
-
-var defaults = {
-  items: Object.freeze([])
-};
+import { AddSelectColumn } from './AddSelectColumn';
+import { normalize, flatten } from './add-select-utils';
+var componentName = 'AddSelect';
 export var AddSelect = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var _cx;
 
   var className = _ref.className,
+      columnInputPlaceholder = _ref.columnInputPlaceholder,
       description = _ref.description,
       influencerTitle = _ref.influencerTitle,
       inputPlaceholder = _ref.inputPlaceholder,
-      _ref$items = _ref.items,
-      items = _ref$items === void 0 ? defaults.items : _ref$items,
+      items = _ref.items,
       itemsLabel = _ref.itemsLabel,
       multi = _ref.multi,
       noResultsDescription = _ref.noResultsDescription,
@@ -70,15 +68,76 @@ export var AddSelect = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var _useState7 = useState(''),
       _useState8 = _slicedToArray(_useState7, 2),
       searchTerm = _useState8[0],
-      setSearchTerm = _useState8[1]; // handlers
+      setSearchTerm = _useState8[1];
 
+  var _useState9 = useState({}),
+      _useState10 = _slicedToArray(_useState9, 2),
+      normalizedItems = _useState10[0],
+      setNormalizedItems = _useState10[1];
 
-  var handleSearch = function handleSearch(e) {
-    setSearchTerm(e.target.value);
+  var _useState11 = useState(false),
+      _useState12 = _slicedToArray(_useState11, 2),
+      useNormalizedItems = _useState12[0],
+      setUsedNormalizedItems = _useState12[1];
+
+  var _useState13 = useState([]),
+      _useState14 = _slicedToArray(_useState13, 2),
+      sidebarItems = _useState14[0],
+      setSidebarItems = _useState14[1];
+
+  useEffect(function () {
+    var entries = items.entries;
+    setSidebarItems(flatten(entries)); // multi select with nested data needs to be normalized
+
+    if (multi && entries.find(function (entry) {
+      return entry.children;
+    })) {
+      var newItems = normalize(items);
+      setNormalizedItems(newItems);
+      setUsedNormalizedItems(true);
+    }
+  }, [items, multi]); // used to generate columns of results for multi select with hierarchy
+
+  var getPages = function getPages() {
+    var pages = [];
+    var itemIds = Object.keys(normalizedItems); // top level items are just items with no parents so they're the top results
+
+    var topLevelItems = [];
+    itemIds.forEach(function (itemId) {
+      if (!normalizedItems[itemId].parent) {
+        topLevelItems.push(normalizedItems[itemId]);
+      }
+    });
+    pages.push(topLevelItems);
+
+    if (path.length) {
+      /**
+       * the path is set when you initially traverse the child entries
+       * path is an array of item id's
+       * when a path is present the normalized items are searched
+       * any item who's has a matching parent id is added to the results
+       * in the end you have an array of arrays for each column of the hierarchy
+       */
+      var pathIds = path.map(function (p) {
+        return p.id;
+      });
+      pathIds.forEach(function (pathId) {
+        var entries = [];
+        itemIds.forEach(function (itemId) {
+          if (normalizedItems[itemId].parent === pathId) {
+            entries.push(normalizedItems[itemId]);
+          }
+        });
+        pages.push(entries);
+      });
+    }
+
+    return pages;
   }; // item filtering
 
 
   var getFilteredItems = function getFilteredItems() {
+    var entries = items.entries;
     var hasPath = path.length > 0;
     /**
      * how to traverse the levels of items-
@@ -87,10 +146,12 @@ export var AddSelect = /*#__PURE__*/forwardRef(function (_ref, ref) {
      */
 
     var itemsToFilter = hasPath ? path.reduce(function (prev, cur) {
-      return prev.find(function (item) {
+      var _prev$find, _prev$find$children;
+
+      return (_prev$find = prev.find(function (item) {
         return item.id === cur.id;
-      }).children;
-    }, items) : items;
+      })) === 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;
+    }, entries) : entries;
     var results = itemsToFilter.filter(function (item) {
       if (!searchTerm) {
         return item;
@@ -105,32 +166,11 @@ export var AddSelect = /*#__PURE__*/forwardRef(function (_ref, ref) {
       return item.title.toLowerCase().includes(searchTerm);
     });
     return results;
-  };
+  }; // only multi select with hierarchy requires the the normalized items
 
-  var filteredItems = getFilteredItems(); // main content
 
-  var body = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(blockClass, "__header")
-  }, /*#__PURE__*/React.createElement(TextInput, {
-    id: "temp-id",
-    labelText: textInputLabel,
-    placeholder: inputPlaceholder,
-    value: searchTerm,
-    onChange: handleSearch
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(blockClass, "__items-label-container")
-  }, path.length ? /*#__PURE__*/React.createElement(AddSelectBreadcrumbs, {
-    itemsLabel: itemsLabel,
-    path: path,
-    setPath: setPath
-  }) : /*#__PURE__*/React.createElement("p", {
-    className: "".concat(blockClass, "__items-label")
-  }, itemsLabel), /*#__PURE__*/React.createElement(Tag, {
-    type: "gray",
-    size: "sm",
-    className: "".concat(blockClass, "__items-label-tag")
-  }, filteredItems.length))), filteredItems.length > 0 ? /*#__PURE__*/React.createElement(AddSelectList, {
-    filteredItems: filteredItems,
+  var itemsToDisplay = useNormalizedItems ? getPages() : getFilteredItems();
+  var commonListProps = {
     multi: multi,
     multiSelection: multiSelection,
     path: path,
@@ -138,12 +178,16 @@ export var AddSelect = /*#__PURE__*/forwardRef(function (_ref, ref) {
     setPath: setPath,
     setSingleSelection: setSingleSelection,
     singleSelection: singleSelection
-  }) : /*#__PURE__*/React.createElement("div", {
-    className: "".concat(blockClass, "__body")
-  }, /*#__PURE__*/React.createElement(NoDataEmptyState, {
-    subtitle: noResultsDescription,
-    title: noResultsTitle
-  })));
+  }; // handlers
+
+  var handleSearch = function handleSearch(e) {
+    setSearchTerm(e.target.value);
+  };
+
+  var submitHandler = function submitHandler() {
+    onSubmit(multi ? multiSelection : singleSelection);
+  };
+
   var commonTearsheetProps = {
     open: open,
     title: title,
@@ -156,20 +200,59 @@ export var AddSelect = /*#__PURE__*/forwardRef(function (_ref, ref) {
     }, {
       label: onSubmitButtonText,
       kind: 'primary',
-      onClick: onSubmit,
+      onClick: submitHandler,
       disabled: multi ? multiSelection.length === 0 : !singleSelection
     }]
   };
   var sidebarProps = {
     influencerTitle: influencerTitle,
-    items: items,
+    items: sidebarItems,
     multiSelection: multiSelection,
     noSelectionDescription: noSelectionDescription,
     noSelectionTitle: noSelectionTitle,
     removeIconDescription: removeIconDescription,
     setMultiSelection: setMultiSelection
   };
-  var classNames = cx(className, blockClass, (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__single"), !multi), _defineProperty(_cx, "".concat(blockClass, "__multi"), multi), _cx));
+  var classNames = cx(className, blockClass, (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__single"), !multi), _defineProperty(_cx, "".concat(blockClass, "__multi"), multi), _cx)); // main content
+
+  var body = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(blockClass, "__header")
+  }, /*#__PURE__*/React.createElement(TextInput, {
+    id: "temp-id",
+    labelText: textInputLabel,
+    placeholder: inputPlaceholder,
+    value: searchTerm,
+    onChange: handleSearch
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(blockClass, "__tag-container")
+  }, path.length ? /*#__PURE__*/React.createElement(AddSelectBreadcrumbs, {
+    itemsLabel: itemsLabel,
+    path: path,
+    setPath: setPath
+  }) : /*#__PURE__*/React.createElement("p", {
+    className: "".concat(blockClass, "__tag-container-label")
+  }, itemsLabel), !useNormalizedItems && /*#__PURE__*/React.createElement(Tag, {
+    type: "gray",
+    size: "sm"
+  }, itemsToDisplay.length))), useNormalizedItems ? /*#__PURE__*/React.createElement("div", {
+    className: "".concat(blockClass, "__columns")
+  }, itemsToDisplay.map(function (page, idx) {
+    var _path;
+
+    return /*#__PURE__*/React.createElement(AddSelectColumn, _extends({}, commonListProps, {
+      key: idx,
+      filteredItems: page,
+      header: idx === 0 ? itemsLabel : (_path = path[idx - 1]) === null || _path === void 0 ? void 0 : _path.title,
+      columnInputPlaceholder: columnInputPlaceholder
+    }));
+  })) : /*#__PURE__*/React.createElement("div", null, itemsToDisplay.length > 0 ? /*#__PURE__*/React.createElement(AddSelectList, _extends({}, commonListProps, {
+    filteredItems: itemsToDisplay
+  })) : /*#__PURE__*/React.createElement("div", {
+    className: "".concat(blockClass, "__body")
+  }, /*#__PURE__*/React.createElement(NoDataEmptyState, {
+    subtitle: noResultsDescription,
+    title: noResultsTitle
+  }))));
   return /*#__PURE__*/React.createElement("div", _extends({
     ref: ref,
     className: classNames
@@ -180,14 +263,20 @@ export var AddSelect = /*#__PURE__*/forwardRef(function (_ref, ref) {
 });
 AddSelect.propTypes = {
   className: PropTypes.string,
+  columnInputPlaceholder: PropTypes.string,
   description: PropTypes.string,
   influencerTitle: PropTypes.string,
   inputPlaceholder: PropTypes.string,
-  items: PropTypes.arrayOf(PropTypes.shape({
-    id: PropTypes.string.isRequired,
-    title: PropTypes.string.isRequired,
-    value: PropTypes.string.isRequired
-  })),
+  items: PropTypes.shape({
+    sortBy: PropTypes.array,
+    filterBy: PropTypes.array,
+    entries: PropTypes.arrayOf(PropTypes.shape({
+      id: PropTypes.string.isRequired,
+      title: PropTypes.string.isRequired,
+      value: PropTypes.string.isRequired,
+      children: PropTypes.object
+    }))
+  }),
   itemsLabel: PropTypes.string,
   multi: PropTypes.bool,
   noResultsDescription: PropTypes.string,
@@ -204,4 +293,9 @@ AddSelect.propTypes = {
   textInputLabel: PropTypes.string,
   title: PropTypes.string
 };
+AddSelect.defaultProps = {
+  items: {
+    entries: []
+  }
+};
 AddSelect.displayName = componentName;

package/es/components/AddSelect/AddSelectBreadcrumbs.js

@@ -15,12 +15,12 @@ export var AddSelectBreadcrumbs = function AddSelectBreadcrumbs(_ref) {
       setPath = _ref.setPath;
 
   var clickHandler = function clickHandler(id) {
-    var newPath = _toConsumableArray(path);
-
-    var pathIdx = newPath.findIndex(function (entry) {
+    var pathIdx = path.findIndex(function (entry) {
       return entry.id === id;
     });
-    var finalPath = newPath.splice(0, pathIdx + 1);
+
+    var finalPath = _toConsumableArray(path).splice(0, pathIdx + 1);
+
     setPath(finalPath);
   };
 

package/es/components/AddSelect/AddSelectColumn.js

@@ -0,0 +1,195 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["columnInputPlaceholder", "filteredItems", "header"];
+//
+// 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.
+//
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { TextInput, Tag, OverflowMenu, OverflowMenuItem, Checkbox } from 'carbon-components-react';
+import { Filter32, ArrowsVertical32, ArrowUp16, ArrowDown16 } from '@carbon/icons-react';
+import { pkg, carbon } from '../../settings';
+import { AddSelectList } from './AddSelectList';
+import uuidv4 from '../../global/js/utils/uuidv4';
+var componentName = 'AddSelect';
+export var AddSelectColumn = function AddSelectColumn(_ref) {
+  var _filteredItems$find, _filteredItems$find2;
+
+  var columnInputPlaceholder = _ref.columnInputPlaceholder,
+      filteredItems = _ref.filteredItems,
+      header = _ref.header,
+      props = _objectWithoutProperties(_ref, _excluded);
+
+  var _useState = useState(''),
+      _useState2 = _slicedToArray(_useState, 2),
+      searchTerm = _useState2[0],
+      setSearchTerm = _useState2[1];
+
+  var _useState3 = useState(''),
+      _useState4 = _slicedToArray(_useState3, 2),
+      sortDirection = _useState4[0],
+      setSortDirection = _useState4[1];
+
+  var _useState5 = useState(''),
+      _useState6 = _slicedToArray(_useState5, 2),
+      sortAttribute = _useState6[0],
+      setSortAttribute = _useState6[1];
+
+  var _useState7 = useState([]),
+      _useState8 = _slicedToArray(_useState7, 2),
+      filters = _useState8[0],
+      setFilters = _useState8[1];
+
+  var blockClass = "".concat(pkg.prefix, "--add-select");
+  var colClass = "".concat(blockClass, "__column"); // sorting
+
+  var colSortBy = (_filteredItems$find = filteredItems.find(function (item) {
+    return item.sortBy;
+  })) === null || _filteredItems$find === void 0 ? void 0 : _filteredItems$find.sortBy;
+  var sortByOpts = colSortBy ? colSortBy.reduce(function (acc, cur) {
+    var opts = [{
+      id: "".concat(cur, "-asc"),
+      itemText: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ArrowUp16, null), cur),
+      direction: 'asc',
+      attribute: cur
+    }, {
+      id: "".concat(cur, "-desc"),
+      itemText: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ArrowDown16, null), cur),
+      direction: 'desc',
+      attribute: cur
+    }];
+    return [].concat(_toConsumableArray(acc), opts);
+  }, []) : []; // filtering
+
+  var colFilterBy = (_filteredItems$find2 = filteredItems.find(function (item) {
+    return item.filterBy;
+  })) === null || _filteredItems$find2 === void 0 ? void 0 : _filteredItems$find2.filterBy;
+  var filterByOpts = colFilterBy ? filteredItems.map(function (item) {
+    return item[colFilterBy];
+  }) : []; // handlers
+
+  var sortHandler = function sortHandler(_ref2) {
+    var direction = _ref2.direction,
+        attribute = _ref2.attribute;
+    setSortAttribute(attribute);
+    setSortDirection(direction);
+  };
+
+  var filterHandler = function filterHandler(checked, opt) {
+    if (checked) {
+      var newFilters = [].concat(_toConsumableArray(filters), [opt]);
+      setFilters(newFilters);
+    } else {
+      var _newFilters = filters.filter(function (o) {
+        return o !== opt;
+      });
+
+      setFilters(_newFilters);
+    }
+  }; // filter and sort array functions
+
+
+  var filterBySearch = function filterBySearch(item) {
+    return item.title.toLowerCase().includes(searchTerm);
+  };
+
+  var filterByAttribute = function filterByAttribute(item) {
+    if (filters.length === 0) {
+      return true;
+    }
+
+    var filterBy = item.filterBy;
+    var filterByValue = item[filterBy];
+    return filters.some(function (filter) {
+      return filter === filterByValue;
+    });
+  };
+
+  var sortItems = function sortItems(a, b) {
+    var _a$sortAttribute, _b$sortAttribute;
+
+    var valueA = (_a$sortAttribute = a[sortAttribute]) === null || _a$sortAttribute === void 0 ? void 0 : _a$sortAttribute.split(' ').join('');
+    var valueB = (_b$sortAttribute = b[sortAttribute]) === null || _b$sortAttribute === void 0 ? void 0 : _b$sortAttribute.split(' ').join('');
+
+    if (sortDirection === 'desc') {
+      return valueA > valueB ? -1 : 1;
+    }
+
+    return valueA < valueB ? -1 : 1;
+  };
+
+  var colItems = filteredItems.filter(filterBySearch) // first check if the item meets the search
+  .filter(filterByAttribute) // then check if the item is included in the filter
+  .sort(sortItems); // then sort the items by whatever criteria
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: colClass
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(colClass, "-search-bar")
+  }, /*#__PURE__*/React.createElement(TextInput, {
+    value: searchTerm,
+    onChange: function onChange(e) {
+      return setSearchTerm(e.target.value);
+    },
+    light: true,
+    placeholder: columnInputPlaceholder,
+    className: "".concat(colClass, "-input"),
+    id: uuidv4(),
+    labelText: columnInputPlaceholder
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(colClass, "-sort-filter")
+  }, sortByOpts.length > 0 && /*#__PURE__*/React.createElement(OverflowMenu, {
+    renderIcon: ArrowsVertical32,
+    className: "".concat(colClass, "-overflow"),
+    flipped: true
+  }, sortByOpts.map(function (opt) {
+    return /*#__PURE__*/React.createElement(OverflowMenuItem, {
+      key: opt.id,
+      itemText: opt.itemText,
+      onClick: function onClick() {
+        return sortHandler(opt);
+      }
+    });
+  })), filterByOpts.length > 0 && /*#__PURE__*/React.createElement(OverflowMenu, {
+    renderIcon: Filter32,
+    className: "".concat(colClass, "-overflow"),
+    flipped: true
+  }, filterByOpts.map(function (opt) {
+    return /*#__PURE__*/React.createElement("div", {
+      key: opt,
+      className: "".concat(carbon.prefix, "--overflow-menu-options__option")
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "".concat(carbon.prefix, "--overflow-menu-options__btn")
+    }, /*#__PURE__*/React.createElement(Checkbox, {
+      id: opt,
+      labelText: opt,
+      onChange: function onChange(checked) {
+        return filterHandler(checked, opt);
+      },
+      checked: filters.find(function (o) {
+        return o === opt;
+      }) ? true : false
+    })));
+  })))), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(blockClass, "__tag-container")
+  }, /*#__PURE__*/React.createElement("p", {
+    className: "".concat(blockClass, "__tag-container-label")
+  }, header), /*#__PURE__*/React.createElement(Tag, {
+    type: "gray",
+    size: "sm"
+  }, colItems.length)), /*#__PURE__*/React.createElement(AddSelectList, _extends({}, props, {
+    inColumn: true,
+    filteredItems: colItems
+  })));
+};
+AddSelectColumn.propTypes = {
+  columnInputPlaceholder: PropTypes.string,
+  filteredItems: PropTypes.array,
+  header: PropTypes.string
+};
+AddSelectColumn.displayName = componentName;

package/es/components/AddSelect/AddSelectList.js

@@ -13,6 +13,7 @@ import { pkg } from '../../settings';
 var componentName = 'AddSelectList';
 export var AddSelectList = function AddSelectList(_ref) {
   var filteredItems = _ref.filteredItems,
+      inColumn = _ref.inColumn,
       multi = _ref.multi,
       multiSelection = _ref.multiSelection,
       path = _ref.path,
@@ -41,11 +42,61 @@ export var AddSelectList = function AddSelectList(_ref) {
 
   var onNavigateItem = function onNavigateItem(_ref2) {
     var id = _ref2.id,
-        title = _ref2.title;
-    setPath([].concat(_toConsumableArray(path), [{
-      id: id,
-      title: title
-    }]));
+        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 = _toConsumableArray(path).splice(0, pathIdx + 1);
+
+          setPath(_toConsumableArray(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 = _toConsumableArray(path).splice(0, parentIdx + 1);
+
+            setPath([].concat(_toConsumableArray(_newPath), [{
+              id: id,
+              title: title,
+              parent: parent
+            }]));
+          } else {
+            setPath([].concat(_toConsumableArray(path), [{
+              id: id,
+              title: title,
+              parent: parent
+            }]));
+          }
+        }
+      }
+    } else {
+      setPath([].concat(_toConsumableArray(path), [{
+        id: id,
+        title: title
+      }]));
+    }
   };
 
   return /*#__PURE__*/React.createElement("div", {
@@ -55,15 +106,22 @@ export var AddSelectList = function AddSelectList(_ref) {
     className: "".concat(blockClass)
   }, /*#__PURE__*/React.createElement(StructuredListBody, null, filteredItems.map(function (item) {
     return /*#__PURE__*/React.createElement(StructuredListRow, {
-      key: item.id
-    }, /*#__PURE__*/React.createElement(StructuredListCell, null, /*#__PURE__*/React.createElement("div", {
+      key: item.id,
+      className: "".concat(blockClass, "-row")
+    }, /*#__PURE__*/React.createElement(StructuredListCell, {
+      className: "".concat(blockClass, "-cell")
+    }, /*#__PURE__*/React.createElement("div", {
       className: "".concat(blockClass, "-cell-wrapper")
     }, multi ? /*#__PURE__*/React.createElement(Checkbox, {
       className: "".concat(blockClass, "-checkbox"),
       onChange: function onChange(value) {
         return handleMultiSelection(item.id, value);
       },
-      labelText: item.title,
+      labelText: !inColumn ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
+        className: "".concat(blockClass, "-cell-title")
+      }, item.title), /*#__PURE__*/React.createElement("span", {
+        className: "".concat(blockClass, "-cell-subtitle")
+      }, item.subtitle)) : item.title,
       id: item.id,
       checked: multiSelection.includes(item.id)
     }) : /*#__PURE__*/React.createElement(RadioButton, {
@@ -83,6 +141,7 @@ export var AddSelectList = function AddSelectList(_ref) {
 };
 AddSelectList.propTypes = {
   filteredItems: PropTypes.array,
+  inColumn: PropTypes.bool,
   multi: PropTypes.bool,
   multiSelection: PropTypes.array,
   path: PropTypes.array,

package/es/components/AddSelect/AddSelectSidebar.js

@@ -1,5 +1,3 @@
-import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["children"];
 //
 // Copyright IBM Corp. 2022
 //
@@ -28,21 +26,10 @@ export var AddSelectSidebar = function AddSelectSidebar(_ref) {
       return v !== id;
     });
     setMultiSelection(newSelections);
-  }; // utility to flatten the list of items and their children into a single searchable array
-
-
-  var flattenItems = function flattenItems(arr) {
-    return arr.reduce(function (prev, cur) {
-      var children = cur.children,
-          item = _objectWithoutProperties(cur, _excluded);
-
-      return prev.concat(item).concat(children ? flattenItems(children) : []);
-    }, []);
   };
 
-  var flattenedItems = flattenItems(items);
   var sidebarItems = multiSelection.map(function (selectedId) {
-    return flattenedItems.find(function (item) {
+    return items.find(function (item) {
       return item.id === selectedId;
     });
   });
@@ -53,7 +40,13 @@ export var AddSelectSidebar = function AddSelectSidebar(_ref) {
         id = _ref2.id;
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(blockClass, "-accordion-title")
-    }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("p", null, title), /*#__PURE__*/React.createElement("p", null, subtitle)), /*#__PURE__*/React.createElement(Button, {
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "".concat(blockClass, "-selected-item")
+    }, /*#__PURE__*/React.createElement("p", {
+      className: "".concat(blockClass, "-selected-item-title")
+    }, title), /*#__PURE__*/React.createElement("p", {
+      className: "".concat(blockClass, "-selected-item-subtitle")
+    }, subtitle)), /*#__PURE__*/React.createElement(Button, {
       renderIcon: SubtractAlt32,
       iconDescription: removeIconDescription,
       hasIconOnly: true,