@carbon/ibm-products 1.15.0 → 1.18.0

package/es/components/SidePanel/SidePanel.js

@@ -272,13 +272,17 @@ export var SidePanel = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
 
       var actionToolbarElement = document.querySelector(".".concat(blockClass, "__action-toolbar"));
 
+      var _labelText = document.querySelector(".".concat(blockClass, "__label-text"));
+
       var _sidePanelSubtitleElementHeight = (_sidePanelSubtitleElement === null || _sidePanelSubtitleElement === void 0 ? void 0 : _sidePanelSubtitleElement.offsetHeight) || 0;
 
       var sidePanelActionBarElementHeight = (actionToolbarElement === null || actionToolbarElement === void 0 ? void 0 : actionToolbarElement.offsetHeight) || 0;
       var titleHeight = (_sidePanelTitleElement === null || _sidePanelTitleElement === void 0 ? void 0 : _sidePanelTitleElement.offsetHeight) + 24;
+      var labelHeight = (_labelText === null || _labelText === void 0 ? void 0 : _labelText.offsetHeight) || 0;
       _sidePanelOuter === null || _sidePanelOuter === void 0 ? void 0 : _sidePanelOuter.style.setProperty("--".concat(blockClass, "--title-text-height"), "".concat(titleHeight, "px"));
       _sidePanelOuter === null || _sidePanelOuter === void 0 ? void 0 : _sidePanelOuter.style.setProperty("--".concat(blockClass, "--subtitle-container-height"), "".concat(_sidePanelSubtitleElementHeight, "px"));
       _sidePanelOuter === null || _sidePanelOuter === void 0 ? void 0 : _sidePanelOuter.style.setProperty("--".concat(blockClass, "--action-bar-container-height"), "".concat(sidePanelActionBarElementHeight, "px"));
+      _sidePanelOuter === null || _sidePanelOuter === void 0 ? void 0 : _sidePanelOuter.style.setProperty("--".concat(blockClass, "--label-text-height"), "".concat(labelHeight, "px"));
     }
   }, [open, animateTitle, animationComplete, shouldRender, panelHeight, title, size, reducedMotion.matches]); // click outside functionality if `includeOverlay` prop is set
 
@@ -492,7 +496,7 @@ export var SidePanel = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     className: "".concat(blockClass, "__visually-hidden")
   }, "Focus sentinel"), !animateTitle && renderHeader(), /*#__PURE__*/React.createElement("div", {
     ref: sidePanelInnerRef,
-    className: cx("".concat(blockClass, "__inner-content"), (_cx4 = {}, _defineProperty(_cx4, "".concat(blockClass, "__static-inner-content"), !animateTitle), _defineProperty(_cx4, "".concat(blockClass, "__inner-content-with-actions"), actions && actions.length), _cx4))
+    className: cx("".concat(blockClass, "__inner-content"), (_cx4 = {}, _defineProperty(_cx4, "".concat(blockClass, "__static-inner-content"), !animateTitle), _defineProperty(_cx4, "".concat(blockClass, "__static-inner-content-no-actions"), !animateTitle && !(actions !== null && actions !== void 0 && actions.length)), _defineProperty(_cx4, "".concat(blockClass, "__inner-content-with-actions"), actions && actions.length), _cx4))
   }, animateTitle && renderHeader(), /*#__PURE__*/React.createElement("div", {
     className: "".concat(blockClass, "__body-content")
   }, children), /*#__PURE__*/React.createElement(ActionSet, {

package/es/components/WebTerminal/WebTerminal.js

@@ -22,7 +22,8 @@ import cx from 'classnames';
 import { pkg } from '../../settings'; // Carbon and package components we use.
 
 import { Close16 as Close, Help16 as Help } from '@carbon/icons-react';
-import { Button, OverflowMenu, OverflowMenuItem } from 'carbon-components-react'; // The block part of our conventional BEM class names (blockClass__E--M).
+import { Button, OverflowMenu, OverflowMenuItem } from 'carbon-components-react';
+import { moderate02 } from '@carbon/motion'; // The block part of our conventional BEM class names (blockClass__E--M).
 
 var componentName = 'WebTerminal';
 var blockClass = "".concat(pkg.prefix, "--web-terminal"); // Default values for props
@@ -33,7 +34,7 @@ var defaults = {
   documentationLinksIconDescription: 'Show documentation links'
 };
 export var WebTerminal = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
-  var _ref2;
+  var _ref3;
 
   var _ref$actions = _ref.actions,
       actions = _ref$actions === void 0 ? defaults.actions : _ref$actions,
@@ -53,6 +54,12 @@ export var WebTerminal = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       shouldRender = _useState2[0],
       setRender = _useState2[1];
 
+  var _ref2 = window && window.matchMedia ? window.matchMedia('(prefers-reduced-motion: reduce)') : {
+    matches: true
+  },
+      prefersReducedMotion = _ref2.matches;
+
+  var webTerminalAnimationName = "".concat(open ? 'web-terminal-entrance' : 'web-terminal-exit', " ").concat(moderate02);
   var showDocumentationLinks = useMemo(function () {
     return documentationLinks.length > 0;
   }, [documentationLinks]);
@@ -61,6 +68,9 @@ export var WebTerminal = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       setRender(true);
     }
   }, [open]);
