@carbon/ibm-products 2.0.0-rc.3 → 2.0.0-rc.32

package/es/components/AddSelect/AddSelectColumn.js

@@ -2,13 +2,14 @@ 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", "filterByLabel", "header", "items", "multiSelection", "parentId", "path", "setMultiSelection", "setPath"];
+var _excluded = ["columnInputPlaceholder", "filterByLabel", "header", "items", "multiSelection", "parentId", "path", "setMultiSelection", "setPath", "sortByLabel"];
 //
-// Copyright IBM Corp. 2022
+// Copyright IBM Corp. 2022, 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 { Search, Tag, OverflowMenu, Checkbox, usePrefix } from '@carbon/react';
@@ -25,45 +26,38 @@ var colClass = "".concat(blockClass, "__column");
 var componentName = 'AddSelectColumn';
 export var AddSelectColumn = function AddSelectColumn(_ref) {
   var columnInputPlaceholder = _ref.columnInputPlaceholder,
-      filterByLabel = _ref.filterByLabel,
-      header = _ref.header,
-      items = _ref.items,
-      multiSelection = _ref.multiSelection,
-      parentId = _ref.parentId,
-      path = _ref.path,
-      setMultiSelection = _ref.setMultiSelection,
-      setPath = _ref.setPath,
-      props = _objectWithoutProperties(_ref, _excluded);
-
+    filterByLabel = _ref.filterByLabel,
+    header = _ref.header,
+    items = _ref.items,
+    multiSelection = _ref.multiSelection,
+    parentId = _ref.parentId,
+    path = _ref.path,
+    setMultiSelection = _ref.setMultiSelection,
+    setPath = _ref.setPath,
+    sortByLabel = _ref.sortByLabel,
+    props = _objectWithoutProperties(_ref, _excluded);
   var carbonPrefix = usePrefix();
-
   var _useParentSelect = useParentSelect(),
-      parentSelected = _useParentSelect.parentSelected,
-      setParentSelected = _useParentSelect.setParentSelected;
-
+    parentSelected = _useParentSelect.parentSelected,
+    setParentSelected = _useParentSelect.setParentSelected;
   var _useState = useState(''),
-      _useState2 = _slicedToArray(_useState, 2),
-      searchTerm = _useState2[0],
-      setSearchTerm = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    searchTerm = _useState2[0],
+    setSearchTerm = _useState2[1];
   var _useItemSort = useItemSort(),
-      sortDirection = _useItemSort.sortDirection,
-      setSortDirection = _useItemSort.setSortDirection,
-      sortAttribute = _useItemSort.sortAttribute,
-      setSortAttribute = _useItemSort.setSortAttribute;
-
+    sortDirection = _useItemSort.sortDirection,
+    setSortDirection = _useItemSort.setSortDirection,
+    sortAttribute = _useItemSort.sortAttribute,
+    setSortAttribute = _useItemSort.setSortAttribute;
   var _useState3 = useState([]),
-      _useState4 = _slicedToArray(_useState3, 2),
-      filters = _useState4[0],
-      setFilters = _useState4[1];
-
+    _useState4 = _slicedToArray(_useState3, 2),
+    filters = _useState4[0],
+    setFilters = _useState4[1];
   var entries = items.entries,
-      filterBy = items.filterBy,
-      sortBy = items.sortBy;
-
+    filterBy = items.filterBy,
+    sortBy = items.sortBy;
   var getSelectedItem = function getSelectedItem() {
     var _entries$find;
-
     var parentInPath = path.find(function (entry) {
       return entry.parentId === parentId;
     });
@@ -71,18 +65,15 @@ export var AddSelectColumn = function AddSelectColumn(_ref) {
      * this check helps ensure that when the state of the open columns is cleared by global search
      * that the columns are rebuilt from the data in the path array
      */
-
     if (parentInPath && !parentSelected) {
       return entries.find(function (item) {
         return item.id === parentInPath.id;
       });
     }
-
     return (_entries$find = entries.find(function (item) {
       return item.id === parentSelected;
     })) !== null && _entries$find !== void 0 ? _entries$find : null;
   };
-
   var selectedItem = getSelectedItem();
   /**
    * this check helps prevent children from already being open when you switch from parents
@@ -91,27 +82,24 @@ export var AddSelectColumn = function AddSelectColumn(_ref) {
    * check ensures that when a user navigates to parents on the same level that the open state
    * of their children is cleared by referencing the path array.
    */
-
   var itemInPath = selectedItem && path.find(function (entry) {
     return entry.id === selectedItem.id;
   });
   var allSelected = entries.every(function (item) {
     return multiSelection.includes(item.id);
-  }); // filtering
+  });
 
