@pareto-engineering/design-system 4.0.0-alpha.5 → 4.0.0-alpha.51

package/src/ui/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(--hard-x);
+  color: var(--x);
+  grid-column: span var(--column-span);
+
+  @include mixins.media($from: $sm-md) {
+    grid-column: span var(--column-span-md);
+  }
 }

package/src/ui/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 { InputWrapper } from './InputWrapper'

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

@@ -9,7 +9,7 @@ import styleNames from '@pareto-engineering/bem/exports'
 
 import { useField } from 'formik'
 
-import { FormLabel, FormDescription } from '../../common'
+import { FormLabel, FormDescription, InputWrapper } from '../../common'
 
 // Local Definitions
 
@@ -29,6 +29,11 @@ const Checkbox = ({
   description,
   disabled,
   optional,
+  labelColor,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan,
   // ...otherProps
 }) => {
   useInsertionEffect(() => {
@@ -38,34 +43,42 @@ const Checkbox = ({
   const [field] = useField({ name, type: 'checkbox' })
 
   return (
-    <div
-      id={id}
-      className={[
-
-        baseClassName,
-
-        componentClassName,
-        userClassName,
-      ]
-        .filter((e) => e)
-        .join(' ')}
-      style={style}
-      // {...otherProps}
-    >
+    <>
       {label && (
-      <FormLabel name={name} optional={optional}>
-        {label}
-      </FormLabel>
+        <FormLabel
+          name={name}
+          color={labelColor}
+          optional={optional}
+          columnSpan={labelSpan}
+          desktopColumnSpan={desktopLabelSpan}
+        // {...otherProps}
+        >
+          {label}
+        </FormLabel>
       )}
-      <input
-        id={name}
-        className="input"
-        type="checkbox"
-        disabled={disabled}
-        {...field}
-      />
-      <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}
+      >
+        <input
+          id={name}
+          className="input"
+          type="checkbox"
+          disabled={disabled}
+          {...field}
+        />
+        <FormDescription className="s-1" description={description} name={name} />
+      </InputWrapper>
+    </>
   )
 }
 
@@ -100,11 +113,36 @@ Checkbox.propTypes = {
    */
   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/src/ui/f/fields/Checkbox/styles.scss

@@ -1,15 +1,14 @@
 /* @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;
+    justify-content: center;
   }
 }

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

@@ -11,7 +11,7 @@ import styleNames from '@pareto-engineering/bem/exports'
 
 import { Choice } from './common'
 
-import { FormLabel } from '../../common'
+import { FormDescription, FormLabel, InputWrapper } from '../../common'
 
 const baseClassName = styleNames.base
 
@@ -28,60 +28,68 @@ const ChoicesInput = ({
   validate,
   options,
   multiple,
-  gridColumnsMobile,
-  gridColumnsDesktop,
   color,
-  colorChecked,
   label,
+  labelColor,
   optional,
   disabled,
-  // ...otherProps
+  description,
+  spaceBetween,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan,
+  ...otherProps
 }) => {
   useInsertionEffect(() => {
     import('./styles.scss')
   }, [])
 
   return (
-    <div
-      id={id}
-      className={[
-
-        baseClassName,
-
-        componentClassName,
-        userClassName,
-        multiple && 'multiple',
-        color && `x-${color}`,
-        colorChecked && `y-${colorChecked}`,
-      ]
-        .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">
-        { options.map((choice) => (
-          <Choice
-            key={choice.value}
-            name={name}
-            id={`${name}-${choice.value}`}
-            multiple={multiple}
-            validate={validate}
-            disabled={disabled}
-            {...choice}
-          />
-        ))}
-      </div>
-    </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>
+    </>
   )
 }
 
@@ -148,14 +156,41 @@ ChoicesInput.propTypes = {
   * Whether the input is optional or not
   */
   optional:PropTypes.bool,
+
+  /**
+   * 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             :'background2',
-  colorChecked      :'main2',
-  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,67 +1,76 @@
 /* @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";
 @use "@pareto-engineering/styles/src/globals" as *;
 
-$default-grid-gap:var(--u, 1em);
-$default-padding:var(--u, 1em);
-$default-transition:all .3s;
+$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 {
-    display: grid;
-    gap: $default-grid-gap;
-    grid-template-columns: repeat(var(--grid-columns-mobile), 1fr);
+  &.#{bem.$base}.input-wrapper {
+    display: flex;
+    flex-direction: column;
 
-    @include mixins.media($from:$sm-md) {
-      grid-template-columns: repeat(var(--grid-columns-desktop), 1fr);
-    }
-
-    .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;
 
-      input:not(:disabled) + label {
-        &:hover {
-          border-color: var(--soft-y);
+        input {
+          opacity: 0;
+          position: fixed;
+          visibility: none;
+          z-index: -1;
         }
-      }
 
-      label {
-        background: var(--soft-x);
-        border: var(--theme-border-style) var(--hard-x);
-        border-radius: var(--theme-border-radius);
-        color: var(--on-x);
-        cursor: pointer;
-        display: block;
-        height: 100%;
-        padding: $default-padding;
-        transition: $default-transition;
-        width: 100%;
-      }
+        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;
 
-      input:checked + label {
-        background: var(--y);
-        color: var(--on-y);
+          &:not(.disabled) {
+            &:hover {
+              border: $hover-border;
+            }
+          }
+        }
 
-        &:hover {
-          border-color: var(--y);
+        input:checked + label {
+          background: var(--x);
+          color: var(--on-x);
         }
       }
     }
   }
 }
-
-