+  /** 
+    When the web terminal slide in animation is complete, sets render to false.
+  */
 
   var onAnimationEnd = function onAnimationEnd() {
     if (!open) {
@@ -68,11 +78,23 @@ export var WebTerminal = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     }
   };
 
+  var handleCloseTerminal = function handleCloseTerminal() {
+    /** 
+      If the user prefers reduced motion, we have to manually set render to false
+      because onAnimationEnd will never be called.
+    */
+    if (prefersReducedMotion) {
+      setRender(false);
+    }
+
+    closeTerminal();
+  };
+
   return shouldRender ? /*#__PURE__*/React.createElement("div", _extends({}, rest, {
     ref: ref,
-    className: cx([className, blockClass, (_ref2 = {}, _defineProperty(_ref2, "".concat(blockClass, "--open"), open), _defineProperty(_ref2, "".concat(blockClass, "--closed"), !open), _ref2)]),
+    className: cx([className, blockClass, (_ref3 = {}, _defineProperty(_ref3, "".concat(blockClass, "--open"), open), _defineProperty(_ref3, "".concat(blockClass, "--closed"), !open), _ref3)]),
     style: {
-      animation: "".concat(open ? 'web-terminal-entrance 250ms' : 'web-terminal-exit 250ms')
+      animation: !prefersReducedMotion && webTerminalAnimationName
     },
     onAnimationEnd: onAnimationEnd
   }), /*#__PURE__*/React.createElement("header", {
@@ -84,16 +106,16 @@ export var WebTerminal = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     iconDescription: documentationLinksIconDescription,
     menuOptionsClass: "".concat(blockClass, "__documentation-overflow"),
     size: "lg"
-  }, documentationLinks.map(function (_ref3, i) {
-    var rest = _extends({}, _ref3);
+  }, documentationLinks.map(function (_ref4, i) {
+    var rest = _extends({}, _ref4);
 
     return /*#__PURE__*/React.createElement(OverflowMenuItem, _extends({
       key: i
     }, rest));
-  })), actions.map(function (_ref4) {
-    var renderIcon = _ref4.renderIcon,
-        onClick = _ref4.onClick,
-        iconDescription = _ref4.iconDescription;
+  })), actions.map(function (_ref5) {
+    var renderIcon = _ref5.renderIcon,
+        onClick = _ref5.onClick,
+        iconDescription = _ref5.iconDescription;
     return /*#__PURE__*/React.createElement(Button, {
       key: iconDescription,
       hasIconOnly: true,
@@ -107,7 +129,10 @@ export var WebTerminal = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     renderIcon: Close,
     kind: "ghost",
     iconDescription: closeIconDescription,
-    onClick: closeTerminal
+    onClick: handleCloseTerminal,
+    onAnimationEnd: function onAnimationEnd(event) {
+      return event.stopPropagation();
+    }
   })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(blockClass, "__body")
   }, children)) : null;

