@pareto-engineering/design-system 2.0.0-alpha.45 → 2.0.0-alpha.48

package/dist/es/f/fields/QueryCombobox/common/MultipleCombobox/MultipleCombobox.js

@@ -2,20 +2,30 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 
 /* @pareto-engineering/generator-front 1.0.12 */
 import * as React from 'react';
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useRef } from 'react';
 import PropTypes from 'prop-types';
 import styleNames from '@pareto-engineering/bem';
 import { useCombobox, useMultipleSelection } from 'downshift';
 import { Button } from "../../../../../b";
+import { Popover, LoadingCircle } from "../../../../../a";
 import { FormDescription, FormLabel } from "../../../.."; // Local Definitions
 
 import { Menu } from "../Menu";
 const baseClassName = styleNames.base;
 const componentClassName = 'multiple-combobox';
+/**
+ *  @param {Array[Object]} first - first array to check if it has an item not in the second array.
+ *  @param {Array[Object]} second - second array to check against the first array.
+ *
+ * @returns {Boolean} - true if the first array has an item not in the second array.
+ */
+
+const testIfArraysAreUnique = (first, second) => first.filter(objInFirstArray => !second.some(objInSecondArray => objInFirstArray.value === objInSecondArray.value)).length > 0;
 /**
  * This is the component description.
  */
 
