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

package/dist/es/f/common/Label/Label.js

@@ -20,7 +20,9 @@ const Label = ({
   name,
   color,
   optional,
-  as: Wrapper
+  as: Wrapper,
+  columnSpan,
+  desktopColumnSpan
   // ...otherProps
 }) => {
   useInsertionEffect(() => {
@@ -30,7 +32,11 @@ const Label = ({
     htmlFor: Wrapper === 'label' ? name : undefined,
     id: id,
     className: [baseClassName, componentClassName, userClassName, `x-${color}`].filter(e => e).join(' '),
-    style: style
+    style: {
+      ...style,
+      '--column-span': columnSpan || 'var(--columns)',
+      '--column-span-md': desktopColumnSpan || 'var(--columns)'
+    }
     // {...otherProps}
   }, children, optional && ' (Optional)');
 };
@@ -66,11 +72,19 @@ Label.propTypes = {
   /**
    * Whether the input should have an optional tag
    */
-  optional: PropTypes.bool
+  optional: PropTypes.bool,
+  /**
+  * How many columns the input should span
+  */
+  columnSpan: PropTypes.number,
+  /**
+   * How many columns the input should span on desktop
+   */
+  desktopColumnSpan: PropTypes.number
 };
 Label.defaultProps = {
   as: 'label',
-  color: 'main2',
+  color: 'paragraph',
   optional: false
 };
 export default Label;

package/dist/es/f/common/Label/styles.scss

@@ -1,8 +1,14 @@
 /* @pareto-engineering/generator-front 1.0.12 */
 
 @use "@pareto-engineering/bem";
-@use "../../../form.scss";
+@use "@pareto-engineering/styles/src/mixins";
+@use "@pareto-engineering/styles/src/globals" as *;
 
 .#{bem.$base}.form-label {
-  color: var(--paragraph);
+  color: var(--x);
+  grid-column: span var(--column-span);
+
+  @include mixins.media($from: $sm-md) {
+    grid-column: span var(--column-span-md);
+  }
 }

package/dist/es/f/common/index.js

@@ -1,3 +1,4 @@
 export { Label as FormLabel } from "./Label";
 export { Description as FormDescription } from "./Description";
-export { Debugger as FormDebugger } from "./Debugger";
+export { Debugger as FormDebugger } from "./Debugger";
+export { InputWrapper } from "./InputWrapper";

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

@@ -5,7 +5,7 @@ import { useInsertionEffect } from 'react';
 import PropTypes from 'prop-types';
 import styleNames from '@pareto-engineering/bem/exports';
 import { useField } from 'formik';
-import { FormLabel, FormDescription } from "../../common";
+import { FormLabel, FormDescription, InputWrapper } from "../../common";
 
 // Local Definitions
 
@@ -23,7 +23,12 @@ const Checkbox = ({
   label,
   description,
   disabled,
-  optional
+  optional,
+  labelColor,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan
   // ...otherProps
 }) => {
   useInsertionEffect(() => {
@@ -33,24 +38,29 @@ const Checkbox = ({
     name,
     type: 'checkbox'
   });
-  return /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, label && /*#__PURE__*/React.createElement(FormLabel, {
+    name: name,
+    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
-    // {...otherProps}
-  }, label && /*#__PURE__*/React.createElement(FormLabel, {
-    name: name,
-    optional: optional
-  }, label), /*#__PURE__*/React.createElement("input", _extends({
+    style: style,
+    columnSpan: inputSpan,
+    desktopColumnSpan: desktopInputSpan
+  }, /*#__PURE__*/React.createElement("input", _extends({
     id: name,
     className: "input",
     type: "checkbox",
     disabled: disabled
   }, field)), /*#__PURE__*/React.createElement(FormDescription, {
-    className: "v50 mt-v s-1",
+    className: "s-1",
     description: description,
     name: name
-  }));
+  })));
 };
 Checkbox.propTypes = {
   /**
@@ -77,10 +87,30 @@ Checkbox.propTypes = {
    * Whether the input should be disabled
    */
   disabled: PropTypes.bool,
+  /**
+   * The color of the label
+   */
+  labelColor: PropTypes.string,
   /**
    * The input label
    */
   label: 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 should have an optional tag
    */

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

@@ -1,15 +1,13 @@
 /* @pareto-engineering/generator-front 1.0.12 */
 
 @use "@pareto-engineering/bem";
-
-$default-margin: 1em;
+@use "@pareto-engineering/styles/src/mixins";
+@use "@pareto-engineering/styles/src/globals" as *;
 
 .#{bem.$base}.checkbox {
-  align-items: flex-start;
-  display: flex;
-  flex-direction: column;
-
-  .#{bem.$base}.label {
-    margin-bottom: $default-margin;
+  &.#{bem.$base}.input-wrapper {
+    align-items: flex-start;
+    display: flex;
+    flex-direction: column;
   }
 }

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

