@pareto-engineering/design-system 4.0.0-alpha.34 → 4.0.0-alpha.36

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

@@ -8,6 +8,7 @@ import { useCombobox, useMultipleSelection } from 'downshift';
 import { Button } from "../../../../../b";
 import { Popover, LoadingCircle } from "../../../../../a";
 import { FormDescription, FormLabel } from "../../../..";
+import { InputWrapper } from "../../../../common";
 
 // Local Definitions
 
@@ -31,6 +32,7 @@ const MultipleCombobox = ({
   className: userClassName,
   style,
   label,
+  labelColor,
   name,
   optional,
   options: items,
@@ -42,7 +44,11 @@ const MultipleCombobox = ({
   isFetching,
   minLength,
   transformSearch,
-  disabled
+  disabled,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan
   // ...otherProps
 }) => {
   const [searchInputValue, setSearchInputValue] = useState('');
@@ -137,14 +143,22 @@ const MultipleCombobox = ({
   }, [value]);
   const parentRef = 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(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
@@ -159,41 +173,37 @@ const MultipleCombobox = ({
       removeSelectedItem(selectedItem);
     },
     isCompact: true,
-    isSimple: true,
     color: color
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "v25 mr-v"
-  }, selectedItem.label), /*#__PURE__*/React.createElement("span", {
+  }, /*#__PURE__*/React.createElement("span", null, selectedItem.label), /*#__PURE__*/React.createElement("span", {
     className: "icon close"
-  }, "Y"))))), /*#__PURE__*/React.createElement("div", _extends({}, getComboboxProps(), {
-    className: "input-wrapper"
-  }), /*#__PURE__*/React.createElement("input", _extends({}, getInputProps(getDropdownProps({
+  }, "Y"))))), /*#__PURE__*/React.createElement("input", _extends({}, getInputProps(getDropdownProps({
     preventKeyAction: isOpen
   })), {
     className: "input",
     disabled: disabled
   })), isFetching && /*#__PURE__*/React.createElement(LoadingCircle, {
-    className: "x-main2"
+    className: "x-main"
   }), inputValue.length > minLength && !isFetching && /*#__PURE__*/React.createElement(Button, {
     isSimple: true,
     isCompact: true,
-    color: "main2",
+    color: "interactive",
     onClick: resetInputValue
   }, /*#__PURE__*/React.createElement("span", {
     className: "icon"
-  }, "Y"))), /*#__PURE__*/React.createElement(Popover, {
+  }, "Y")), /*#__PURE__*/React.createElement(FormDescription, {
+    className: "s-1",
+    description: description,
+    name: name
+  }), /*#__PURE__*/React.createElement(Popover, {
     isOpen: isOpen,
     parentRef: parentRef
   }, /*#__PURE__*/React.createElement(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/es/f/fields/QueryCombobox/styles.scss

@@ -1,23 +1,29 @@
 /* @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";
-@use "sass:math";
+@use "@pareto-engineering/styles/src/mixins";
+@use "@pareto-engineering/styles/src/globals" as *;
 
-$default-input-padding: .75em .75em .55em;
-$default-padding: 1em;
-$default-margin: 1em;
-$default-gap: 1em;
+$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(--theme-default-input-background);
+$disabled-background: var(--theme-disabled-input-background);
 
 .#{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 {
@@ -27,47 +33,68 @@ $default-loading-circle-displacement: .5em;
       padding: 0;
 
       >.item {
-        padding: math.div($default-padding, 2);
+        border-radius: $default-input-border-radius;
+        padding: $default-input-padding;
+
+        > p {
+          margin: 0;
+        }
 
         &.#{bem.$modifier-active} {
-          background-color: var(--hard-y);
+          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: calc(2 * $default-loading-circle-displacement);
+      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-default-border-style) var(--hard-y);
+    > .input {
+      background: $default-background;
+      border: $default-border;
       border-radius: calc(var(--theme-default-border-radius) / 2);
       color: var(--on-y);
+      outline: none;
       padding: $default-input-padding;
-      width: 100%;
 
       &::placeholder {
         color: var(--metadata);
       }
 
-      &:not(:disabled):hover {
-        border: var(--theme-default-border-style) var(--hard-y);
-      }
-
       &:disabled {
-        background-color: var(--hard-y);
+        background-color: $disabled-background;
       }
 
-      &:focus {
-        border: var(--theme-default-border-style) var(--hard-y);
+      &:not(:disabled) {
+        &:hover,
+        &:active {
+          border: $hover-border;
+        }
+
+        &:focus {
+          border: $focus-border;
+        }
       }
     }
   }
@@ -78,12 +105,15 @@ $default-loading-circle-displacement: .5em;
   >.selected-items {
     display: flex;
     flex-wrap: wrap;
-    gap: math.div($default-gap, 2);
-    margin-bottom: math.div($default-margin, 2);
+    gap: calc($default-gap / 2);
+    margin-bottom: calc($default-gap / 2);
 
     >.item {
-      background-color: var(--main);
-      padding: math.div($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/es/f/fields/QuerySelect/QuerySelect.js

@@ -18,6 +18,7 @@ const QuerySelect = ({
   style,
   name,
   label,
+  labelColor,
   optional,
   query,
   variables,
@@ -27,7 +28,11 @@ const QuerySelect = ({
   color,
   loadingOption,
   defaultOption,
-  validate
+  validate,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan
   // ...otherProps
 }) => {
   const [,, helpers] = useField({
@@ -79,10 +84,15 @@ const QuerySelect = ({
     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 = {
@@ -118,6 +128,10 @@ QuerySelect.propTypes = {
    * The base color of the custom select input
    */
   color: PropTypes.string,
+  /**
+   * The label color of the custom select input
+   */
+  labelColor: PropTypes.string,
   /**
    * The graphql query to fetch the options and the accessor to destructure the results from
    */
@@ -165,7 +179,7 @@ QuerySelect.propTypes = {
 };
 QuerySelect.defaultProps = {
   disabled: false,
-  color: 'background-far',
+  color: 'paragraph',
   defaultOption: {
     value: '',
     label: 'Select an option',

package/dist/es/f/fields/RatingsInput/RatingsInput.js

@@ -7,7 +7,7 @@ import styleNames from '@pareto-engineering/bem/exports';
 // Local Definitions
 
 import { Rating } from "./common";
-import { FormLabel } from "../../common";
+import { FormLabel, InputWrapper } from "../../common";
 const baseClassName = styleNames.base;
 const componentClassName = 'ratings-input';
 
@@ -21,32 +21,38 @@ const RatingsInput = ({
   name,
   ratingCount,
   showRatingValue,
-  oneInputLabel,
+  color,
   label,
   labelColor,
   labelMax,
   labelMin,
   displayRatingsLabel,
-  optional
+  optional,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan
   // ...otherProps
 }) => {
   useInsertionEffect(() => {
     import("./styles.scss");
   }, []);
   const [hover, setHover] = useState(null);
-  return /*#__PURE__*/React.createElement("div", {
-    id: id,
-    className: [baseClassName, componentClassName, userClassName].filter(e => e).join(' '),
-    style: style
-  }, /*#__PURE__*/React.createElement(FormLabel, {
-    className: ['input-label', oneInputLabel ? 'md-s2 s0 v1 mb-v' : 'v50 mb-v'].filter(e => e).join(' '),
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FormLabel, {
     name: name,
     color: labelColor,
-    optional: optional
-  }, label), /*#__PURE__*/React.createElement("div", {
-    className: "stars"
+    optional: optional,
+    columnSpan: labelSpan,
+    desktopColumnSpan: desktopLabelSpan
+    // {...otherProps}
+  }, label), /*#__PURE__*/React.createElement(InputWrapper, {
+    id: id,
+    className: [baseClassName, componentClassName, userClassName, 'stars'].filter(e => e).join(' '),
+    style: style,
+    columnSpan: inputSpan,
+    desktopColumnSpan: desktopInputSpan
   }, displayRatingsLabel && /*#__PURE__*/React.createElement("p", {
-    className: "label-text md-s-1 s-2 x-metadata c-x"
+    className: "label-text s-2 x-metadata c-x"
   }, labelMin), [...Array(ratingCount)].map((_, index) => {
     const ratingValue = index + 1;
     return /*#__PURE__*/React.createElement(Rating, {
@@ -56,10 +62,11 @@ const RatingsInput = ({
       name: name,
       hover: hover,
       setHover: setHover,
-      showRatingValue: showRatingValue
+      showRatingValue: showRatingValue,
+      activeBackgroundColor: color
     });
   }), displayRatingsLabel && /*#__PURE__*/React.createElement("p", {
-    className: "label-text md-s-1 s-2 x-metadata c-x"
+    className: "label-text s-2 x-metadata c-x"
   }, labelMax)));
 };
 RatingsInput.propTypes = {
@@ -108,17 +115,32 @@ RatingsInput.propTypes = {
    */
   optional: PropTypes.bool,
   /**
-  * If the slide will only have one input
+  * The color of the stars
   */
-  oneInputLabel: PropTypes.bool,
+  color: PropTypes.string,
   /**
   * String that will represent color for the label
   */
-  labelColor: PropTypes.string
+  labelColor: PropTypes.string,
+  /**
+  * The number of columns the label should span
+  */
+  labelSpan: PropTypes.number,
+  /**
+   * The number of columns the input should span
+   */
+  inputSpan: PropTypes.number,
+  /**
+   * The number of columns the label should span on desktop
+   */
+  desktopLabelSpan: PropTypes.number,
+  /**
+   * The number of columns the input should span on desktop
+   */
+  desktopInputSpan: PropTypes.number
 };
 RatingsInput.defaultProps = {
   labelMin: 'not satisfied.',
-  labelMax: 'very satisfied.',
-  labelColor: 'main2'
+  labelMax: 'very satisfied.'
 };
 export default /*#__PURE__*/memo(RatingsInput);

package/dist/es/f/fields/RatingsInput/common/Rating/Rating.js

@@ -41,7 +41,7 @@ const Rating = ({
     onMouseEnter: () => setHover(value),
     onMouseLeave: () => setHover(null)
   }, showRatingValue && /*#__PURE__*/React.createElement("span", {
-    className: "v25 mb-v md-s-1 s-2 x-metadata c-x"
+    className: "s-2 x-metadata c-x"
   }, value), /*#__PURE__*/React.createElement("span", {
     className: ['icon', value <= (hover || Number(field.value)) ? 'c-x' : 'c-hard-y'].filter(e => e).join(' ')
   }, "[")), /*#__PURE__*/React.createElement("input", _extends({}, field, {
@@ -102,8 +102,8 @@ Rating.propTypes = {
   validate: PropTypes.func
 };
 Rating.defaultProps = {
-  activeBackgroundColor: 'main',
-  inactiveBackgroundColor: 'background-far',
+  activeBackgroundColor: 'interactive',
+  inactiveBackgroundColor: 'background-inputs',
   showRatingValue: false
 };
 export default Rating;

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

@@ -1,37 +1,32 @@
 /* @pareto-engineering/generator-front 1.0.12 */
 
 @use "@pareto-engineering/bem";
+@use "@pareto-engineering/styles/src/mixins";
+@use "@pareto-engineering/styles/src/globals" as *;
 
 $default-rating-icon-margin: .5em;
 $default-padding: .2em;
 $default-transition: all .2s;
 
 .#{bem.$base}.ratings-input {
-  display: flex;
-  flex-direction: column;
-
-  p {
-    padding: $default-padding;
-  }
-
-  .stars {
+  &.stars {
     display: flex;
 
     >:not(:last-child) {
       margin-right: $default-rating-icon-margin;
     }
 
-    .#{bem.$base}.rating {
+    > .#{bem.$base}.rating {
       display: flex;
 
-      input {
+      > input {
         opacity: 0;
         position: absolute;
         visibility: none;
         z-index: -1;
       }
 
-      label {
+      > label {
         align-items: center;
         cursor: pointer;
         display: flex;
@@ -47,5 +42,3 @@ $default-transition: all .2s;
     }
   }
 }
-
-

package/dist/es/f/fields/SelectInput/SelectInput.js

@@ -6,7 +6,7 @@ import { useField } from 'formik';
 import PropTypes from 'prop-types';
 import styleNames from '@pareto-engineering/bem/exports';
 import { LoadingCircle } from "../../../a";
-import { FormLabel, FormDescription } from "../../common";
+import { FormLabel, FormDescription, InputWrapper } from "../../common";
 
 // Local Definitions
 
@@ -22,6 +22,7 @@ const SelectInput = ({
   style,
   name,
   label,
+  labelColor,
   color,
   options,
   validate,
@@ -29,7 +30,11 @@ const SelectInput = ({
   description,
   disabled,
   isLoading,
-  autoComplete
+  autoComplete,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan
   // ...otherProps
 }) => {
   useInsertionEffect(() => {
@@ -39,18 +44,23 @@ const SelectInput = ({
     name,
     validate
   });
-  return /*#__PURE__*/React.createElement("div", {
-    id: id,
-    className: [baseClassName, componentClassName, userClassName, `y-${color}`].filter(e => e).join(' '),
-    style: style
-    // {...otherProps}
-  }, /*#__PURE__*/React.createElement(FormLabel, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FormLabel, {
     name: name,
-    optional: optional
-  }, label), /*#__PURE__*/React.createElement("div", {
-    className: "select-wrapper with-faded-border"
+    color: labelColor,
+    optional: optional,
+    columnSpan: labelSpan,
+    desktopColumnSpan: desktopLabelSpan
+    // {...otherProps}
+  }, label), /*#__PURE__*/React.createElement(InputWrapper, {
+    id: id,
+    className: [baseClassName, componentClassName, userClassName].filter(e => e).join(' '),
+    style: style,
+    columnSpan: inputSpan,
+    desktopColumnSpan: desktopInputSpan
+  }, /*#__PURE__*/React.createElement("div", {
+    className: `select-wrapper${disabled ? ' disabled' : ''}`
   }, /*#__PURE__*/React.createElement("select", _extends({
-    className: "input"
+    className: `input y-${color}`
   }, field, {
     value: field.value || '',
     id: name,
@@ -68,12 +78,12 @@ const SelectInput = ({
       disabled: newOption?.disabled || false
     }, newOption.label);
   })), isLoading && /*#__PURE__*/React.createElement(LoadingCircle, {
-    className: "x-main2"
+    className: "x-main"
   })), /*#__PURE__*/React.createElement(FormDescription, {
-    className: "v50 mt-v s-1",
+    className: "s-1",
     description: description,
     name: name
-  }));
+  })));
 };
 SelectInput.propTypes = {
   /**
@@ -120,6 +130,10 @@ SelectInput.propTypes = {
    * The color of the select input
    */
   color: PropTypes.string,
+  /**
+   * The color of the select input label
+   */
+  labelColor: PropTypes.string,
   /*
   * Whether the query that is fetching the select options is still in flight
   */
@@ -129,12 +143,28 @@ SelectInput.propTypes = {
    */
   autoComplete: PropTypes.string,
   /**
+  * The number of columns the label should span
+  */
+  labelSpan: PropTypes.number,
+  /**
+   * The number of columns the input should span
+   */
+  inputSpan: PropTypes.number,
+  /**
+   * The number of columns the label should span on desktop
+   */
+  desktopLabelSpan: PropTypes.number,
+  /**
+   * The number of columns the input should span on desktop
+   */
+  desktopInputSpan: PropTypes.number,
+  /**
   * Whether the input is optional or not
   */
   optional: PropTypes.bool
 };
 SelectInput.defaultProps = {
   disabled: false,
-  color: 'interactive'
+  color: 'paragraph'
 };
 export default /*#__PURE__*/memo(SelectInput);