package/es/components/WebTerminal/WebTerminalContentWrapper.js

@@ -0,0 +1,49 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["children", "isTerminalOpen"];
+
+/**
+ * Copyright IBM Corp. 2020, 2021
+ *
+ * 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 portions of React that are needed.
+import React from 'react'; // Other standard imports.
+
+import PropTypes from 'prop-types';
+import cx from 'classnames';
+import { pkg } from '../../settings'; // The block part of our conventional BEM class names (blockClass__E--M).
+
+var componentName = 'WebTerminalContentWrapper';
+var blockClass = "".concat(pkg.prefix, "--web-terminal-content-wrapper");
+export var WebTerminalContentWrapper = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
+  var children = _ref.children,
+      isTerminalOpen = _ref.isTerminalOpen,
+      rest = _objectWithoutProperties(_ref, _excluded);
+
+  return /*#__PURE__*/React.createElement("div", _extends({
+    ref: ref,
+    className: cx([blockClass, _defineProperty({}, "".concat(blockClass, "--open"), isTerminalOpen)])
+  }, rest), children);
+}); // Return a placeholder if not released and not enabled by feature flag
+
+WebTerminalContentWrapper = pkg.checkComponentEnabled(WebTerminalContentWrapper, componentName); // The display name of the component, used by React. Note that displayName
+// is used in preference to relying on function.name.
+
+WebTerminalContentWrapper.displayName = componentName; // The types and DocGen commentary for the component props,
+// in alphabetical order (for consistency).
+// See https://www.npmjs.com/package/prop-types#usage.
+
+WebTerminalContentWrapper.propTypes = {
+  /**
+   * Pass in content as children.
+   */
+  children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]).isRequired,
+
+  /**
+   * A boolean to determine if the terminal is open.
+   */
+  isTerminalOpen: PropTypes.bool.isRequired
+};

package/es/components/WebTerminal/index.js

@@ -1 +1,2 @@
-export { WebTerminal } from './WebTerminal';
+export { WebTerminal } from './WebTerminal';
+export { WebTerminalContentWrapper } from './WebTerminalContentWrapper';

package/es/components/index.js

@@ -32,7 +32,7 @@ export { TagSet } from './TagSet';
 export { Tearsheet, TearsheetNarrow } from './Tearsheet';
 export { Toolbar, ToolbarButton, ToolbarGroup } from './Toolbar';
 export { UserProfileImage } from './UserProfileImage';
-export { WebTerminal } from './WebTerminal';
+export { WebTerminal, WebTerminalContentWrapper } from './WebTerminal';
 export { EditSidePanel } from './EditSidePanel';
 export { OptionsTile } from './OptionsTile';
 export { InlineEdit } from './InlineEdit';

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

