@pareto-engineering/design-system 4.0.0-alpha.35 → 4.0.0-alpha.37

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

@@ -11,7 +11,7 @@ import styleNames from '@pareto-engineering/bem/exports'
 
 import { Choice } from './common'
 
-import { FormDescription, FormLabel } from '../../common'
+import { FormDescription, FormLabel, InputWrapper } from '../../common'
 
 const baseClassName = styleNames.base
 
@@ -28,14 +28,17 @@ const ChoicesInput = ({
   validate,
   options,
   multiple,
-  gridColumnsMobile,
-  gridColumnsDesktop,
   color,
   label,
+  labelColor,
   optional,
   disabled,
   description,
   spaceBetween,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan,
   ...otherProps
 }) => {
   useInsertionEffect(() => {
@@ -43,48 +46,50 @@ const ChoicesInput = ({
   }, [])
 
   return (
-    <div
-      id={id}
-      className={[
-
-        baseClassName,
-
-        componentClassName,
-        userClassName,
-        multiple && 'multiple',
-        color && `x-${color}`,
-      ]
-        .filter((e) => e)
-        .join(' ')}
-      style={{
-        '--grid-columns-desktop':gridColumnsDesktop,
-        '--grid-columns-mobile' :gridColumnsMobile,
-        ...style,
-      }}
-      // {...otherProps}
-    >
+    <>
       {label && (
-      <FormLabel as="p" optional={optional}>
-        {label}
-      </FormLabel>
+        <FormLabel
+          name={name}
+          color={labelColor}
+          optional={optional}
+          columnSpan={labelSpan}
+          desktopColumnSpan={desktopLabelSpan}
+        // {...otherProps}
+        >
+          {label}
+        </FormLabel>
       )}
-      <div className={['choices', spaceBetween && 'space-between'].filter(Boolean).join(' ')}>
-        { options.map((choice) => (
-          <Choice
-            labelClassName="with-faded-border"
-            key={choice.value}
-            name={name}
-            id={`${name}-${choice.value}`}
-            multiple={multiple}
-            validate={validate}
-            disabled={disabled}
-            {...otherProps}
-            {...choice}
-          />
-        ))}
-      </div>
-      <FormDescription className="v50 mt-v s-1" description={description} name={name} />
-    </div>
+      <InputWrapper
+        id={id}
+        className={[
+          baseClassName,
+          componentClassName,
+          userClassName,
+        ]
+          .filter((e) => e)
+          .join(' ')}
+        style={style}
+        columnSpan={inputSpan}
+        desktopColumnSpan={desktopInputSpan}
+      >
+        <div className={['choices', spaceBetween && 'space-between'].filter(Boolean).join(' ')}>
+          { options.map((choice) => (
+            <Choice
+              className={`x-${color}`}
+              key={choice.value}
+              name={name}
+              id={`${name}-${choice.value}`}
+              multiple={multiple}
+              validate={validate}
+              disabled={disabled}
+              {...otherProps}
+              {...choice}
+            />
+          ))}
+        </div>
+        <FormDescription className="s-1" description={description} name={name} />
+      </InputWrapper>
+    </>
   )
 }
 
@@ -156,13 +161,36 @@ ChoicesInput.propTypes = {
    * The select input description
    */
   description: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,
+
+  /**
+   * The color of the label
+   */
+  labelColor:PropTypes.string,
 }
 
 ChoicesInput.defaultProps = {
-  gridColumnsMobile :2,
-  gridColumnsDesktop:3,
-  color             :'interactive',
-  disabled          :false,
+  color   :'interactive',
+  disabled:false,
 }
 
 export default memo(ChoicesInput)

package/src/ui/f/fields/ChoicesInput/common/Choice/Choice.jsx

@@ -40,9 +40,7 @@ const Choice = ({
   return (
     <div
       className={[
-
         baseClassName,
-
         componentClassName,
         userClassName,
       ]
@@ -58,7 +56,16 @@ const Choice = ({
         value={value}
         disabled={disabled}
       />
-      <label htmlFor={id} className={labelClassName} style={labelStyle}>
+      <label
+        htmlFor={id}
+        className={[
+          labelClassName,
+          disabled && 'disabled',
+        ]
+          .filter((e) => e)
+          .join(' ')}
+        style={labelStyle}
+      >
         { label }
       </label>
     </div>

package/src/ui/f/fields/ChoicesInput/styles.scss

@@ -1,5 +1,6 @@
 /* @pareto-engineering/generator-front 1.0.12 */
 /* stylelint-disable selector-max-compound-selectors -- exception */
+/* stylelint-disable max-nesting-depth -- exception */
 
 @use "@pareto-engineering/bem";
 @use "@pareto-engineering/styles/src/mixins";
@@ -9,52 +10,66 @@ $default-flex-separator:calc(1em / 2) calc(.75em / 2);
 $default-transition:var(--theme-default-transition);
 $default-label-padding: .3em 1em calc(2em - .3em);
 $default-label-height: .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);
+$disabled-background: var(--background-inputs-30);
 
 .#{bem.$base}.choices-input {
-  >.choices {
+  &.#{bem.$base}.input-wrapper {
     display: flex;
-    flex-wrap: wrap;
-    gap: $default-flex-separator;
+    flex-direction: column;
 
-    &.space-between {
-      justify-content: space-between;
-    }
-
-    >.choice {
+    > .choices {
       display: flex;
+      flex-wrap: wrap;
+      gap: $default-flex-separator;
 
-      input {
-        opacity: 0;
-        position: absolute;
-        visibility: none;
-        z-index: -1;
+      &.space-between {
+        justify-content: space-between;
       }
 
-      input:disabled + label {
-        background-color: var(--hard-x);
-      }
+      >.choice {
+        display: flex;
 
-      > label {
-        background-color: var(--background-inputs);
-        border-radius: var(--theme-default-border-radius);
-        color: var(--paragraph);
-        cursor: pointer;
-        display: block;
-        height: $default-label-height;
-        max-width: 100%;
-        padding: $default-label-padding;
-        position: relative;
-        transition: $default-transition;
-        white-space: nowrap;
-
-        &:hover {
-          box-shadow: var(--theme-default-input-box-shadow);
+        input {
+          opacity: 0;
+          position: absolute;
+          visibility: none;
+          z-index: -1;
         }
-      }
 
-      input:checked + label {
-        background: var(--x);
-        color: var(--on-x);
+        input:disabled + label {
+          background-color: $disabled-background;
+        }
+
+        > label {
+          background-color: $default-background;
+          border: $default-border;
+          border-radius: $default-input-border-radius;
+          color: var(--paragraph);
+          cursor: pointer;
+          display: block;
+          height: $default-label-height;
+          max-width: 100%;
+          padding: $default-label-padding;
+          position: relative;
+          transition: $default-transition;
+          white-space: nowrap;
+
+          &:not(.disabled) {
+            &:hover {
+              border: $hover-border;
+            }
+          }
+        }
+
+        input:checked + label {
+          background: var(--x);
+          color: var(--on-x);
+        }
       }
     }
   }

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

@@ -24,6 +24,7 @@ const QueryCombobox = ({
   multiple,
   name,
   label,
+  labelColor,
   color,
   optional,
   description,
@@ -35,6 +36,10 @@ const QueryCombobox = ({
   minLength,
   transformSearch,
   validate,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan,
   // ...otherProps
 }) => {
   useInsertionEffect(() => {
@@ -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          :'background-near',
+  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,60 @@ 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,
+        ]
+          .filter((e) => e)
+          .join(' ')}
+        style={style}
+        ref={parentRef}
+        {...getComboboxProps()}
+        columnSpan={inputSpan}
+        desktopColumnSpan={desktopInputSpan}
+      >
         <input {...getInputProps()} className="input" disabled={disabled} />
         {isFetching && (
-        <LoadingCircle className="x-main" />
+          <LoadingCircle className="x-main" />
         )}
         {inputValue.length > minLength && !isFetching && (
-          <Button isSimple isCompact color="heading" onClick={resetInputValue}>
-            <span className="icon">
-              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 +237,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
   */