@carbon/ibm-products 1.14.0 → 1.17.0

package/lib/components/AddSelect/AddSelect.js

@@ -43,7 +43,7 @@ var _addSelectUtils = require("./add-select-utils");
 
 var _AddSelectFilter = require("./AddSelectFilter");
 
-var _excluded = ["className", "columnInputPlaceholder", "description", "globalFilters", "globalFiltersIconDescription", "globalFiltersPlaceholderText", "globalFiltersPrimaryButtonText", "globalFiltersSecondaryButtonText", "influencerTitle", "inputPlaceholder", "items", "itemsLabel", "multi", "noResultsDescription", "noResultsTitle", "noSelectionDescription", "noSelectionTitle", "onClose", "onCloseButtonText", "onSearchFilter", "onSubmit", "onSubmitButtonText", "open", "removeIconDescription", "searchResultsLabel", "textInputLabel", "title"];
+var _excluded = ["className", "clearFiltersText", "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"];
 
 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 +54,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,
@@ -61,8 +62,9 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       globalFiltersPlaceholderText = _ref.globalFiltersPlaceholderText,
       globalFiltersPrimaryButtonText = _ref.globalFiltersPrimaryButtonText,
       globalFiltersSecondaryButtonText = _ref.globalFiltersSecondaryButtonText,
+      globalSearchLabel = _ref.globalSearchLabel,
+      globalSearchPlaceholder = _ref.globalSearchPlaceholder,
       influencerTitle = _ref.influencerTitle,
-      inputPlaceholder = _ref.inputPlaceholder,
       items = _ref.items,
       itemsLabel = _ref.itemsLabel,
       multi = _ref.multi,
@@ -72,13 +74,12 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       noSelectionTitle = _ref.noSelectionTitle,
       onClose = _ref.onClose,
       onCloseButtonText = _ref.onCloseButtonText,
-      onSearchFilter = _ref.onSearchFilter,
       onSubmit = _ref.onSubmit,
       onSubmitButtonText = _ref.onSubmitButtonText,
       open = _ref.open,
+      portalTarget = _ref.portalTarget,
       removeIconDescription = _ref.removeIconDescription,
       searchResultsLabel = _ref.searchResultsLabel,
-      textInputLabel = _ref.textInputLabel,
       title = _ref.title,
       rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var blockClass = "".concat(_settings.pkg.prefix, "--add-select"); // hooks
@@ -209,11 +210,6 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     var results = itemsToFilter.filter(function (item) {
       if (!searchTerm) {
         return item;
-      } // if user provides their own filter function use that
-
-
-      if (onSearchFilter) {
-        return onSearchFilter(item, searchTerm);
       } // otherwise use the default label filter
 
 
@@ -268,7 +264,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,
@@ -282,7 +280,8 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       kind: 'primary',
       onClick: submitHandler,
       disabled: multi ? multiSelection.length === 0 : !singleSelection
-    }]
+    }],
+    portalTarget: portalTarget
   };
   var sidebarProps = {
     influencerTitle: influencerTitle,
@@ -293,7 +292,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) {
@@ -326,8 +324,8 @@ var AddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var body = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "__header")
   }, /*#__PURE__*/_react.default.createElement(_AddSelectFilter.AddSelectFilter, {
-    textInputLabel: textInputLabel,
-    inputPlaceholder: inputPlaceholder,
+    inputLabel: globalSearchLabel,
+    inputPlaceholder: globalSearchPlaceholder,
     searchTerm: searchTerm,
     handleSearch: handleSearch,
     multi: multi,
@@ -336,7 +334,10 @@ 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, "__tag-container")
   }, showBreadsCrumbs ? /*#__PURE__*/_react.default.createElement(_AddSelectBreadcrumbs.AddSelectBreadcrumbs, {
@@ -370,8 +371,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"
@@ -380,6 +380,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({
@@ -390,21 +391,28 @@ AddSelect.propTypes = {
   globalFiltersPlaceholderText: _propTypes.default.string,
   globalFiltersPrimaryButtonText: _propTypes.default.string,
   globalFiltersSecondaryButtonText: _propTypes.default.string,
+  globalSearchLabel: _propTypes.default.string,
+  globalSearchPlaceholder: _propTypes.default.string,
   influencerTitle: _propTypes.default.string,
-  inputPlaceholder: _propTypes.default.string,
   items: _propTypes.default.shape({
     modifiers: _propTypes.default.shape({
       label: _propTypes.default.string,
-      options: _propTypes.default.array,
-      property: _propTypes.default.string
+      options: _propTypes.default.array
     }),
     sortBy: _propTypes.default.array,
     filterBy: _propTypes.default.array,
     entries: _propTypes.default.arrayOf(_propTypes.default.shape({
+      avatar: _propTypes.default.shape({
+        alt: _propTypes.default.string,
+        icon: _propTypes.default.object,
+        src: _propTypes.default.string
+      }),
+      children: _propTypes.default.object,
+      icon: _propTypes.default.object,
       id: _propTypes.default.string.isRequired,
+      subtitle: _propTypes.default.string,
       title: _propTypes.default.string.isRequired,
-      value: _propTypes.default.string.isRequired,
-      children: _propTypes.default.object
+      value: _propTypes.default.string.isRequired
     }))
   }),
   itemsLabel: _propTypes.default.string,
@@ -415,13 +423,16 @@ AddSelect.propTypes = {
   noSelectionTitle: _propTypes.default.string,
   onClose: _propTypes.default.func,
   onCloseButtonText: _propTypes.default.string,
-  onSearchFilter: _propTypes.default.func,
   onSubmit: _propTypes.default.func,
   onSubmitButtonText: _propTypes.default.string,
   open: _propTypes.default.bool,
+
+  /**
+   * portal target for the all tags modal
+   */
+  portalTarget: _propTypes.default.node,
   removeIconDescription: _propTypes.default.string,
   searchResultsLabel: _propTypes.default.string,
-  textInputLabel: _propTypes.default.string,
   title: _propTypes.default.string
 };
 AddSelect.defaultProps = {

package/lib/components/AddSelect/AddSelectFilter.js

@@ -34,17 +34,20 @@ 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,
       multi = _ref.multi,
       placeholder = _ref.placeholder,
       primaryButtonText = _ref.primaryButtonText,
       searchTerm = _ref.searchTerm,
-      secondaryButtonText = _ref.secondaryButtonText,
-      textInputLabel = _ref.textInputLabel;
+      secondaryButtonText = _ref.secondaryButtonText;
 
   var _useState = (0, _react.useState)({}),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -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,16 +86,29 @@ 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("div", null, /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "-search")
   }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.TextInput, {
     id: "temp-id",
-    labelText: textInputLabel,
+    labelText: inputLabel,
     placeholder: inputPlaceholder,
     value: searchTerm,
     onChange: searchHandler
@@ -127,21 +151,40 @@ 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,
   multi: _propTypes.default.bool,
   placeholder: _propTypes.default.string,
   primaryButtonText: _propTypes.default.string,
   searchTerm: _propTypes.default.string,
-  secondaryButtonText: _propTypes.default.string,
-  textInputLabel: _propTypes.default.string
+  secondaryButtonText: _propTypes.default.string
 };
 AddSelectFilter.displayName = componentName;