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

package/src/ui/f/fields/QueryChoices/QueryChoices.jsx

@@ -22,6 +22,10 @@ const QueryChoices = ({
   validate,
   loadingOption,
   extraVariables,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan,
   ...otherProps
 }) => {
   const [, , helpers] = useField({ name, validate })
@@ -84,6 +88,10 @@ const QueryChoices = ({
       name={name}
       validate={validate}
       options={options}
+      labelSpan={labelSpan}
+      desktopLabelSpan={desktopLabelSpan}
+      inputSpan={inputSpan}
+      desktopInputSpan={desktopInputSpan}
       {...otherProps}
     />
   )
@@ -140,6 +148,26 @@ QueryChoices.propTypes = {
    *  select options.
    */
   extraVariables:PropTypes.objectOf(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,
 }
 
 QueryChoices.defaultProps = {

package/src/ui/f/fields/QueryCombobox/QueryCombobox.jsx

@@ -1,7 +1,7 @@
 /* @pareto-engineering/generator-front 1.0.12 */
 import * as React from 'react'
 
-import { useState, useLayoutEffect } from 'react'
+import { useState, useInsertionEffect } from 'react'
 
 import { useField } from 'formik'
 
@@ -24,6 +24,7 @@ const QueryCombobox = ({
   multiple,
   name,
   label,
+  labelColor,
   color,
   optional,
   description,
@@ -35,9 +36,13 @@ const QueryCombobox = ({
   minLength,
   transformSearch,
   validate,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan,
   // ...otherProps
 }) => {
-  useLayoutEffect(() => {
+  useInsertionEffect(() => {
     import('./styles.scss')
   }, [])
 
@@ -101,6 +106,7 @@ const QueryCombobox = ({
     disabled,
     name,
     label,
+    labelColor,
     optional,
     description,
     setValue,
@@ -110,6 +116,10 @@ const QueryCombobox = ({
     className,
     minLength,
     transformSearch,
+    labelSpan,
+    desktopLabelSpan,
+    inputSpan,
+    desktopInputSpan,
   }
 
   const Input = multiple ? MultipleCombobox : Combobox
@@ -143,6 +153,11 @@ QueryCombobox.propTypes = {
    */
   label:PropTypes.string,
 
+  /**
+   * The label color of the custom select input
+   */
+  labelColor:PropTypes.string,
+
   /**
    * The custom select input description
    */
@@ -154,7 +169,7 @@ QueryCombobox.propTypes = {
   disabled:PropTypes.bool,
 
   /**
-   * The base color of the custom select input
+   * The base color of the tiles
    */
   color:PropTypes.string,
 
@@ -217,6 +232,26 @@ QueryCombobox.propTypes = {
   * Whether the input is optional or not
   */
   optional:PropTypes.bool,
+
+  /**
+   * 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,
 }
 
 QueryCombobox.defaultProps = {
@@ -225,7 +260,7 @@ QueryCombobox.defaultProps = {
     getLabel:(node) => node.name,
   },
   multiple       :false,
-  color          :'background2',
+  color          :'interactive',
   searchVariable :'search',
   transformSearch:(search) => search,
   minLength      :2,

package/src/ui/f/fields/QueryCombobox/common/Combobox/Combobox.jsx

@@ -15,6 +15,8 @@ import { Popover, LoadingCircle } from 'ui/a'
 
 import { Button } from 'ui/b'
 
+import { InputWrapper } from '../../../../common'
+
 // Local Definitions
 
 import { Menu } from '../Menu'
@@ -31,6 +33,7 @@ const Combobox = ({
   className:userClassName,
   style,
   label,
+  labelColor,
   name,
   options:items,
   getOptions,
@@ -43,6 +46,10 @@ const Combobox = ({
   transformSearch,
   disabled,
   optional,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan,
   // ...otherProps
 }) => {
   const {
@@ -89,58 +96,61 @@ const Combobox = ({
   const resetInputValue = () => setInputValue('')
 
   return (
-    <div
-      id={id}
-      className={[
-
-        baseClassName,
-
-        componentClassName,
-        userClassName,
-        `y-${color}`,
-      ]
-        .filter((e) => e)
-        .join(' ')}
-      style={style}
-      ref={parentRef}
-    >
+    <>
       <FormLabel
         {...getLabelProps()}
         name={name}
         optional={optional}
+        color={labelColor}
+        columnSpan={labelSpan}
+        desktopColumnSpan={desktopLabelSpan}
       >
         {label}
       </FormLabel>
 
-      <div {...getComboboxProps()} className="input-wrapper">
+      <InputWrapper
+        id={id}
+        className={[
+          baseClassName,
+          componentClassName,
+          userClassName,
+          `y-${color}`,
+        ]
+          .filter((e) => e)
+          .join(' ')}
+        style={style}
+        ref={parentRef}
+        {...getComboboxProps()}
+        columnSpan={inputSpan}
+        desktopColumnSpan={desktopInputSpan}
+      >
         <input {...getInputProps()} className="input" disabled={disabled} />
         {isFetching && (
-        <LoadingCircle className="x-main2" />
+          <LoadingCircle className="x-main" />
         )}
         {inputValue.length > minLength && !isFetching && (
-          <Button isSimple isCompact color="main2" onClick={resetInputValue}>
-            <span className="f-icons">
-              Y
-            </span>
-          </Button>
+        <Button isSimple isCompact color="heading" onClick={resetInputValue}>
+          <span className="icon">
+            Y
+          </span>
+        </Button>
         )}
-      </div>
-
-      <Popover
-        isOpen={isOpen}
-        parentRef={parentRef}
-      >
-        <Menu
+        <FormDescription className="s-1" description={description} name={name} />
+        <Popover
           isOpen={isOpen}
-          getItemProps={getItemProps}
-          highlightedIndex={highlightedIndex}
-          items={items}
-          {...getMenuProps()}
-        />
-      </Popover>
-
-      <FormDescription className="v50 mt-v s-1" description={description} name={name} />
-    </div>
+          parentRef={parentRef}
+        >
+          <Menu
+            className={`y-${color}`}
+            isOpen={isOpen}
+            getItemProps={getItemProps}
+            highlightedIndex={highlightedIndex}
+            items={items}
+            {...getMenuProps()}
+          />
+        </Popover>
+      </InputWrapper>
+    </>
   )
 }
 
@@ -228,6 +238,26 @@ Combobox.propTypes = {
    */
   disabled:PropTypes.bool,
 
+  /**
+ * 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
   */

package/src/ui/f/fields/QueryCombobox/common/MultipleCombobox/MultipleCombobox.jsx

@@ -15,6 +15,8 @@ import { Popover, LoadingCircle } from 'ui/a'
 
 import { FormDescription, FormLabel } from 'ui/f'
 
+import { InputWrapper } from '../../../../common'
+
 // Local Definitions
 
 import { Menu } from '../Menu'
@@ -42,6 +44,7 @@ const MultipleCombobox = ({
   className:userClassName,
   style,
   label,
+  labelColor,
   name,
   optional,
   options:items,
@@ -54,6 +57,10 @@ const MultipleCombobox = ({
   minLength,
   transformSearch,
   disabled,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan,
   // ...otherProps
 }) => {
   const [searchInputValue, setSearchInputValue] = useState('')
@@ -150,54 +157,63 @@ const MultipleCombobox = ({
   const resetInputValue = () => setInputValue('')
 
   return (
-    <div
-      id={id}
-      className={[
-
-        baseClassName,
-
-        componentClassName,
-        userClassName,
-        `y-${color}`,
-      ]
-        .filter((e) => e)
-        .join(' ')}
-      style={style}
-    >
-
+    <>
       <FormLabel
+        className={[
+          baseClassName,
+          componentClassName,
+        ]
+          .filter((e) => e)
+          .join(' ')}
         {...getLabelProps()}
         name={name}
         optional={optional}
+        color={labelColor}
+        columnSpan={labelSpan}
+        desktopColumnSpan={desktopLabelSpan}
       >
         {label}
       </FormLabel>
 
-      {selectedItems?.length > 0 && (
-      <div className="selected-items">
-        {selectedItems.map((selectedItem, index) => (
-          <div
-            key={selectedItem.label}
-            {...getSelectedItemProps({ selectedItem, index })}
-            className="item"
-          >
-            <Button
-              onClick={(e) => {
-                e.stopPropagation()
-                removeSelectedItem(selectedItem)
-              }}
-              isCompact
-              isSimple
-              color={color}
-            >
-              <span className="v25 mr-v">{selectedItem.label}</span>
-              <span className="f-icons close">Y</span>
-            </Button>
+      <InputWrapper
+        id={id}
+        className={[
+          baseClassName,
+          componentClassName,
+          userClassName,
+        ]
+          .filter((e) => e)
+          .join(' ')}
+        style={style}
+        ref={parentRef}
+        columnSpan={inputSpan}
+        desktopColumnSpan={desktopInputSpan}
+        {...getComboboxProps()}
+      >
+        {selectedItems?.length > 0 && (
+          <div className="selected-items">
+            {selectedItems.map((selectedItem, index) => (
+              <div
+                key={selectedItem.label}
+                {...getSelectedItemProps({ selectedItem, index })}
+                className="item"
+              >
+                <Button
+                  onClick={(e) => {
+                    e.stopPropagation()
+                    removeSelectedItem(selectedItem)
+                  }}
+                  isCompact
+                  color={color}
+                >
+                  <span>{selectedItem.label}</span>
+                  <span className="icon close">Y</span>
+                </Button>
+              </div>
+            ))}
           </div>
-        ))}
-      </div>
-      )}
-      <div {...getComboboxProps()} className="input-wrapper">
+        )}
+
         <input
           {...getInputProps(
             getDropdownProps({ preventKeyAction: isOpen }),
@@ -206,38 +222,37 @@ const MultipleCombobox = ({
           disabled={disabled}
         />
         {isFetching && (
-        <LoadingCircle className="x-main2" />
+          <LoadingCircle className="x-main" />
         )}
         {inputValue.length > minLength && !isFetching && (
-          <Button
-            isSimple
-            isCompact
-            color="main2"
-            onClick={resetInputValue}
-          >
-            <span className="f-icons">
-              Y
-            </span>
-          </Button>
+        <Button
+          isSimple
+          isCompact
+          color="interactive"
+          onClick={resetInputValue}
+        >
+          <span className="icon">
+            Y
+          </span>
+        </Button>
         )}
-      </div>
 
-      <Popover
-        isOpen={isOpen}
-        parentRef={parentRef}
-      >
-        <Menu
+        <FormDescription className="s-1" description={description} name={name} />
+        <Popover
           isOpen={isOpen}
-          getItemProps={getItemProps}
-          highlightedIndex={highlightedIndex}
-          items={getFilteredItems()}
-          {...getMenuProps()}
-        />
-      </Popover>
-
-      <FormDescription className="v50 mt-v s-1" description={description} name={name} />
-
-    </div>
+          parentRef={parentRef}
+        >
+          <Menu
+            className={`y-${color}`}
+            isOpen={isOpen}
+            getItemProps={getItemProps}
+            highlightedIndex={highlightedIndex}
+            items={getFilteredItems()}
+            {...getMenuProps()}
+          />
+        </Popover>
+      </InputWrapper>
+    </>
   )
 }
 

package/src/ui/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/src/ui/f/fields/QuerySelect/QuerySelect.jsx

@@ -22,6 +22,7 @@ const QuerySelect = ({
   style,
   name,
   label,
+  labelColor,
   optional,
   query,
   variables,
@@ -32,6 +33,10 @@ const QuerySelect = ({
   loadingOption,
   defaultOption,
   validate,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan,
   // ...otherProps
 }) => {
   const [, , helpers] = useField({ name, validate })
@@ -91,10 +96,15 @@ const QuerySelect = ({
       label={label}
       optional={optional}
       color={color}
+      labelColor={labelColor}
       description={description}
       disabled={isFetching || disabled}
       options={options}
       isLoading={isFetching}
+      labelSpan={labelSpan}
+      desktopLabelSpan={desktopLabelSpan}
+      inputSpan={inputSpan}
+      desktopInputSpan={desktopInputSpan}
     />
   )
 }
@@ -140,6 +150,11 @@ QuerySelect.propTypes = {
    */
   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
    */
@@ -197,7 +212,7 @@ QuerySelect.propTypes = {
 
 QuerySelect.defaultProps = {
   disabled     :false,
-  color        :'background2',
+  color        :'paragraph',
   defaultOption:{
     value   :'',
     label   :'Select an option',