@@ -60,6 +60,7 @@ var defaults = {
     ToolbarButton: false,
     ToolbarGroup: false,
     WebTerminal: false,
+    WebTerminalContentWrapper: false,
     EditSidePanel: false,
     CancelableTextEdit: false,
     InlineEdit: false,

package/lib/components/AddSelect/AddSelect.js

@@ -43,7 +43,11 @@ var _addSelectUtils = require("./add-select-utils");
 
 var _AddSelectFilter = require("./AddSelectFilter");
 
-var _excluded = ["className", "columnInputPlaceholder", "description", "globalFilters", "globalFiltersIconDescription", "globalFiltersPlaceholderText", "globalFiltersPrimaryButtonText", "globalFiltersSecondaryButtonText", "globalSearchLabel", "globalSearchPlaceholder", "influencerTitle", "items", "itemsLabel", "multi", "noResultsDescription", "noResultsTitle", "noSelectionDescription", "noSelectionTitle", "onClose", "onCloseButtonText", "onSubmit", "onSubmitButtonText", "open", "portalTarget", "removeIconDescription", "searchResultsLabel", "title"];
+var _AddSelectSort = require("./AddSelectSort");
+
+var _useItemSort2 = require("./hooks/useItemSort");
+
+var _excluded = ["className", "clearFiltersText", "columnInputPlaceholder", "description", "globalFilters", "globalFiltersIconDescription", "globalFiltersPlaceholderText", "globalFiltersPrimaryButtonText", "globalFiltersSecondaryButtonText", "globalSearchLabel", "globalSearchPlaceholder", "globalSortBy", "influencerTitle", "items", "itemsLabel", "multi", "noResultsDescription", "noResultsTitle", "noSelectionDescription", "noSelectionTitle", "onClose", "onCloseButtonText", "onSubmit", "onSubmitButtonText", "open", "portalTarget", "removeIconDescription", "searchResultsLabel", "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); }
 
@@ -54,6 +58,7 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var _cx;
 
   var className = _ref.className,
+      clearFiltersText = _ref.clearFiltersText,
       columnInputPlaceholder = _ref.columnInputPlaceholder,
       description = _ref.description,
       globalFilters = _ref.globalFilters,
@@ -63,6 +68,7 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       globalFiltersSecondaryButtonText = _ref.globalFiltersSecondaryButtonText,
       globalSearchLabel = _ref.globalSearchLabel,
       globalSearchPlaceholder = _ref.globalSearchPlaceholder,
+      globalSortBy = _ref.globalSortBy,
       influencerTitle = _ref.influencerTitle,
       items = _ref.items,
       itemsLabel = _ref.itemsLabel,
@@ -128,6 +134,12 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       appliedGlobalFilters = _useState18[0],
       setAppliedGlobalFilters = _useState18[1];
 
+  var _useItemSort = (0, _useItemSort2.useItemSort)(),
+      sortDirection = _useItemSort.sortDirection,
+      setSortDirection = _useItemSort.setSortDirection,
+      sortAttribute = _useItemSort.sortAttribute,
+      setSortAttribute = _useItemSort.setSortAttribute;
+
   (0, _react.useEffect)(function () {
     var entries = items.entries; // flatItems is just a single array of all entries including children
 
@@ -217,6 +229,8 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     return results;
   };
 
+  var sortFn = (0, _addSelectUtils.sortItems)(sortAttribute, sortDirection);
+
   var getDisplayItems = function getDisplayItems() {
     if (useNormalizedItems) {
       // when global search or filter is in use the results are not in column format
@@ -229,7 +243,7 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
           return filters.every(function (filter) {
             return item[filter] === appliedGlobalFilters[filter];
           });
-        });
+        }).sort(sortFn);
         return results;
       }
 
@@ -263,7 +277,9 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     onSubmit(multi ? multiSelection : singleSelection);
   };
 
+  var classNames = (0, _classnames.default)(className, blockClass, (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__single"), !multi), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__multi"), multi), _cx));
   var commonTearsheetProps = {
+    className: classNames,
     open: open,
     title: title,
     description: description,
@@ -289,7 +305,6 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     removeIconDescription: removeIconDescription,
     setMultiSelection: setMultiSelection
   };
-  var classNames = (0, _classnames.default)(className, blockClass, (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__single"), !multi), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__multi"), multi), _cx));
 
   var setShowBreadsCrumbs = function setShowBreadsCrumbs() {
     if (searchTerm) {
@@ -315,9 +330,11 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     return true;
   };
 
+  var hasResults = itemsToDisplay.length > 0;
+  var globalFiltersApplied = Object.keys(appliedGlobalFilters).length > 0;
   var showBreadsCrumbs = setShowBreadsCrumbs();
-  var showTags = setShowTags();
-  var globalFiltersApplied = Object.keys(appliedGlobalFilters).length > 0; // main content
+  var showSort = (searchTerm || globalFiltersApplied) && hasResults;
+  var showTags = setShowTags(); // main content
 
   var body = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "__header")
@@ -332,8 +349,13 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     primaryButtonText: globalFiltersPrimaryButtonText,
     secondaryButtonText: globalFiltersSecondaryButtonText,
     placeholder: globalFiltersPlaceholderText,
-    iconDescription: globalFiltersIconDescription
+    iconDescription: globalFiltersIconDescription,
+    appliedFilters: appliedGlobalFilters,
+    hasFiltersApplied: globalFiltersApplied,
+    clearFiltersText: clearFiltersText
   }), /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(blockClass, "__sub-header")