@@ -8,7 +8,7 @@ import styleNames from '@pareto-engineering/bem/exports';
 // Local Definitions
 
 import { Choice } from "./common";
-import { FormDescription, FormLabel } from "../../common";
+import { FormDescription, FormLabel, InputWrapper } from "../../common";
 const baseClassName = styleNames.base;
 const componentClassName = 'choices-input';
 
@@ -23,35 +23,39 @@ const ChoicesInput = ({
   validate,
   options,
   multiple,
-  gridColumnsMobile,
-  gridColumnsDesktop,
   color,
   label,
+  labelColor,
   optional,
   disabled,
   description,
   spaceBetween,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan,
   ...otherProps
 }) => {
   useInsertionEffect(() => {
     import("./styles.scss");
   }, []);
-  return /*#__PURE__*/React.createElement("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
-    }
+  return /*#__PURE__*/React.createElement(React.Fragment, null, label && /*#__PURE__*/React.createElement(FormLabel, {
+    name: name,
+    color: labelColor,
+    optional: optional,
+    columnSpan: labelSpan,
+    desktopColumnSpan: desktopLabelSpan
     // {...otherProps}
-  }, label && /*#__PURE__*/React.createElement(FormLabel, {
-    as: "p",
-    optional: optional
-  }, label), /*#__PURE__*/React.createElement("div", {
+  }, 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: ['choices', spaceBetween && 'space-between'].filter(Boolean).join(' ')
   }, options.map(choice => /*#__PURE__*/React.createElement(Choice, _extends({
-    labelClassName: "with-faded-border",
+    className: `x-${color}`,
     key: choice.value,
     name: name,
     id: `${name}-${choice.value}`,
@@ -59,10 +63,10 @@ const ChoicesInput = ({
     validate: validate,
     disabled: disabled
   }, otherProps, choice)))), /*#__PURE__*/React.createElement(FormDescription, {
-    className: "v50 mt-v s-1",
+    className: "s-1",
     description: description,
     name: name
-  }));
+  })));
 };
 ChoicesInput.propTypes = {
   /**
@@ -127,11 +131,29 @@ ChoicesInput.propTypes = {
   /**
    * The select input description
    */
-  description: PropTypes.string
+  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
 };

package/dist/es/f/fields/ChoicesInput/common/Choice/Choice.js

@@ -44,7 +44,7 @@ const Choice = ({
     disabled: disabled
   })), /*#__PURE__*/React.createElement("label", {
     htmlFor: id,
-    className: labelClassName,
+    className: [labelClassName, disabled && 'disabled'].filter(e => e).join(' '),
     style: labelStyle
   }, label));
 };

package/dist/es/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(--theme-default-input-background);
+$disabled-background: var(--theme-disabled-input-background);
 
 .#{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/dist/es/f/fields/QueryChoices/QueryChoices.js

