@pareto-engineering/design-system 2.0.0-alpha.44 → 2.0.0-alpha.47

package/dist/cjs/f/FormInput/FormInput.js

@@ -67,6 +67,13 @@ var FormInput = _ref => {
     }, otherProps));
   }
 
+  if (type === 'query-combobox') {
+    return /*#__PURE__*/React.createElement(_fields.QueryCombobox, _extends({
+      className: newClassName,
+      disabled: disabled
+    }, otherProps));
+  }
+
   if (extraTypes !== null && extraTypes !== void 0 && extraTypes[type]) {
     var Component = extraTypes[type];
     return /*#__PURE__*/React.createElement(Component, _extends({
@@ -91,7 +98,7 @@ FormInput.propTypes = {
   /**
    * The HTML class names for this element
    */
-  type: _propTypes.default.oneOf(['text', 'email', 'password', 'number', 'date', 'datetime', 'month', 'tel', 'hidden', 'select', 'choices', 'textarea', // to be removed
+  type: _propTypes.default.oneOf(['text', 'email', 'password', 'number', 'date', 'datetime', 'month', 'tel', 'hidden', 'select', 'choices', 'textarea', 'query-combobox', // to be removed
   'extendedTypeInput']),
 
   /**

package/dist/cjs/f/fields/QueryCombobox/QueryCombobox.js

@@ -7,12 +7,12 @@ exports.default = void 0;
 
 var React = _interopRequireWildcard(require("react"));
 
+var _formik = require("formik");
+
 var _reactRelay = require("react-relay");
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _bem = _interopRequireDefault(require("@pareto-engineering/bem"));
-
 var _common = require("./common");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -27,17 +27,14 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var baseClassName = _bem.default.base;
-var componentClassName = 'query-combobox';
 /**
  * This is the component description.
  */
-
 var QueryCombobox = _ref => {
   var {
     id,
-    className: userClassName,
     style,
+    className,
     query,
     multiple,
     name,
@@ -50,33 +47,46 @@ var QueryCombobox = _ref => {
     searchVariable,
     extraVariables,
     optionsKeyMap,
-    setValue,
-    setError,
-    error // ...otherProps
+    minLength,
+    transformSearch // ...otherProps
 
   } = _ref;
   (0, React.useLayoutEffect)(() => {
     Promise.resolve().then(() => _interopRequireWildcard(require("./styles.scss")));
   }, []);
+  var [, meta, helpers] = (0, _formik.useField)(name);
+  var {
+    setValue,
+    setError
+  } = helpers;
+  var {
+    error,
+    value
+  } = meta;
   var environment = (0, _reactRelay.useRelayEnvironment)();
   var [isFetching, setIsFetching] = (0, React.useState)(false);
   var [options, setOptions] = (0, React.useState)([]);
 
-  var fetchOptions = inputValue => {
+  var getOptions = inputValue => {
     if (isFetching) return;
-    (0, _reactRelay.fetchQuery)(environment, query, _objectSpread({
+    var variables = {
       [searchVariable]: inputValue
-    }, extraVariables)).subscribe({
+    };
+
+    if (extraVariables) {
+      variables = _objectSpread(_objectSpread({}, variables), extraVariables);
+    }
+
+    (0, _reactRelay.fetchQuery)(environment, query, variables).subscribe({
       start: () => {
         setIsFetching(true);
       },
       complete: () => {
         setIsFetching(false);
       },
-      error: theError => {
-        console.log(theError);
+      error: fetchError => {
         setIsFetching(false);
-        if (setError) setError(theError);
+        if (setError) setError(fetchError.message);
       },
       next: data => {
         setOptions(data[graphQlNode].edges.map(_ref2 => {
@@ -93,23 +103,26 @@ var QueryCombobox = _ref => {
   };
 
   var comboboxProps = {
+    id,
+    style,
     options,
-    fetchOptions,
+    getOptions,
     debounceMs,
     disabled,
     name,
     label,
     description,
     setValue,
-    error
+    error,
+    value,
+    color,
+    isFetching,
+    className,
+    minLength,
+    transformSearch
   };
-  var Component = multiple ? _common.MultipleCombobox : _common.Combobox;
-  return /*#__PURE__*/React.createElement("div", {
-    id: id,
-    className: [baseClassName, componentClassName, userClassName, "y-".concat(color)].filter(e => e).join(' '),
-    style: style // {...otherProps}
-
-  }, /*#__PURE__*/React.createElement(Component, comboboxProps));
+  var Input = multiple ? _common.MultipleCombobox : _common.Combobox;
+  return /*#__PURE__*/React.createElement(Input, comboboxProps);
 };
 
 QueryCombobox.propTypes = {
@@ -138,11 +151,6 @@ QueryCombobox.propTypes = {
    */
   label: _propTypes.default.string,
 
-  /**
-   * The input field validator function
-   */
-  validate: _propTypes.default.func,
-
   /**
    * The custom select input description
    */
@@ -180,7 +188,7 @@ QueryCombobox.propTypes = {
   optionsKeyMap: _propTypes.default.shape({
     value: _propTypes.default.string.isRequired,
     label: _propTypes.default.string.isRequired
-  }).isRequired,
+  }),
 
   /**
    * Whether to allow multiple items selection
@@ -198,25 +206,25 @@ QueryCombobox.propTypes = {
   searchVariable: _propTypes.default.string,
 
   /**
-   * The function to be called when the value changes
-   */
-  setValue: _propTypes.default.func.isRequired,
-
-  /**
-   * The function to be called with an error when the it occurs
+   * The minimum length of the search input to start fetching the options
    */
-  setError: _propTypes.default.func,
+  minLength: _propTypes.default.number,
 
   /**
-   * The error object
+   * The function to transform the search input
    */
-  error: _propTypes.default.objectOf(_propTypes.default.string)
+  transformSearch: _propTypes.default.func
 };
 QueryCombobox.defaultProps = {
-  extraVariables: {},
+  optionsKeyMap: {
+    value: 'id',
+    label: 'name'
+  },
   multiple: false,
   color: 'background2',
-  searchVariable: 'search'
+  searchVariable: 'search',
+  transformSearch: search => search,
+  minLength: 2
 };
 var _default = QueryCombobox;
 exports.default = _default;

package/dist/cjs/f/fields/QueryCombobox/common/Combobox/Combobox.js

@@ -15,6 +15,8 @@ var _bem = _interopRequireDefault(require("@pareto-engineering/bem"));
 
 var _ = require("../../../..");
 
+var _a = require("../../../../../a");
+
 var _Menu = require("../Menu");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -39,14 +41,20 @@ var Combobox = _ref => {
     label,
     name,
     options: items,
-    fetchOptions,
+    getOptions,
     setValue,
     error,
-    description // ...otherProps
+    description,
+    value,
+    color,
+    minLength,
+    isFetching,
+    transformSearch // ...otherProps
 
   } = _ref;
   var {
     isOpen,
+    selectItem,
     selectedItem,
     getLabelProps,
     getMenuProps,
@@ -56,34 +64,55 @@ var Combobox = _ref => {
     getItemProps
   } = (0, _downshift.useCombobox)({
     items,
+    initialSelectedItem: value,
     itemToString: item => item ? item.label : '',
     onInputValueChange: _ref2 => {
       var {
         inputValue
       } = _ref2;
-      fetchOptions(inputValue);
+      var transformedInput = transformSearch(inputValue);
+
+      if (transformedInput.length > minLength) {
+        getOptions(transformedInput);
+      }
     }
-  });
+  }); // If the user has selected an item, we'll set the value of the field
+  // or if the combobox state has a selected item, we'll set the value to the formik state
+
   (0, React.useEffect)(() => {
     if (selectedItem) {
-      setValue(selectedItem.value);
+      setValue(selectedItem);
+    }
+  }, [selectedItem]); // If the formik state has a value, we'll set the selected item to the combobox state
+
+  (0, React.useEffect)(() => {
+    if ((value === null || value === void 0 ? void 0 : value.value) !== (selectedItem === null || selectedItem === void 0 ? void 0 : selectedItem.value)) {
+      selectItem(value);
     }
-  }, [selectedItem]);
+  }, [value]);
+  var parentRef = (0, React.useRef)(null);
   return /*#__PURE__*/React.createElement("div", {
     id: id,
-    className: [baseClassName, componentClassName, userClassName].filter(e => e).join(' '),
-    style: style
+    className: [baseClassName, componentClassName, userClassName, "y-".concat(color)].filter(e => e).join(' '),
+    style: style,
+    ref: parentRef
   }, /*#__PURE__*/React.createElement(_.FormLabel, _extends({}, getLabelProps(), {
-    className: "input-label",
     name: name
-  }), label), /*#__PURE__*/React.createElement("div", getComboboxProps(), /*#__PURE__*/React.createElement("input", _extends({}, getInputProps(), {
+  }), label), /*#__PURE__*/React.createElement("div", _extends({}, getComboboxProps(), {
+    className: "input-wrapper"
+  }), /*#__PURE__*/React.createElement("input", _extends({}, getInputProps(), {
     className: "input"
-  }))), /*#__PURE__*/React.createElement(_Menu.Menu, _extends({
+  })), isFetching && /*#__PURE__*/React.createElement(_a.LoadingCircle, {
+    className: "x-main2"
+  })), /*#__PURE__*/React.createElement(_a.Popover, {
+    isOpen: isOpen,
+    parentRef: parentRef
+  }, /*#__PURE__*/React.createElement(_Menu.Menu, _extends({
     isOpen: isOpen,
     getItemProps: getItemProps,
     highlightedIndex: highlightedIndex,
     items: items
-  }, getMenuProps())), (description || error) && /*#__PURE__*/React.createElement(_.FormDescription, {
+  }, getMenuProps()))), (description || error) && /*#__PURE__*/React.createElement(_.FormDescription, {
     isError: !!error
   }, error || description));
 };
@@ -125,7 +154,7 @@ Combobox.propTypes = {
   /**
    * The function to fetch the options from the backend
    */
-  fetchOptions: _propTypes.default.func,
+  getOptions: _propTypes.default.func,
 
   /**
    * The function to set the value of the custom select input
@@ -140,9 +169,37 @@ Combobox.propTypes = {
   /**
    * The error object
    */
-  error: _propTypes.default.objectOf(_propTypes.default.string)
+  error: _propTypes.default.objectOf(_propTypes.default.string),
+
+  /**
+   * The value of the custom select input
+   */
+  value: _propTypes.default.shape({
+    value: _propTypes.default.string,
+    label: _propTypes.default.string
+  }),
+
+  /**
+   * The base color of the combobox custom select input
+   */
+  color: _propTypes.default.string,
+
+  /**
+   * Whether the query getting the combobox options is inFlight
+   */
+  isFetching: _propTypes.default.bool.isRequired,
+
+  /**
+   * The minimum length of the search input to start fetching the options
+   */
+  minLength: _propTypes.default.number,
+
+  /**
+   * The function to transform the search input
+   */
+  transformSearch: _propTypes.default.func
 };
-Combobox.defaultProps = {// someProp:false
+Combobox.defaultProps = {// someProp: false
 };
 var _default = Combobox;
 exports.default = _default;

package/dist/cjs/f/fields/QueryCombobox/common/Menu/Menu.js

@@ -55,7 +55,7 @@ var Menu = /*#__PURE__*/React.forwardRef((_ref, ref) => {
     item,
     index
   }), {
-    className: "item ".concat(highlightedIndex === index ? _bem.default.modifierActive : '')
+    className: ['item', highlightedIndex === index && _bem.default.modifierActive].filter(Boolean).join(' ')
   }), /*#__PURE__*/React.createElement("p", null, item.label))));
 });
 Menu.propTypes = {

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

@@ -15,6 +15,8 @@ var _downshift = require("downshift");
 
 var _b = require("../../../../../b");
 
+var _a = require("../../../../../a");
+
 var _ = require("../../../..");
 
 var _Menu = require("../Menu");
@@ -35,10 +37,19 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 var baseClassName = _bem.default.base;
 var 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.
+ */
+
+var testIfArraysAreUnique = (first, second) => first.filter(objInFirstArray => !second.some(objInSecondArray => objInFirstArray.value === objInSecondArray.value)).length > 0;
 /**
  * This is the component description.
  */
 
+
 var MultipleCombobox = _ref => {
   var {
     id,
@@ -47,22 +58,34 @@ var MultipleCombobox = _ref => {
     label,
     name,
     options: items,
-    fetchOptions,
+    getOptions,
     setValue,
     error,
-    description // ...otherProps
+    description,
+    value,
+    color,
+    isFetching,
+    minLength,
+    transformSearch // ...otherProps
 
   } = _ref;
-  var [inputValue, setInputValue] = (0, React.useState)('');
+  var [searchInputValue, setSearchInputValue] = (0, React.useState)('');
   var {
     getSelectedItemProps,
     getDropdownProps,
     addSelectedItem,
     removeSelectedItem,
+    setSelectedItems,
     selectedItems
-  } = (0, _downshift.useMultipleSelection)();
+  } = (0, _downshift.useMultipleSelection)({
+    initialSelectedItems: value || []
+  });
+  /**
+   * @returns {Boolean} - Unique items from the options array so that the combobox
+   * shows only the options that are not yet selected.
+  */
 
-  var getFilteredItems = () => items.filter(item => selectedItems.findIndex(e => e.label === item.label) < 0 && item.label.toLowerCase().startsWith(inputValue.toLowerCase()));
+  var getFilteredItems = () => items.filter(item => selectedItems.findIndex(e => e.label === item.label) < 0);
 
   var {
     isOpen,
@@ -73,7 +96,7 @@ var MultipleCombobox = _ref => {
     highlightedIndex,
     getItemProps
   } = (0, _downshift.useCombobox)({
-    inputValue,
+    searchInputValue,
     defaultHighlightedIndex: 0,
     // after selection, highlight the first item.
     selectedItem: null,
@@ -101,22 +124,29 @@ var MultipleCombobox = _ref => {
     },
     onStateChange: _ref2 => {
       var {
-        inputValue: newInputValue,
+        inputValue: newSearchInputValue,
         type,
         selectedItem
       } = _ref2;
 
       switch (type) {
         case _downshift.useCombobox.stateChangeTypes.InputChange:
-          fetchOptions(newInputValue);
-          setInputValue(newInputValue);
-          break;
+          {
+            var transformedInput = transformSearch(newSearchInputValue);
+
+            if (transformedInput.length > minLength) {
+              getOptions(transformedInput);
+            }
+
+            setSearchInputValue(newSearchInputValue);
+            break;
+          }
 
         case _downshift.useCombobox.stateChangeTypes.InputKeyDownEnter:
         case _downshift.useCombobox.stateChangeTypes.ItemClick:
         case _downshift.useCombobox.stateChangeTypes.InputBlur:
           if (selectedItem) {
-            setInputValue('');
+            setSearchInputValue('');
             addSelectedItem(selectedItem);
           }
 
@@ -128,16 +158,21 @@ var MultipleCombobox = _ref => {
     }
   });
   (0, React.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]);
+  (0, React.useEffect)(() => {
+    if ((value === null || value === void 0 ? void 0 : value.length) > 0 && (testIfArraysAreUnique(value, selectedItems) || testIfArraysAreUnique(selectedItems, value))) {
+      setSelectedItems(value);
+    }
+  }, [value]);
+  var parentRef = (0, React.useRef)(null);
   return /*#__PURE__*/React.createElement("div", {
     id: id,
-    className: [baseClassName, componentClassName, userClassName].filter(e => e).join(' '),
+    className: [baseClassName, componentClassName, userClassName, "y-".concat(color)].filter(e => e).join(' '),
     style: style
   }, /*#__PURE__*/React.createElement(_.FormLabel, _extends({}, getLabelProps(), {
-    className: "input-label",
     name: name
   }), label), /*#__PURE__*/React.createElement("div", {
     className: "selected-items"
@@ -155,16 +190,23 @@ var MultipleCombobox = _ref => {
     isCompact: true,
     isSimple: true,
     color: "main2"
-  }, "X")))), /*#__PURE__*/React.createElement("div", getComboboxProps(), /*#__PURE__*/React.createElement("input", _extends({}, getInputProps(getDropdownProps({
+  }, "X")))), /*#__PURE__*/React.createElement("div", _extends({}, getComboboxProps(), {
+    className: "input-wrapper"
+  }), /*#__PURE__*/React.createElement("input", _extends({}, getInputProps(getDropdownProps({
     preventKeyAction: isOpen
   })), {
     className: "input"
-  }))), /*#__PURE__*/React.createElement(_Menu.Menu, _extends({
+  })), isFetching && /*#__PURE__*/React.createElement(_a.LoadingCircle, {
+    className: "x-main2"
+  })), /*#__PURE__*/React.createElement(_a.Popover, {
+    isOpen: isOpen,
+    parentRef: parentRef
+  }, /*#__PURE__*/React.createElement(_Menu.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));
 };
@@ -206,7 +248,7 @@ MultipleCombobox.propTypes = {
   /**
    * The function to fetch the options from the backend
    */
-  fetchOptions: _propTypes.default.func,
+  getOptions: _propTypes.default.func,
 
   /**
    * The function to set the value of the custom select input
@@ -221,9 +263,37 @@ MultipleCombobox.propTypes = {
   /**
    * The error object
    */
-  error: _propTypes.default.objectOf(_propTypes.default.string)
+  error: _propTypes.default.objectOf(_propTypes.default.string),
+
+  /**
+   * The value of the custom select input
+   */
+  value: _propTypes.default.arrayOf(_propTypes.default.shape({
+    value: _propTypes.default.string,
+    label: _propTypes.default.string
+  })),
+
+  /**
+   * The base color of the custom select input
+   */
+  color: _propTypes.default.string,
+
+  /**
+   * Whether the query getting the combobox options is inFlight
+   */
+  isFetching: _propTypes.default.bool.isRequired,
+
+  /**
+   * The minimum length of the search input to start fetching the options
+   */
+  minLength: _propTypes.default.number,
+
+  /**
+   * The function to transform the search input
+   */
+  transformSearch: _propTypes.default.func
 };
-MultipleCombobox.defaultProps = {// someProp:false
+MultipleCombobox.defaultProps = {// someProp: false
 };
 var _default = MultipleCombobox;
 exports.default = _default;

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

@@ -5,61 +5,74 @@
 $default-input-padding: .75em .75em .55em;
 $default-padding: 1em;
 $default-margin: 1em;
+$default-loading-circle-displacement: 1em;
 
-.#{bem.$base}.query-combobox {
-    .input {
-        background: var(--light-y);
-        border: var(--theme-border-style) var(--dark-y);
-        color: var(--on-y);
-        padding: $default-input-padding;
-        width: 100%;
+.#{bem.$base}.combobox,
+.#{bem.$base}.multiple-combobox {
+    position: relative;
 
-        &::placeholder {
-            color: var(--metadata);
-        }
+    .#{bem.$base}.label {
+        margin-bottom: $default-margin
+    }
 
-        &:not(:disabled):hover {
-            border: var(--theme-border-style) var(--light-background4);
-        }
+    .#{bem.$base}.popover {
+        width: 100%;
 
-        &:disabled {
-            background-color: var(--dark-y);
-        }
+        >.menu {
+            list-style: none;
+            margin: 0;
+            outline: 0;
+            padding: 0;
 
-        &:focus {
-            background: var(--light-background4);
+            >.item {
+                padding: $default-padding / 2;
+
+                &.#{bem.$modifier-active} {
+                    background-color: var(--background2);
+                }
+            }
         }
     }
 
-    .menu {
-        list-style: none;
-        margin: 0;
-        outline: 0;
-        padding: 0;
+    >.input-wrapper {
+        position: relative;
 
-        /* stylelint-disable selector-max-universal -- Allow */
-        >* {
-            padding-block: $default-padding / 2;
+        >.#{bem.$base}.loading-circle {
+            position: absolute;
+            top: $default-loading-circle-displacement;
+            right: $default-loading-circle-displacement;
         }
 
-        /* stylelint-enable selector-max-universal */
-        >.item {
-            &.#{bem.$modifier-active} {
-                background-color: var(--background2);
+        >.input {
+            background: var(--light-y);
+            border: var(--theme-border-style) var(--dark-y);
+            color: var(--on-y);
+            padding: $default-input-padding;
+            width: 100%;
+
+            &::placeholder {
+                color: var(--metadata);
             }
-        }
-    }
 
-    .multiple-combobox {
-        .selected-items {
-            display: flex;
+            &:not(:disabled):hover {
+                border: var(--theme-border-style) var(--light-background4);
+            }
 
-            /* stylelint-disable selector-max-universal -- Allow */
-            >*:not(:first-child) {
-                margin-left: $default-margin;
+            &:disabled {
+                background-color: var(--dark-y);
             }
 
-            /* stylelint-enable selector-max-universal */
+            &:focus {
+                background: var(--light-background4);
+            }
         }
     }
+}
+
+
+.#{bem.$base}.multiple-combobox {
+    >.selected-items {
+        display: flex;
+        gap: var(--default-gap);
+    }
 }