+  }, /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "__tag-container")
   }, showBreadsCrumbs ? /*#__PURE__*/_react.default.createElement(_AddSelectBreadcrumbs.AddSelectBreadcrumbs, {
     itemsLabel: itemsLabel,
@@ -344,7 +366,14 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   }, searchTerm ? searchResultsLabel : itemsLabel), showTags && /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Tag, {
     type: "gray",
     size: "sm"
-  }, itemsToDisplay.length))), useNormalizedItems && !searchTerm && !globalFiltersApplied ? /*#__PURE__*/_react.default.createElement("div", {
+  }, itemsToDisplay.length)), showSort && /*#__PURE__*/_react.default.createElement(_AddSelectSort.AddSelectSort, {
+    items: itemsToDisplay,
+    setSortAttribute: setSortAttribute,
+    setSortDirection: setSortDirection,
+    sortAttribute: sortAttribute,
+    sortDirection: sortDirection,
+    sortBy: globalSortBy
+  }))), useNormalizedItems && !searchTerm && !globalFiltersApplied ? /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "__columns")
   }, itemsToDisplay.map(function (page, idx) {
     var _path;
@@ -355,7 +384,7 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       header: idx === 0 ? itemsLabel : (_path = path[idx - 1]) === null || _path === void 0 ? void 0 : _path.title,
       columnInputPlaceholder: columnInputPlaceholder
     }));