+  // filtering
   var filterByOpts = filterBy ? entries.map(function (item) {
     return item[filterBy];
   }) : [];
-
   var selectAllHandler = function selectAllHandler(event, _ref2) {
     var checked = _ref2.checked;
     var itemIds = entries.map(function (item) {
       return item.id;
     });
-
     if (checked) {
       var newSelections = _toConsumableArray(new Set([].concat(_toConsumableArray(multiSelection), _toConsumableArray(itemIds))));
-
       setMultiSelection(newSelections);
     } else {
       var newItems = multiSelection.filter(function (i) {
@@ -120,7 +108,6 @@ export var AddSelectColumn = function AddSelectColumn(_ref) {
       setMultiSelection(newItems);
     }
   };
-
   var filterHandler = function filterHandler(checked, opt) {
     if (checked) {
       var newFilters = [].concat(_toConsumableArray(filters), [opt]);
@@ -129,28 +116,24 @@ export var AddSelectColumn = function AddSelectColumn(_ref) {
       var _newFilters = filters.filter(function (o) {
         return o !== opt;
       });
-
       setFilters(_newFilters);
     }
-  }; // filter and sort array functions
-
+  };
 
+  // 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 sortFn = sortItems(sortAttribute, sortDirection);
   var colItems = entries.filter(filterBySearch) // first check if the item meets the search
   .filter(filterByAttribute) // then check if the item is included in the filter
@@ -160,7 +143,6 @@ export var AddSelectColumn = function AddSelectColumn(_ref) {
     setParentSelected(id);
     setPath(id, title, parentId);
   };
-
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: colClass
   }, /*#__PURE__*/React.createElement("div", {
@@ -183,7 +165,8 @@ export var AddSelectColumn = function AddSelectColumn(_ref) {
     setSortDirection: setSortDirection,
     sortAttribute: sortAttribute,
     sortDirection: sortDirection,
-    sortBy: sortBy
+    sortBy: sortBy,
+    sortByLabel: sortByLabel
   }), filterByOpts.length > 0 && /*#__PURE__*/React.createElement(OverflowMenu, {
     renderIcon: function renderIcon(props) {
       return /*#__PURE__*/React.createElement(Filter, _extends({
@@ -192,7 +175,8 @@ export var AddSelectColumn = function AddSelectColumn(_ref) {
     },
     className: "".concat(colClass, "-overflow"),
     flipped: true,
-    ariaLabel: filterByLabel
+    "aria-label": filterByLabel,
+    iconDescription: filterByLabel
   }, filterByOpts.map(function (opt) {
     return /*#__PURE__*/React.createElement("div", {
       key: opt,
@@ -211,14 +195,14 @@ export var AddSelectColumn = function AddSelectColumn(_ref) {
       }) ? true : false
     })));
   })))), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(blockClass, "__tag-container")
+    className: "".concat(blockClass, "__tags")
   }, /*#__PURE__*/React.createElement(Checkbox, {
     id: "".concat(uuidv4(), "-select-all"),
     className: "".concat(colClass, "__select-all"),
     checked: allSelected,
     onChange: selectAllHandler,
     labelText: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
-      className: "".concat(blockClass, "__tag-container-label")
+      className: "".concat(blockClass, "__tag-label")
     }, header), /*#__PURE__*/React.createElement(Tag, {
       type: "gray",
       size: "sm"
@@ -227,7 +211,8 @@ export var AddSelectColumn = function AddSelectColumn(_ref) {
     filteredItems: colItems,
     setMultiSelection: setMultiSelection,
     multiSelection: multiSelection,
-    setParentSelected: parentSelectionHandler
+    setParentSelected: parentSelectionHandler,
+    parentSelected: parentSelected
   }))), selectedItem && itemInPath && /*#__PURE__*/React.createElement(AddSelectColumn, _extends({
     columnInputPlaceholder: columnInputPlaceholder,
     header: selectedItem.title,
@@ -236,7 +221,9 @@ export var AddSelectColumn = function AddSelectColumn(_ref) {
     setMultiSelection: setMultiSelection,
     parentId: selectedItem.id,
     setPath: setPath,
-    path: path
+    path: path,
+    sortByLabel: sortByLabel,
+    filterByLabel: filterByLabel
   }, props)));
 };
 AddSelectColumn.propTypes = {
@@ -248,6 +235,7 @@ AddSelectColumn.propTypes = {
   parentId: PropTypes.string,
   path: PropTypes.array,
   setMultiSelection: PropTypes.func,
-  setPath: PropTypes.func
+  setPath: PropTypes.func,
+  sortByLabel: PropTypes.string
 };
 AddSelectColumn.displayName = componentName;

package/es/components/AddSelect/AddSelectFilter.js

@@ -1,19 +1,17 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-
 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) { _defineProperty(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; }
-
 //
-// Copyright IBM Corp. 2022
+// Copyright IBM Corp. 2022, 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 { Button, ButtonSet, Dropdown, Search, Tag } from '@carbon/react';
+import { Button, ButtonSet, Dropdown, Search, Tag, Layer } from '@carbon/react';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
 import { Filter } from '@carbon/react/icons';
@@ -22,38 +20,36 @@ var blockClass = "".concat(pkg.prefix, "--add-select__global-filter");
 var componentName = 'AddSelectFilter';
 export var AddSelectFilter = function AddSelectFilter(_ref) {
   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;
-
+    clearFiltersText = _ref.clearFiltersText,
+    filterOpts = _ref.filterOpts,
+    filtersLabel = _ref.filtersLabel,
+    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;
   var _useState = useState({}),
-      _useState2 = _slicedToArray(_useState, 2),
-      filters = _useState2[0],
-      setFilters = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    filters = _useState2[0],
+    setFilters = _useState2[1];
   var _useState3 = useState(false),
-      _useState4 = _slicedToArray(_useState3, 2),
-      open = _useState4[0],
-      setOpen = _useState4[1];
-
+    _useState4 = _slicedToArray(_useState3, 2),
+    open = _useState4[0],
+    setOpen = _useState4[1];
   var searchHandler = function searchHandler(e) {
     handleSearch(e.target.value);
   };
-
   var onchangeHandler = function onchangeHandler(_ref2, id) {
     var selectedItem = _ref2.selectedItem;
     setFilters(_objectSpread(_objectSpread({}, filters), {}, _defineProperty({}, id, selectedItem)));
   };
+
   /**
    * this component needs to manage it's own internal state of filters before they're applied
    * setFilters manages the local filter state
@@ -61,41 +57,33 @@ export var AddSelectFilter = function AddSelectFilter(_ref) {
    * resetFilters resets the local state
    * clearFilters resets both
    */
-
-
   var applyFilters = function applyFilters() {
     setOpen(false);
     handleFilter(filters);
   };
-
   var resetFilters = function resetFilters() {
     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;
   var filterBtnClassnames = cx("".concat(blockClass, "-toggle"), _defineProperty({}, "".concat(blockClass, "-toggle--open"), open));
   var dirtyInput = Object.keys(filters).length > 0;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(blockClass, "-search")
   }, /*#__PURE__*/React.createElement(Search, {
-    id: "temp-id",
+    id: "add-select-global-search-filter",
     labelText: inputLabel,
     placeholder: inputPlaceholder,
     value: searchTerm,
@@ -113,21 +101,21 @@ export var AddSelectFilter = function AddSelectFilter(_ref) {
     },
     iconDescription: iconDescription,
     className: filterBtnClassnames,
-    size: "lg",
+    size: "md",
     tooltipPosition: "left"
-  }), open && /*#__PURE__*/React.createElement("div", {
-    className: blockClass
+  }), open && /*#__PURE__*/React.createElement(Layer, {
+    className: blockClass,
+    level: 1
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(blockClass, "-content")
-  }, /*#__PURE__*/React.createElement("p", null, "Filters"), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("p", null, filtersLabel), /*#__PURE__*/React.createElement("div", {
     className: "".concat(blockClass, "-opts")
   }, filterOpts.map(function (filterOpts) {
     return /*#__PURE__*/React.createElement(Dropdown, {
-      id: filterOpts.id,
       key: filterOpts.id,
+      id: filterOpts.id,
       titleText: filterOpts.label,
       items: filterOpts.opts,
-      light: true,
       onChange: function onChange(value) {
         return onchangeHandler(value, filterOpts.id);
       },
@@ -168,6 +156,7 @@ AddSelectFilter.propTypes = {
   appliedFilters: PropTypes.object,
   clearFiltersText: PropTypes.string,
   filterOpts: PropTypes.array,
+  filtersLabel: PropTypes.string,
   handleFilter: PropTypes.func,
   handleSearch: PropTypes.func,
   hasFiltersApplied: PropTypes.bool,

package/es/components/AddSelect/AddSelectFormControl.js

@@ -0,0 +1,82 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import React from 'react';
+import { RadioButton, RadioButtonChecked, Checkbox, CheckboxCheckedFilled } from '@carbon/react/icons';
+import PropTypes from 'prop-types';
+import { pkg } from '../../settings';
+import { UserProfileImage } from '../UserProfileImage';
+var componentName = 'AddSelectFormControl';
+var blockClass = "".concat(pkg.prefix, "--add-select__selections");
+export var AddSelectFormControl = function AddSelectFormControl(_ref) {
+  var _controlProps;
+  var item = _ref.item,
+    onClick = _ref.onClick,
+    selected = _ref.selected,
+    type = _ref.type;
+  var controlProps = (_controlProps = {
+    onClick: onClick,
+    id: item.id,
+    className: "".concat(blockClass, "-form-control-wrapper")
+  }, _defineProperty(_controlProps, "aria-label", item.title), _defineProperty(_controlProps, "size", 20), _controlProps);
+  var getCheckbox = function getCheckbox() {
+    if (selected) {
+      return /*#__PURE__*/React.createElement(CheckboxCheckedFilled, controlProps);
+    }
+    return /*#__PURE__*/React.createElement(Checkbox, controlProps);
+  };
+  var getRadio = function getRadio() {
+    if (selected) {
+      return /*#__PURE__*/React.createElement(RadioButtonChecked, controlProps);
+    }
+    return /*#__PURE__*/React.createElement(RadioButton, controlProps);
+  };
+  var getFormControl = function getFormControl() {
+    if (!item) {
+      return;
+    }
+    if (type === 'checkbox') {
+      return getCheckbox();
+    } else {
+      return getRadio();
+    }
+  };
+  var getAvatarProps = function getAvatarProps(_ref2) {
+    var src = _ref2.src,
+      alt = _ref2.alt,
+      icon = _ref2.icon,
+      backgroundColor = _ref2.backgroundColor,
+      theme = _ref2.theme;
+    return {
+      className: "".concat(blockClass, "-cell-avatar"),
+      size: 'lg',
+      theme: theme,
+      image: src,
+      imageDescription: alt,
+      icon: icon,
+      backgroundColor: backgroundColor
+    };
+  };
+  var getItemIcon = function getItemIcon(_ref3) {
+    var Icon = _ref3.icon;
+    return /*#__PURE__*/React.createElement(Icon, null);
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    className: "".concat(blockClass, "-form-control")
+  }, getFormControl(), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(blockClass, "-form-control-label-wrapper")
+  }, item.avatar && /*#__PURE__*/React.createElement(UserProfileImage, getAvatarProps(item.avatar)), item.icon && /*#__PURE__*/React.createElement("div", {
+    className: "".concat(blockClass, "-cell-icon")
+  }, getItemIcon(item)), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(blockClass, "-form-control-label-text")
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "".concat(blockClass, "-cell-title")
+  }, item.title), item.subtitle && /*#__PURE__*/React.createElement("span", {
+    className: "".concat(blockClass, "-cell-subtitle")
+  }, item.subtitle))));
+};
+AddSelectFormControl.propTypes = {
+  item: PropTypes.object,
+  onClick: PropTypes.func,
+  selected: PropTypes.bool,
+  type: PropTypes.oneOf(['checkbox', 'radio'])
+};
+AddSelectFormControl.displayName = componentName;