@@ -18,6 +18,10 @@ const QueryChoices = ({
   validate,
   loadingOption,
   extraVariables,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan,
   ...otherProps
 }) => {
   const [,, helpers] = useField({
@@ -70,7 +74,11 @@ const QueryChoices = ({
   return /*#__PURE__*/React.createElement(ChoicesInput, _extends({
     name: name,
     validate: validate,
-    options: options
+    options: options,
+    labelSpan: labelSpan,
+    desktopLabelSpan: desktopLabelSpan,
+    inputSpan: inputSpan,
+    desktopInputSpan: desktopInputSpan
   }, otherProps));
 };
 QueryChoices.propTypes = {
@@ -114,7 +122,23 @@ QueryChoices.propTypes = {
    *  The extra variables that might be required to be used in the query to fetch
    *  select options.
    */
-  extraVariables: PropTypes.objectOf(PropTypes.string)
+  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 = {
   loadingOption: {

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

@@ -20,6 +20,7 @@ const QueryCombobox = ({
   multiple,
   name,
   label,
+  labelColor,
   color,
   optional,
   description,
@@ -30,7 +31,11 @@ const QueryCombobox = ({
   optionsKeyMap,
   minLength,
   transformSearch,
-  validate
+  validate,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan
   // ...otherProps
 }) => {
   useInsertionEffect(() => {
@@ -95,6 +100,7 @@ const QueryCombobox = ({
     disabled,
     name,
     label,
+    labelColor,
     optional,
     description,
     setValue,
@@ -103,7 +109,11 @@ const QueryCombobox = ({
     isFetching,
     className,
     minLength,
-    transformSearch
+    transformSearch,
+    labelSpan,
+    desktopLabelSpan,
+    inputSpan,
+    desktopInputSpan
   };
   const Input = multiple ? MultipleCombobox : Combobox;
   return /*#__PURE__*/React.createElement(Input, comboboxProps);
@@ -129,6 +139,10 @@ QueryCombobox.propTypes = {
    * The label of the custom select input
    */
   label: PropTypes.string,
+  /**
+   * The label color of the custom select input
+   */
+  labelColor: PropTypes.string,
   /**
    * The custom select input description
    */
@@ -138,7 +152,7 @@ QueryCombobox.propTypes = {
    */
   disabled: PropTypes.bool,
   /**
-   * The base color of the custom select input
+   * The base color of the tiles
    */
   color: PropTypes.string,
   /**
@@ -187,7 +201,23 @@ QueryCombobox.propTypes = {
   /*
   * Whether the input is optional or not
   */
-  optional: PropTypes.bool
+  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 = {
   optionsKeyMap: {
@@ -195,7 +225,7 @@ QueryCombobox.defaultProps = {
     getLabel: node => node.name
   },
   multiple: false,
-  color: 'background-near',
+  color: 'interactive',
   searchVariable: 'search',
   transformSearch: search => search,
   minLength: 2,

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

@@ -8,6 +8,7 @@ import styleNames from '@pareto-engineering/bem/exports';
 import { FormLabel, FormDescription } from "../../../..";
 import { Popover, LoadingCircle } from "../../../../../a";
 import { Button } from "../../../../../b";
+import { InputWrapper } from "../../../../common";
 
 // Local Definitions
 
@@ -23,6 +24,7 @@ const Combobox = ({
   className: userClassName,
   style,
   label,
+  labelColor,
   name,
   options: items,
   getOptions,
@@ -34,7 +36,11 @@ const Combobox = ({
   isFetching,
   transformSearch,
   disabled,
-  optional
+  optional,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan
   // ...otherProps
 }) => {
   const {
@@ -79,16 +85,20 @@ const Combobox = ({
   }, [value]);
   const parentRef = 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(InputWrapper, _extends({
     id: id,
-    className: [baseClassName, componentClassName, userClassName, `y-${color}`].filter(e => e).join(' '),
+    className: [baseClassName, componentClassName, userClassName].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
@@ -101,19 +111,20 @@ const Combobox = ({
     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: items
-  }, getMenuProps()))), /*#__PURE__*/React.createElement(FormDescription, {
-    className: "v50 mt-v s-1",
-    description: description,
-    name: name
-  }));
+  }, getMenuProps())))));
 };
 Combobox.propTypes = {
   /**
@@ -183,6 +194,22 @@ 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
   */
   optional: PropTypes.bool