@pareto-engineering/design-system 4.0.0-alpha.4 → 4.0.0-alpha.42

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

@@ -12,7 +12,7 @@ var _ChoicesInput = require("../ChoicesInput");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 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; }
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); } /* @pareto-engineering/generator-front 1.0.12 */
 /**
  * This is the component description.
  */
@@ -25,6 +25,10 @@ const QueryChoices = _ref => {
     validate,
     loadingOption,
     extraVariables,
+    labelSpan,
+    desktopLabelSpan,
+    inputSpan,
+    desktopInputSpan,
     ...otherProps
   } = _ref;
   const [,, helpers] = (0, _formik.useField)({
@@ -80,7 +84,11 @@ const QueryChoices = _ref => {
   return /*#__PURE__*/React.createElement(_ChoicesInput.ChoicesInput, _extends({
     name: name,
     validate: validate,
-    options: options
+    options: options,
+    labelSpan: labelSpan,
+    desktopLabelSpan: desktopLabelSpan,
+    inputSpan: inputSpan,
+    desktopInputSpan: desktopInputSpan
   }, otherProps));
 };
 QueryChoices.propTypes = {
@@ -124,7 +132,23 @@ QueryChoices.propTypes = {
    *  The extra variables that might be required to be used in the query to fetch
    *  select options.
    */
-  extraVariables: _propTypes.default.objectOf(_propTypes.default.string)
+  extraVariables: _propTypes.default.objectOf(_propTypes.default.string),
+  /**
+  * The number of columns the label should span
+  */
+  labelSpan: _propTypes.default.number,
+  /**
+   * The number of columns the input should span
+   */
+  inputSpan: _propTypes.default.number,
+  /**
+   * The number of columns the label should span on desktop
+   */
+  desktopLabelSpan: _propTypes.default.number,
+  /**
+   * The number of columns the input should span on desktop
+   */
+  desktopInputSpan: _propTypes.default.number
 };
 QueryChoices.defaultProps = {
   loadingOption: {

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

@@ -11,7 +11,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _common = require("./common");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-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; }
+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; } /* @pareto-engineering/generator-front 1.0.12 */ // Local Definitions
 /**
  * This is the component description.
  */
@@ -24,6 +24,7 @@ const QueryCombobox = _ref => {
     multiple,
     name,
     label,
+    labelColor,
     color,
     optional,
     description,
@@ -34,10 +35,14 @@ const QueryCombobox = _ref => {
     optionsKeyMap,
     minLength,
     transformSearch,
-    validate
+    validate,
+    labelSpan,
+    desktopLabelSpan,
+    inputSpan,
+    desktopInputSpan
     // ...otherProps
   } = _ref;
-  (0, React.useLayoutEffect)(() => {
+  (0, React.useInsertionEffect)(() => {
     Promise.resolve().then(() => _interopRequireWildcard(require("./styles.scss")));
   }, []);
   const [, meta, helpers] = (0, _formik.useField)({
@@ -102,6 +107,7 @@ const QueryCombobox = _ref => {
     disabled,
     name,
     label,
+    labelColor,
     optional,
     description,
     setValue,
@@ -110,7 +116,11 @@ const QueryCombobox = _ref => {
     isFetching,
     className,
     minLength,
-    transformSearch
+    transformSearch,
+    labelSpan,
+    desktopLabelSpan,
+    inputSpan,
+    desktopInputSpan
   };
   const Input = multiple ? _common.MultipleCombobox : _common.Combobox;
   return /*#__PURE__*/React.createElement(Input, comboboxProps);
@@ -136,6 +146,10 @@ QueryCombobox.propTypes = {
    * The label of the custom select input
    */
   label: _propTypes.default.string,
+  /**
+   * The label color of the custom select input
+   */
+  labelColor: _propTypes.default.string,
   /**
    * The custom select input description
    */
@@ -145,7 +159,7 @@ QueryCombobox.propTypes = {
    */
   disabled: _propTypes.default.bool,
   /**
-   * The base color of the custom select input
+   * The base color of the tiles
    */
   color: _propTypes.default.string,
   /**
@@ -194,7 +208,23 @@ QueryCombobox.propTypes = {
   /*
   * Whether the input is optional or not
   */
-  optional: _propTypes.default.bool
+  optional: _propTypes.default.bool,
+  /**
+   * The number of columns the label should span
+   */
+  labelSpan: _propTypes.default.number,
+  /**
+   * The number of columns the input should span
+   */
+  inputSpan: _propTypes.default.number,
+  /**
+   * The number of columns the label should span on desktop
+   */
+  desktopLabelSpan: _propTypes.default.number,
+  /**
+   * The number of columns the input should span on desktop
+   */
+  desktopInputSpan: _propTypes.default.number
 };
 QueryCombobox.defaultProps = {
   optionsKeyMap: {
@@ -202,7 +232,7 @@ QueryCombobox.defaultProps = {
     getLabel: node => node.name
   },
   multiple: false,
-  color: 'background2',
+  color: 'interactive',
   searchVariable: 'search',
   transformSearch: search => search,
   minLength: 2,

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

@@ -11,11 +11,12 @@ var _exports = _interopRequireDefault(require("@pareto-engineering/bem/exports")
 var _ = require("../../../..");
 var _a = require("../../../../../a");
 var _b = require("../../../../../b");
+var _common = require("../../../../common");
 var _Menu = require("../Menu");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 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; }
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); } /* @pareto-engineering/generator-front 1.0.12 */ // Local Definitions
 const baseClassName = _exports.default.base;
 const componentClassName = 'combobox';
 
@@ -28,6 +29,7 @@ const Combobox = _ref => {
     className: userClassName,
     style,
     label,
+    labelColor,
     name,
     options: items,
     getOptions,
@@ -39,7 +41,11 @@ const Combobox = _ref => {
     isFetching,
     transformSearch,
     disabled,
-    optional
+    optional,
+    labelSpan,
+    desktopLabelSpan,
+    inputSpan,
+    desktopInputSpan
     // ...otherProps
   } = _ref;
   const {
@@ -85,41 +91,46 @@ const Combobox = _ref => {
   }, [value]);
   const parentRef = (0, React.useRef)(null);
   const resetInputValue = () => setInputValue('');
-  return /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_.FormLabel, _extends({}, getLabelProps(), {
+    name: name,
+    optional: optional,
+    color: labelColor,
+    columnSpan: labelSpan,
+    desktopColumnSpan: desktopLabelSpan
+  }), label), /*#__PURE__*/React.createElement(_common.InputWrapper, _extends({
     id: id,
     className: [baseClassName, componentClassName, userClassName, `y-${color}`].filter(e => e).join(' '),
     style: style,
     ref: parentRef
-  }, /*#__PURE__*/React.createElement(_.FormLabel, _extends({}, getLabelProps(), {
-    name: name,
-    optional: optional
-  }), label), /*#__PURE__*/React.createElement("div", _extends({}, getComboboxProps(), {
-    className: "input-wrapper"
+  }, getComboboxProps(), {
+    columnSpan: inputSpan,
+    desktopColumnSpan: desktopInputSpan
   }), /*#__PURE__*/React.createElement("input", _extends({}, getInputProps(), {
     className: "input",
     disabled: disabled
   })), isFetching && /*#__PURE__*/React.createElement(_a.LoadingCircle, {
-    className: "x-main2"
+    className: "x-main"
   }), inputValue.length > minLength && !isFetching && /*#__PURE__*/React.createElement(_b.Button, {
     isSimple: true,
     isCompact: true,
-    color: "main2",
+    color: "heading",
     onClick: resetInputValue
   }, /*#__PURE__*/React.createElement("span", {
-    className: "f-icons"
-  }, "Y"))), /*#__PURE__*/React.createElement(_a.Popover, {
+    className: "icon"
+  }, "Y")), /*#__PURE__*/React.createElement(_.FormDescription, {
+    className: "s-1",
+    description: description,
+    name: name
+  }), /*#__PURE__*/React.createElement(_a.Popover, {
     isOpen: isOpen,
     parentRef: parentRef
   }, /*#__PURE__*/React.createElement(_Menu.Menu, _extends({
+    className: `y-${color}`,
     isOpen: isOpen,
     getItemProps: getItemProps,
     highlightedIndex: highlightedIndex,
     items: items
-  }, getMenuProps()))), /*#__PURE__*/React.createElement(_.FormDescription, {
-    className: "v50 mt-v s-1",
-    description: description,
-    name: name
-  }));
+  }, getMenuProps())))));
 };
 Combobox.propTypes = {
   /**
@@ -189,6 +200,22 @@ Combobox.propTypes = {
    */
   disabled: _propTypes.default.bool,
   /**
+  * The number of columns the label should span
+  */
+  labelSpan: _propTypes.default.number,
+  /**
+   * The number of columns the input should span
+   */
+  inputSpan: _propTypes.default.number,
+  /**
+   * The number of columns the label should span on desktop
+   */
+  desktopLabelSpan: _propTypes.default.number,
+  /**
+   * The number of columns the input should span on desktop
+   */
+  desktopInputSpan: _propTypes.default.number,
+  /**
   * Whether the input is optional or not
   */
   optional: _propTypes.default.bool

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

@@ -10,7 +10,7 @@ var _exports = _interopRequireDefault(require("@pareto-engineering/bem/exports")
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 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; }
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); } /* @pareto-engineering/generator-front 1.0.12 */
 // Local Definitions
 
 const baseClassName = _exports.default.base;

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

@@ -11,11 +11,12 @@ var _downshift = require("downshift");
 var _b = require("../../../../../b");
 var _a = require("../../../../../a");
 var _ = require("../../../..");
+var _common = require("../../../../common");
 var _Menu = require("../Menu");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 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; }
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); } /* @pareto-engineering/generator-front 1.0.12 */ // Local Definitions
 const baseClassName = _exports.default.base;
 const componentClassName = 'multiple-combobox';
 