-  })) : /*#__PURE__*/_react.default.createElement("div", null, itemsToDisplay.length > 0 ? /*#__PURE__*/_react.default.createElement(_AddSelectList.AddSelectList, (0, _extends2.default)({}, commonListProps, {
+  })) : /*#__PURE__*/_react.default.createElement("div", null, hasResults ? /*#__PURE__*/_react.default.createElement(_AddSelectList.AddSelectList, (0, _extends2.default)({}, commonListProps, {
     filteredItems: itemsToDisplay,
     modifiers: items === null || items === void 0 ? void 0 : items.modifiers
   })) : /*#__PURE__*/_react.default.createElement("div", {
@@ -366,8 +395,7 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   }))));
 
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
-    ref: ref,
-    className: classNames
+    ref: ref
   }, rest), multi ? /*#__PURE__*/_react.default.createElement(_Tearsheet.Tearsheet, (0, _extends2.default)({}, commonTearsheetProps, {
     influencer: multi && /*#__PURE__*/_react.default.createElement(_AddSelectSidebar.AddSelectSidebar, sidebarProps),
     influencerPosition: "right"
@@ -376,6 +404,7 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
 exports.AddSelect = AddSelect;
 AddSelect.propTypes = {
   className: _propTypes.default.string,
+  clearFiltersText: _propTypes.default.string,
   columnInputPlaceholder: _propTypes.default.string,
   description: _propTypes.default.string,
   globalFilters: _propTypes.default.arrayOf(_propTypes.default.shape({
@@ -388,6 +417,7 @@ AddSelect.propTypes = {
   globalFiltersSecondaryButtonText: _propTypes.default.string,
   globalSearchLabel: _propTypes.default.string,
   globalSearchPlaceholder: _propTypes.default.string,
+  globalSortBy: _propTypes.default.array,
   influencerTitle: _propTypes.default.string,
   items: _propTypes.default.shape({
     modifiers: _propTypes.default.shape({

package/lib/components/AddSelect/AddSelectColumn.js

@@ -29,6 +29,12 @@ var _settings = require("../../settings");
 
 var _AddSelectList = require("./AddSelectList");
 
+var _AddSelectSort = require("./AddSelectSort");
+
+var _addSelectUtils = require("./add-select-utils");
+
+var _useItemSort2 = require("./hooks/useItemSort");
+
 var _uuidv = _interopRequireDefault(require("../../global/js/utils/uuidv4"));
 
 var _excluded = ["columnInputPlaceholder", "filteredItems", "header", "multiSelection", "setMultiSelection"];
@@ -40,7 +46,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 var componentName = 'AddSelect';
 
 var AddSelectColumn = function AddSelectColumn(_ref) {
-  var _filteredItems$find, _filteredItems$find2;
+  var _filteredItems$find;
 
   var columnInputPlaceholder = _ref.columnInputPlaceholder,
       filteredItems = _ref.filteredItems,
@@ -59,20 +65,16 @@ var AddSelectColumn = function AddSelectColumn(_ref) {
       searchTerm = _useState4[0],
       setSearchTerm = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(''),
-      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-      sortDirection = _useState6[0],
-      setSortDirection = _useState6[1];
-
-  var _useState7 = (0, _react.useState)(''),
-      _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-      sortAttribute = _useState8[0],
-      setSortAttribute = _useState8[1];
+  var _useItemSort = (0, _useItemSort2.useItemSort)(),
+      sortDirection = _useItemSort.sortDirection,
+      setSortDirection = _useItemSort.setSortDirection,
+      sortAttribute = _useItemSort.sortAttribute,
+      setSortAttribute = _useItemSort.setSortAttribute;
 
-  var _useState9 = (0, _react.useState)([]),
-      _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-      filters = _useState10[0],
-      setFilters = _useState10[1];
+  var _useState5 = (0, _react.useState)([]),
+      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+      filters = _useState6[0],
+      setFilters = _useState6[1];
 
   var blockClass = "".concat(_settings.pkg.prefix, "--add-select");
   var colClass = "".concat(blockClass, "__column");
@@ -81,39 +83,14 @@ var AddSelectColumn = function AddSelectColumn(_ref) {
       return multiSelection.includes(item.id);
     });
     setAllSelected(isAllSelected);
-  }, [filteredItems, multiSelection]); // 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.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_iconsReact.ArrowUp16, null), cur),
-      direction: 'asc',
-      attribute: cur
-    }, {
-      id: "".concat(cur, "-desc"),
-      itemText: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_iconsReact.ArrowDown16, null), cur),
-      direction: 'desc',
-      attribute: cur
-    }];
-    return [].concat((0, _toConsumableArray2.default)(acc), opts);
-  }, []) : []; // filtering
-
-  var colFilterBy = (_filteredItems$find2 = filteredItems.find(function (item) {
+  }, [filteredItems, multiSelection]); // filtering
+
+  var colFilterBy = (_filteredItems$find = filteredItems.find(function (item) {
     return item.filterBy;
-  })) === null || _filteredItems$find2 === void 0 ? void 0 : _filteredItems$find2.filterBy;
+  })) === null || _filteredItems$find === void 0 ? void 0 : _filteredItems$find.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 selectAllHandler = function selectAllHandler(checked) {
     var itemIds = filteredItems.map(function (item) {
@@ -160,22 +137,11 @@ var AddSelectColumn = function AddSelectColumn(_ref) {
     });
   };
 
-  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 sortFn = (0, _addSelectUtils.sortItems)(sortAttribute, sortDirection);
+  var sortBy = (0, _addSelectUtils.getSortBy)(filteredItems);
   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
+  .sort(sortFn); // then sort the items by whatever criteria
 
   return /*#__PURE__*/_react.default.createElement("div", {
     className: colClass
@@ -193,19 +159,14 @@ var AddSelectColumn = function AddSelectColumn(_ref) {
     labelText: columnInputPlaceholder
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(colClass, "-sort-filter")
-  }, sortByOpts.length > 0 && /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenu, {
-    renderIcon: _iconsReact.ArrowsVertical32,
-    className: "".concat(colClass, "-overflow"),
-    flipped: true
-  }, sortByOpts.map(function (opt) {
-    return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenuItem, {
-      key: opt.id,
-      itemText: opt.itemText,
-      onClick: function onClick() {
-        return sortHandler(opt);
-      }
-    });
-  })), filterByOpts.length > 0 && /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenu, {
+  }, /*#__PURE__*/_react.default.createElement(_AddSelectSort.AddSelectSort, {
+    items: filteredItems,
+    setSortAttribute: setSortAttribute,
+    setSortDirection: setSortDirection,
+    sortAttribute: sortAttribute,
+    sortDirection: sortDirection,
+    sortBy: sortBy
+  }), filterByOpts.length > 0 && /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.OverflowMenu, {
     renderIcon: _iconsReact.Filter32,
     className: "".concat(colClass, "-overflow"),
     flipped: true

package/lib/components/AddSelect/AddSelectFilter.js

@@ -34,9 +34,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 var componentName = 'AddSelectFilter';
 
 var AddSelectFilter = function AddSelectFilter(_ref) {
-  var filterOpts = _ref.filterOpts,
+  var appliedFilters = _ref.appliedFilters,
+      clearFiltersText = _ref.clearFiltersText,
+      filterOpts = _ref.filterOpts,
       handleFilter = _ref.handleFilter,
       handleSearch = _ref.handleSearch,
+      hasFiltersApplied = _ref.hasFiltersApplied,
       iconDescription = _ref.iconDescription,
       inputLabel = _ref.inputLabel,
       inputPlaceholder = _ref.inputPlaceholder,
@@ -66,6 +69,14 @@ var AddSelectFilter = function AddSelectFilter(_ref) {
     var selectedItem = _ref2.selectedItem;
     setFilters(_objectSpread(_objectSpread({}, filters), {}, (0, _defineProperty2.default)({}, id, selectedItem)));
   };
+  /**
+   * this component needs to manage it's own internal state of filters before they're applied
+   * setFilters manages the local filter state
+   * applyFilters adds the filter state to the parent
+   * resetFilters resets the local state
+   * clearFilters resets both
+   */
+
 
   var applyFilters = function applyFilters() {
     handleFilter(filters);
@@ -75,12 +86,25 @@ var AddSelectFilter = function AddSelectFilter(_ref) {
     setFilters({});
   };
 
+  var clearFilters = function clearFilters() {
+    resetFilters();
+    handleFilter({});
+  };
+
+  var removeTag = function removeTag(key) {
+    var newFilters = _objectSpread({}, filters);
+
+    delete newFilters[key];
+    setFilters(newFilters);
+    handleFilter(newFilters);
+  };
+
   var getSelectedItem = function getSelectedItem(id) {
     return filters[id] || '';
   };
 
   var showFilter = multi && (filterOpts === null || filterOpts === void 0 ? void 0 : filterOpts.length) > 0;
-  return /*#__PURE__*/_react.default.createElement("div", {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "-search")
   }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.TextInput, {
     id: "temp-id",
@@ -99,7 +123,7 @@ var AddSelectFilter = function AddSelectFilter(_ref) {
     className: "".concat(blockClass, "-toggle"),
     size: "md"
   }), open && /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(blockClass)
+    className: blockClass
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "-content")
   }, /*#__PURE__*/_react.default.createElement("p", null, "Filters"), /*#__PURE__*/_react.default.createElement("div", {
@@ -127,14 +151,33 @@ var AddSelectFilter = function AddSelectFilter(_ref) {
     kind: "primary",
     onClick: applyFilters,
     className: "".concat(blockClass, "-button")
-  }, primaryButtonText))));
+  }, primaryButtonText)))), hasFiltersApplied && /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(blockClass, "-applied")
+  }, Object.keys(appliedFilters).map(function (filterType) {
+    return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Tag, {
+      key: filterType,
+      type: "gray",
+      size: "sm",
+      onClose: function onClose() {
+        return removeTag(filterType);
+      },
+      filter: true
+    }, "".concat(filterType, ": ").concat(appliedFilters[filterType]));
+  }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
+    kind: "ghost",
+    size: "sm",
+    onClick: clearFilters
+  }, clearFiltersText)));
 };
 
 exports.AddSelectFilter = AddSelectFilter;
 AddSelectFilter.propTypes = {
+  appliedFilters: _propTypes.default.object,
+  clearFiltersText: _propTypes.default.string,
   filterOpts: _propTypes.default.array,
   handleFilter: _propTypes.default.func,
   handleSearch: _propTypes.default.func,
+  hasFiltersApplied: _propTypes.default.bool,
   iconDescription: _propTypes.default.string,
   inputLabel: _propTypes.default.string,
   inputPlaceholder: _propTypes.default.string,