+
 const MultipleCombobox = ({
   id,
   className: userClassName,
@@ -23,22 +33,34 @@ const MultipleCombobox = ({
   label,
   name,
   options: items,
-  fetchOptions,
+  getOptions,
   setValue,
   error,
-  description // ...otherProps
+  description,
+  value,
+  color,
+  isFetching,
+  minLength,
+  transformSearch // ...otherProps
 
 }) => {
-  const [inputValue, setInputValue] = useState('');
+  const [searchInputValue, setSearchInputValue] = useState('');
   const {
     getSelectedItemProps,
     getDropdownProps,
     addSelectedItem,
     removeSelectedItem,
+    setSelectedItems,
     selectedItems
-  } = useMultipleSelection();
+  } = useMultipleSelection({
+    initialSelectedItems: value || []
+  });
+  /**
+   * @returns {Boolean} - Unique items from the options array so that the combobox
+   * shows only the options that are not yet selected.
+  */
 
-  const getFilteredItems = () => items.filter(item => selectedItems.findIndex(e => e.label === item.label) < 0 && item.label.toLowerCase().startsWith(inputValue.toLowerCase()));
+  const getFilteredItems = () => items.filter(item => selectedItems.findIndex(e => e.label === item.label) < 0);
 
   const {
     isOpen,
@@ -49,7 +71,7 @@ const MultipleCombobox = ({
     highlightedIndex,
     getItemProps
   } = useCombobox({
-    inputValue,
+    searchInputValue,
     defaultHighlightedIndex: 0,
     // after selection, highlight the first item.
     selectedItem: null,
@@ -76,21 +98,28 @@ const MultipleCombobox = ({
       return changes;
     },
     onStateChange: ({
-      inputValue: newInputValue,
+      inputValue: newSearchInputValue,
       type,
       selectedItem
     }) => {
       switch (type) {
         case useCombobox.stateChangeTypes.InputChange:
-          fetchOptions(newInputValue);
-          setInputValue(newInputValue);
-          break;
+          {
+            const transformedInput = transformSearch(newSearchInputValue);
+
+            if (transformedInput.length > minLength) {
+              getOptions(transformedInput);
+            }
+
+            setSearchInputValue(newSearchInputValue);
+            break;
+          }
 
         case useCombobox.stateChangeTypes.InputKeyDownEnter:
         case useCombobox.stateChangeTypes.ItemClick:
         case useCombobox.stateChangeTypes.InputBlur:
           if (selectedItem) {
-            setInputValue('');
+            setSearchInputValue('');
             addSelectedItem(selectedItem);
           }
 
@@ -102,43 +131,60 @@ const MultipleCombobox = ({
     }
   });
   useEffect(() => {
-    if (selectedItems.length > 0) {
-      setValue(selectedItems.map(e => e.value));
+    if ((selectedItems === null || selectedItems === void 0 ? void 0 : selectedItems.length) > 0) {
+      setValue(selectedItems);
     }
   }, [selectedItems]);
+  useEffect(() => {
+    if ((value === null || value === void 0 ? void 0 : value.length) > 0 && (testIfArraysAreUnique(value, selectedItems) || testIfArraysAreUnique(selectedItems, value))) {
+      setSelectedItems(value);
+    }
+  }, [value]);
+  const parentRef = useRef(null);
   return /*#__PURE__*/React.createElement("div", {
     id: id,
-    className: [baseClassName, componentClassName, userClassName].filter(e => e).join(' '),
+    className: [baseClassName, componentClassName, userClassName, `y-${color}`].filter(e => e).join(' '),
     style: style
   }, /*#__PURE__*/React.createElement(FormLabel, _extends({}, getLabelProps(), {
-    className: "input-label",
     name: name
-  }), label), /*#__PURE__*/React.createElement("div", {
+  }), label), (selectedItems === null || selectedItems === void 0 ? void 0 : selectedItems.length) > 0 && /*#__PURE__*/React.createElement("div", {
     className: "selected-items"
-  }, selectedItems && selectedItems.map((selectedItem, index) => /*#__PURE__*/React.createElement("div", _extends({
+  }, selectedItems.map((selectedItem, index) => /*#__PURE__*/React.createElement("div", _extends({
     key: selectedItem.label
   }, getSelectedItemProps({
     selectedItem,
     index
-  })), selectedItem.label, /*#__PURE__*/React.createElement(Button, {
-    className: "f-icons",
+  }), {
+    className: "item"
+  }), /*#__PURE__*/React.createElement(Button, {
     onClick: e => {
       e.stopPropagation();
       removeSelectedItem(selectedItem);
     },
     isCompact: true,
     isSimple: true,
-    color: "main2"
-  }, "X")))), /*#__PURE__*/React.createElement("div", getComboboxProps(), /*#__PURE__*/React.createElement("input", _extends({}, getInputProps(getDropdownProps({
+    color: color
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "v25 mr-v"
+  }, selectedItem.label), /*#__PURE__*/React.createElement("span", {
+    className: "f-icons close"
+  }, "Y"))))), /*#__PURE__*/React.createElement("div", _extends({}, getComboboxProps(), {
+    className: "input-wrapper"
+  }), /*#__PURE__*/React.createElement("input", _extends({}, getInputProps(getDropdownProps({
     preventKeyAction: isOpen
   })), {
     className: "input"
-  }))), /*#__PURE__*/React.createElement(Menu, _extends({
+  })), isFetching && /*#__PURE__*/React.createElement(LoadingCircle, {
+    className: "x-main2"
+  })), /*#__PURE__*/React.createElement(Popover, {
+    isOpen: isOpen,
+    parentRef: parentRef
+  }, /*#__PURE__*/React.createElement(Menu, _extends({
     isOpen: isOpen,
     getItemProps: getItemProps,
     highlightedIndex: highlightedIndex,
     items: getFilteredItems()
-  }, getMenuProps())), (description || error) && /*#__PURE__*/React.createElement(FormDescription, {
+  }, getMenuProps()))), (description || error) && /*#__PURE__*/React.createElement(FormDescription, {
     isError: !!error
   }, error || description));
 };
@@ -180,7 +226,7 @@ MultipleCombobox.propTypes = {
   /**
    * The function to fetch the options from the backend
    */
-  fetchOptions: PropTypes.func,
+  getOptions: PropTypes.func,
 
   /**
    * The function to set the value of the custom select input
@@ -195,8 +241,36 @@ MultipleCombobox.propTypes = {
   /**
    * The error object
    */
-  error: PropTypes.objectOf(PropTypes.string)
+  error: PropTypes.objectOf(PropTypes.string),
+
+  /**
+   * The value of the custom select input
+   */
+  value: PropTypes.arrayOf(PropTypes.shape({
+    value: PropTypes.string,
+    label: PropTypes.string
+  })),
+
+  /**
+   * The base color of the custom select input
+   */
+  color: PropTypes.string,
+
+  /**
+   * Whether the query getting the combobox options is inFlight
+   */
+  isFetching: PropTypes.bool.isRequired,
+
+  /**
+   * The minimum length of the search input to start fetching the options
+   */
+  minLength: PropTypes.number,
+
+  /**
+   * The function to transform the search input
+   */
+  transformSearch: PropTypes.func
 };
-MultipleCombobox.defaultProps = {// someProp:false
+MultipleCombobox.defaultProps = {// someProp: false
 };
 export default MultipleCombobox;

package/dist/es/f/fields/QueryCombobox/common/index.js

@@ -1,2 +1,3 @@
 export { Menu } from "./Menu";
-export { Combobox } from "./Combobox";
+export { Combobox } from "./Combobox";
+export { MultipleCombobox } from "./MultipleCombobox";

package/dist/es/f/fields/QueryCombobox/styles.scss

@@ -5,11 +5,17 @@
 $default-input-padding: .75em .75em .55em;
 $default-padding: 1em;
 $default-margin: 1em;
+$default-gap: 1em;
+$default-loading-circle-displacement: 1em;
 
 .#{bem.$base}.combobox,
 .#{bem.$base}.multiple-combobox {
     position: relative;
 
+    .#{bem.$base}.label {
+        margin-bottom: $default-margin
+    }
+
     .#{bem.$base}.popover {
         width: 100%;
 
@@ -30,6 +36,14 @@ $default-margin: 1em;
     }
 
     >.input-wrapper {
+        position: relative;
+
+        >.#{bem.$base}.loading-circle {
+            position: absolute;
+            top: $default-loading-circle-displacement;
+            right: $default-loading-circle-displacement;
+        }
+
         >.input {
             background: var(--light-y);
             border: var(--theme-border-style) var(--dark-y);
@@ -60,12 +74,17 @@ $default-margin: 1em;
 .#{bem.$base}.multiple-combobox {
     >.selected-items {
         display: flex;
+        gap: $default-gap / 2;
+        flex-wrap: wrap;
+        margin-bottom: $default-margin / 2;
 
-        /* stylelint-disable selector-max-universal -- Allow */
-        >*:not(:first-child) {
-            margin-left: $default-margin;
-        }
+        >.item {
+            background-color: var(--main2);
+            padding: $default-padding / 4;
 
-        /* stylelint-enable selector-max-universal */
+            .close {
+                font-size: calc(var(--s-3) * 1em);
+            }
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pareto-engineering/design-system",
-  "version": "2.0.0-alpha.45",
+  "version": "2.0.0-alpha.48",
   "description": "",
   "main": "dist/cjs/index.js",
   "module": "dist/es/index.js",
@@ -88,7 +88,7 @@
     "stylelint-config-palantir": "^5.1.0"
   },
   "dependencies": {
-    "@pareto-engineering/assets": "^2.0.0-alpha.21",
+    "@pareto-engineering/assets": "^2.0.0-alpha.22",
     "@pareto-engineering/bem": "^0.1.5",
     "@pareto-engineering/styles": "^2.0.0-alpha.8",
     "date-fns": "^2.22.1",