@@ -36,6 +37,7 @@ const MultipleCombobox = _ref => {
     className: userClassName,
     style,
     label,
+    labelColor,
     name,
     optional,
     options: items,
@@ -47,7 +49,11 @@ const MultipleCombobox = _ref => {
     isFetching,
     minLength,
     transformSearch,
-    disabled
+    disabled,
+    labelSpan,
+    desktopLabelSpan,
+    inputSpan,
+    desktopInputSpan
     // ...otherProps
   } = _ref;
   const [searchInputValue, setSearchInputValue] = (0, React.useState)('');
@@ -143,14 +149,22 @@ const MultipleCombobox = _ref => {
   }, [value]);
   const parentRef = (0, React.useRef)(null);
   const resetInputValue = () => setInputValue('');
-  return /*#__PURE__*/React.createElement("div", {
-    id: id,
-    className: [baseClassName, componentClassName, userClassName, `y-${color}`].filter(e => e).join(' '),
-    style: style
-  }, /*#__PURE__*/React.createElement(_.FormLabel, _extends({}, getLabelProps(), {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_.FormLabel, _extends({
+    className: [baseClassName, componentClassName].filter(e => e).join(' ')
+  }, getLabelProps(), {
     name: name,
-    optional: optional
-  }), label), selectedItems?.length > 0 && /*#__PURE__*/React.createElement("div", {
+    optional: optional,
+    color: labelColor,
+    columnSpan: labelSpan,
+    desktopColumnSpan: desktopLabelSpan
+  }), label), /*#__PURE__*/React.createElement(_common.InputWrapper, _extends({
+    id: id,
+    className: [baseClassName, componentClassName, userClassName].filter(e => e).join(' '),
+    style: style,
+    ref: parentRef,
+    columnSpan: inputSpan,
+    desktopColumnSpan: desktopInputSpan
+  }, getComboboxProps()), selectedItems?.length > 0 && /*#__PURE__*/React.createElement("div", {
     className: "selected-items"
   }, selectedItems.map((selectedItem, index) => /*#__PURE__*/React.createElement("div", _extends({
     key: selectedItem.label
@@ -165,41 +179,37 @@ const MultipleCombobox = _ref => {
       removeSelectedItem(selectedItem);
     },
     isCompact: true,
-    isSimple: true,
     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({
+  }, /*#__PURE__*/React.createElement("span", null, selectedItem.label), /*#__PURE__*/React.createElement("span", {
+    className: "icon close"
+  }, "Y"))))), /*#__PURE__*/React.createElement("input", _extends({}, getInputProps(getDropdownProps({
     preventKeyAction: isOpen
   })), {
     className: "input",
     disabled: disabled
   })), isFetching && /*#__PURE__*/React.createElement(_a.LoadingCircle, {
-    className: "x-main2"
+    className: "x-main"
   }), inputValue.length > minLength && !isFetching && /*#__PURE__*/React.createElement(_b.Button, {
     isSimple: true,
     isCompact: true,
-    color: "main2",
+    color: "interactive",
     onClick: resetInputValue
   }, /*#__PURE__*/React.createElement("span", {
-    className: "f-icons"
-  }, "Y"))), /*#__PURE__*/React.createElement(_a.Popover, {
+    className: "icon"
+  }, "Y")), /*#__PURE__*/React.createElement(_.FormDescription, {
+    className: "s-1",
+    description: description,
+    name: name
+  }), /*#__PURE__*/React.createElement(_a.Popover, {
     isOpen: isOpen,
     parentRef: parentRef
   }, /*#__PURE__*/React.createElement(_Menu.Menu, _extends({
+    className: `y-${color}`,
     isOpen: isOpen,
     getItemProps: getItemProps,
     highlightedIndex: highlightedIndex,
     items: getFilteredItems()
-  }, getMenuProps()))), /*#__PURE__*/React.createElement(_.FormDescription, {
-    className: "v50 mt-v s-1",
-    description: description,
-    name: name
-  }));
+  }, getMenuProps())))));
 };
 MultipleCombobox.propTypes = {
   /**

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

@@ -1,22 +1,31 @@
 /* @pareto-engineering/generator-front 1.0.12 */
+/* stylelint-disable max-nesting-depth -- needed here */
+/* stylelint-disable selector-max-compound-selectors -- needed here */
 
 @use "@pareto-engineering/bem";
-
-$default-input-padding: .75em .75em .55em;
-$default-padding: 1em;
-$default-margin: 1em;
-$default-gap: 1em;
-$default-loading-circle-displacement: 1em;
+@use "@pareto-engineering/styles/src/mixins";
+@use "@pareto-engineering/styles/src/globals" as *;
+
+$default-input-padding: .55em .75em;
+$default-gap: var(--gap);
+$default-loading-circle-displacement: .5em;
+$default-input-border-radius: var(--theme-default-input-border-radius);
+$default-border: var(--theme-default-input-border);
+$hover-border: var(--theme-hover-input-border);
+$focus-border: var(--theme-focus-input-border);
+$default-background: var(--background-inputs);
+$on-default-background: var(--paragraph);
+$disabled-background: var(--background-inputs-30);
+$on-disabled-background: var(--on-background-inputs-30);
 
 .#{bem.$base}.combobox,
 .#{bem.$base}.multiple-combobox {
+  outline: none;
   position: relative;
 
-  .#{bem.$base}.label {
-    margin-bottom: $default-margin;
-  }
-
   .#{bem.$base}.popover {
+    border: $default-border;
+    border-radius: $default-input-border-radius;
     width: 100%;
 
     >.menu {
@@ -26,46 +35,69 @@ $default-loading-circle-displacement: 1em;
       padding: 0;
 
       >.item {
-        padding: $default-padding / 2;
+        border-radius: $default-input-border-radius;
+        padding: $default-input-padding;
+
+        > p {
+          margin: 0;
+        }
 
         &.#{bem.$modifier-active} {
-          background-color: var(--background2);
+          background-color: var(--y);
+
+          > p {
+            color: var(--on-y);
+          }
         }
       }
     }
   }
 
-  >.input-wrapper {
+  &.#{bem.$base}.input-wrapper {
+    display: flex;
+    flex-direction: column;
     position: relative;
 
     >.#{bem.$base}.loading-circle,
     >.#{bem.$base}.button {
       position: absolute;
       right: $default-loading-circle-displacement;
+    }
+
+    >.#{bem.$base}.loading-circle {
+      top: calc($default-loading-circle-displacement * 1.5);
+    }
+
+    >.#{bem.$base}.button {
       top: $default-loading-circle-displacement;
     }
 
-    >.input {
-      background: var(--soft-y);
-      border: var(--theme-border-style) var(--hard-y);
-      color: var(--on-y);
+    > .input {
+      background: $default-background;
+      border: $default-border;
+      border-radius: calc(var(--theme-default-border-radius) / 2);
+      color: $on-default-background;
+      outline: none;
       padding: $default-input-padding;
-      width: 100%;
 
       &::placeholder {
         color: var(--metadata);
       }
 
-      &:not(:disabled):hover {
-        border: var(--theme-border-style) var(--soft-background4);
-      }
-
       &:disabled {
-        background-color: var(--hard-y);
+        background-color: $disabled-background;
+        color: $on-disabled-background;
       }
 
-      &:focus {
-        background: var(--soft-background4);
+      &:not(:disabled) {
+        &:hover,
+        &:active {
+          border: $hover-border;
+        }
+
+        &:focus {
+          border: $focus-border;
+        }
       }
     }
   }
@@ -76,12 +108,15 @@ $default-loading-circle-displacement: 1em;
   >.selected-items {
     display: flex;
     flex-wrap: wrap;
-    gap: $default-gap / 2;
-    margin-bottom: $default-margin / 2;
+    gap: calc($default-gap / 2);
+    margin-bottom: calc($default-gap / 2);
 
     >.item {
-      background-color: var(--main2);
-      padding: $default-padding / 4;
+      >.#{bem.$base}.button {
+        align-items: center;
+        display: flex;
+        gap: calc($default-gap / 2);
+      }
 
       .close {
         font-size: calc(var(--s-3) * 1em);

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

@@ -26,6 +26,7 @@ const QuerySelect = _ref => {
     style,
     name,
     label,
+    labelColor,
     optional,
     query,
     variables,
@@ -35,7 +36,11 @@ const QuerySelect = _ref => {
     color,
     loadingOption,
     defaultOption,
-    validate
+    validate,
+    labelSpan,
+    desktopLabelSpan,
+    inputSpan,
+    desktopInputSpan
     // ...otherProps
   } = _ref;
   const [,, helpers] = (0, _formik.useField)({
@@ -90,10 +95,15 @@ const QuerySelect = _ref => {
     label: label,
     optional: optional,
     color: color,
+    labelColor: labelColor,
     description: description,
     disabled: isFetching || disabled,
     options: options,
-    isLoading: isFetching
+    isLoading: isFetching,
+    labelSpan: labelSpan,
+    desktopLabelSpan: desktopLabelSpan,
+    inputSpan: inputSpan,
+    desktopInputSpan: desktopInputSpan
   });
 };
 QuerySelect.propTypes = {
@@ -129,6 +139,10 @@ QuerySelect.propTypes = {
    * The base color of the custom select input
    */
   color: _propTypes.default.string,
+  /**
+   * The label color of the custom select input
+   */
+  labelColor: _propTypes.default.string,
   /**
    * The graphql query to fetch the options and the accessor to destructure the results from
    */
@@ -176,7 +190,7 @@ QuerySelect.propTypes = {
 };
 QuerySelect.defaultProps = {
   disabled: false,
-  color: 'background2',
+  color: 'paragraph',
   defaultOption: {
     value: '',
     label: 'Select an option',