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

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

@@ -2,45 +2,67 @@
 
 
 @use "@pareto-engineering/bem";
-@use "../../../form.scss";
-
+@use "@pareto-engineering/styles/src/mixins";
+@use "@pareto-engineering/styles/src/globals" as *;
 
 $default-spacing-size: 1em;
-$default-padding: .5em;
+$default-padding: .55em .75em;
 $default-bg-gradient: var(--background-far);
 $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}.select-input {
-  display: flex;
-  flex-direction: column;
-
-  .#{bem.$base}.label {
+  &.#{bem.$base}.label {
     margin-bottom: $default-spacing-size;
   }
 
-  >.select-wrapper {
-    background-color: var(--background-inputs);
+  .select-wrapper {
+    background-color: $default-background;
+    border: $default-border;
     border-radius: $default-input-border-radius;
-    padding: $default-padding 0 $default-padding calc($default-padding * 1.5);
+    display: flex;
+    flex-direction: column;
+    padding: $default-padding;
+    padding-right: 0;
     position: relative;
 
+    &:not(.disabled) {
+      &:hover,
+      &:active {
+        border: $hover-border;
+      }
+
+      &:focus {
+        border: $focus-border;
+      }
+    }
+
+    &.disabled {
+      background: $disabled-background;
+    }
+
+    &::placeholder {
+      color: var(--metadata);
+    }
+
     &::after {
       border-radius: $default-input-border-radius;
     }
 
-    &:not(:disabled):hover {
-      box-shadow: var(--default-input-box-shadow);
-    }
     >.#{bem.$base}.loading-circle {
       position: absolute;
-      right: 0;
+      right: $default-spacing-size;
       top: 50%;
       transform: translateY(-50%);
     }
 
     select {
       appearance: none;
-      background-color: transparent;
+      background-color: $default-background;
       background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjAiIGhlaWdodD0iMTIiIHZpZXdCb3g9IjAgMCAyMCAxMiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTE5IDEuNUwxMCAxMC41TDEgMS41IiBzdHJva2U9IiM0QzRENTMiIHN0cm9rZS13aWR0aD0iMiIvPgo8L3N2Zz4=");
       background-position: calc(100% - $default-spacing-size);
       background-repeat: no-repeat;
@@ -48,12 +70,13 @@ $default-input-border-radius: var(--theme-default-input-border-radius);
       padding-right: $default-spacing-size;
 
       &.input {
-        color: var(--paragraph);
+        border: none;
+        color: var(--y);
+        outline: none;
         width: 100%;
 
         &:disabled {
-          appearance: none;
-          opacity: 35%;
+          opacity: 0%;
         }
       }
     }

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

@@ -5,7 +5,7 @@ import { useInsertionEffect, memo } 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
 
@@ -25,12 +25,15 @@ const TextInput = ({
   color,
   labelColor,
   validate,
-  oneInputLabel,
   description,
   disabled,
   placeholder,
   optional,
   autoComplete,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan,
   symbol
   // ...otherProps
 }) => {
@@ -44,19 +47,22 @@ const TextInput = ({
   const symbolStyle = symbol ? {
     '--symbol': symbol
   } : {};
-  return /*#__PURE__*/React.createElement("div", {
-    id: id,
-    className: [baseClassName, componentClassName, userClassName, `y-${color}`].filter(e => e).join(' '),
-    style: style
-    // {...otherProps}
-  }, /*#__PURE__*/React.createElement(FormLabel, {
-    className: [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: `input-wrapper with-faded-border ${symbol ? 'has-symbol' : ''}`,
-    style: symbolStyle
+    optional: optional,
+    columnSpan: labelSpan,
+    desktopColumnSpan: desktopLabelSpan
+    // {...otherProps}
+  }, label), /*#__PURE__*/React.createElement(InputWrapper, {
+    id: id,
+    className: [baseClassName, componentClassName, userClassName, `y-${color} ${symbol ? 'has-symbol' : ''}`].filter(e => e).join(' '),
+    style: {
+      ...symbolStyle,
+      ...style
+    },
+    columnSpan: inputSpan,
+    desktopColumnSpan: desktopInputSpan
   }, /*#__PURE__*/React.createElement("input", _extends({
     id: name,
     className: "input",
@@ -64,11 +70,11 @@ const TextInput = ({
     disabled: disabled,
     placeholder: placeholder,
     autoComplete: autoComplete
-  }, field))), /*#__PURE__*/React.createElement(FormDescription, {
-    className: "v50 mt-v s-1",
+  }, field)), /*#__PURE__*/React.createElement(FormDescription, {
+    className: "s-1",
     description: description,
     name: name
-  }));
+  })));
 };
 TextInput.propTypes = {
   /**
@@ -132,6 +138,22 @@ TextInput.propTypes = {
    * `https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/autocomplete`
    */
   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,
   /**
    * A symbol to be set inside the input field
    */
@@ -139,7 +161,7 @@ TextInput.propTypes = {
 };
 TextInput.defaultProps = {
   type: 'text',
-  color: 'main',
+  color: 'paragraph',
   disabled: false
 };
 export default /*#__PURE__*/memo(TextInput);

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

@@ -1,32 +1,32 @@
 /* @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 *;
 
-$default-padding: .75em .75em .55em;
+$default-padding: .55em .75em;
 $default-symbol-left: 1em;
 $default-padding-with-symbol:
-  .75em
+  .55em
   calc($default-symbol-left - 1em)
-  .75em
+  .55em
   calc($default-symbol-left + 1em);
 $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}.text-input {
-  display: flex;
-  flex-direction: column;
-
-  >.input-wrapper {
+  &.#{bem.$base}.input-wrapper {
+    display: flex;
+    flex-direction: column;
     position: relative;
 
-    &::after {
-      border-radius: $default-input-border-radius;
-    }
-
     &.has-symbol {
       &::before {
-        color: var(--interactive);
+        color: var(--y);
         content: var(--symbol);
         left: $default-symbol-left;
         position: absolute;
@@ -40,10 +40,11 @@ $default-input-border-radius: var(--theme-default-input-border-radius);
     }
 
     > input {
-      background-color: var(--background-inputs);
+      background-color: $default-background;
+      border: $default-border;
       border-radius: $default-input-border-radius;
-      color: var(--paragraph);
-      height: 100%;
+      color: var(--y);
+      outline: none;
       padding: $default-padding;
       width: 100%;
 
@@ -52,14 +53,19 @@ $default-input-border-radius: var(--theme-default-input-border-radius);
       }
 
       &:disabled {
-        background-color: var(--hard-x);
+        background-color: $disabled-background;
       }
 
-      &:not(:disabled):hover {
-        border-radius: $default-input-border-radius;
-        box-shadow: var(--theme-default-input-box-shadow);
+      &:not(:disabled) {
+        &:hover,
+        &:active {
+          border: $hover-border;
+        }
+
+        &:focus {
+          border: $focus-border;
+        }
       }
     }
   }
 }
-

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

@@ -8,7 +8,7 @@ import { useField } from 'formik';
 
 // Local Definitions
 
-import { FormLabel, FormDescription } from "../../common";
+import { FormLabel, FormDescription, InputWrapper } from "../../common";
 const baseClassName = styleNames.base;
 const componentClassName = 'text-area-input';
 
@@ -22,17 +22,19 @@ const TextareaInput = ({
   name,
   label,
   validate,
-  labelAsDescription,
-  textAreaId,
+  color,
   rows,
   optional,
-  backgroundColor,
   labelColor,
   description,
   disabled,
   placeholder,
   autoComplete,
-  resize
+  resize,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan
   // ...otherProps
 }) => {
   useInsertionEffect(() => {
@@ -42,18 +44,21 @@ const TextareaInput = ({
     name,
     validate
   });
-  return /*#__PURE__*/React.createElement("div", {
-    id: id,
-    className: [baseClassName, componentClassName, userClassName, `y-${backgroundColor}`].filter(e => e).join(' '),
-    style: style
-    // {...otherProps}
-  }, /*#__PURE__*/React.createElement(FormLabel, {
-    className: [labelAsDescription ? '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("textarea", _extends({
-    id: textAreaId,
+    optional: optional,
+    columnSpan: labelSpan,
+    desktopColumnSpan: desktopLabelSpan
+    // {...otherProps}
+  }, label), /*#__PURE__*/React.createElement(InputWrapper, {
+    id: id,
+    className: [baseClassName, componentClassName, userClassName, `y-${color}`].filter(e => e).join(' '),
+    style: style,
+    columnSpan: inputSpan,
+    desktopColumnSpan: desktopInputSpan
+  }, /*#__PURE__*/React.createElement("textarea", _extends({
+    id: name,
     className: "textarea"
   }, field, {
     style: {
@@ -64,10 +69,10 @@ const TextareaInput = ({
     disabled: disabled,
     autoComplete: autoComplete
   })), /*#__PURE__*/React.createElement(FormDescription, {
-    className: "v50 mt-v s-1",
+    className: "s-1",
     description: description,
     name: name
-  }));
+  })));
 };
 TextareaInput.propTypes = {
   /**
@@ -107,9 +112,9 @@ TextareaInput.propTypes = {
    */
   rows: PropTypes.number,
   /**
-   * Text area background color
+   * Color of the text
    */
-  backgroundColor: PropTypes.string,
+  color: PropTypes.string,
   /**
    * Label base color
    */
@@ -138,12 +143,28 @@ TextareaInput.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
 };
 TextareaInput.defaultProps = {
   rows: 10,
-  backgroundColor: 'background-inputs',
   disabled: false,
-  resize: 'vertical'
+  resize: 'vertical',
+  color: 'paragraph'
 };
 export default /*#__PURE__*/memo(TextareaInput);

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

@@ -1,35 +1,50 @@
 /* @pareto-engineering/generator-front 1.0.12 */
 
 @use "@pareto-engineering/bem";
-
-$default-padding: var(--theme-default-padding);
-$active-border-color: var(--on-y);
+@use "@pareto-engineering/styles/src/mixins";
+@use "@pareto-engineering/styles/src/globals" as *;
+
+$default-padding: .55em .75em;
+$default-border: 1px solid var(--outline-inputs);
+$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}.text-area-input {
-  display: flex;
-  flex-direction: column;
-
-  .textarea {
-    background: var(--y);
-    border: var(--theme-default-border-style) var(--hard-y);
-    border-radius: calc(var(--theme-default-border-radius) / 2);
-    color: var(--on-y);
-    padding: $default-padding;
-
-    &::placeholder {
-      color: var(--metadata);
-    }
-
-    &:not(:disabled):hover {
-      border: var(--theme-default-border-style) $active-border-color;
-    }
-
-    &:disabled {
-      background-color: var(--hard-y);
-    }
-
-    &:focus {
-      border: var(--theme-default-border-style) $active-border-color;
+  &.#{bem.$base}.input-wrapper {
+    display: flex;
+    flex-direction: column;
+
+    > .textarea {
+      background: $default-background;
+      border: $default-border;
+      border-radius: $default-input-border-radius;
+      color: var(--y);
+      outline: none;
+      padding: $default-padding;
+      width: 100%;
+
+      &::placeholder {
+        color: var(--metadata);
+      }
+
+      &:disabled {
+        background-color: $disabled-background;
+      }
+
+      &:not(:disabled) {
+        &:hover,
+        &:active {
+          border: $hover-border;
+        }
+
+        &:focus {
+          border: $focus-border;
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pareto-engineering/design-system",
-  "version": "4.0.0-alpha.35",
+  "version": "4.0.0-alpha.37",
   "description": "",
   "main": "dist/cjs/index.js",
   "module": "dist/es/index.js",
@@ -68,5 +68,5 @@
     "relay-test-utils": "^15.0.0"
   },
   "browserslist": "> 2%",
-  "gitHead": "e4e29a866addbda9682fe399c39c3011f75fc8bd"
+  "gitHead": "a8f3ccb1df8b4de05c21fbd6416d553efea9f1a5"
 }

package/src/stories/f/Checkbox.stories.jsx

@@ -27,11 +27,16 @@ export default {
     ),
   ],
   argTypes:{
-    label       :{ control: 'text' },
-    description :{ control: 'text' },
-    defaultValue:{ control: 'boolean' },
-    disabled    :{ control: 'boolean' },
-    optional    :{ control: 'boolean' },
+    label           :{ control: 'text' },
+    labelColor      :{ control: 'text' },
+    description     :{ control: 'text' },
+    defaultValue    :{ control: 'boolean' },
+    disabled        :{ control: 'boolean' },
+    optional        :{ control: 'boolean' },
+    labelSpan       :{ control: 'number' },
+    inputSpan       :{ control: 'number' },
+    desktopLabelSpan:{ control: 'number' },
+    desktopInputSpan:{ control: 'number' },
   },
 }
 
@@ -49,10 +54,10 @@ const Template = ({ defaultValue, ...args }) => {
     }, [defaultValue])
 
     return (
-      <>
+      <div className="grid">
         <Checkbox {...args} />
         <FormDebugger />
-      </>
+      </div>
     )
   }
 
@@ -93,3 +98,13 @@ Optional.args = {
   ...WithLabel.args,
   optional:true,
 }
+
+export const OnSingleRow = Template.bind({})
+OnSingleRow.args = {
+  ...Base.args,
+  label           :'Urgent',
+  labelSpan       :4,
+  inputSpan       :4,
+  desktopLabelSpan:4,
+  desktopInputSpan:10,
+}

package/src/stories/f/ChoicesInput.stories.jsx

@@ -22,11 +22,15 @@ export default {
     ),
   ],
   argTypes:{
-    // backgroundColor:{ control: 'color' },
-    multiple          :{ control: 'boolean' },
-    gridColumnsDesktop:{ control: 'number' },
-    disabled          :{ control: 'boolean' },
-    optional          :{ control: 'boolean' },
+    color           :{ control: 'color' },
+    labelColor      :{ control: 'color' },
+    multiple        :{ control: 'boolean' },
+    disabled        :{ control: 'boolean' },
+    optional        :{ control: 'boolean' },
+    labelSpan       :{ control: 'number' },
+    inputSpan       :{ control: 'number' },
+    desktopLabelSpan:{ control: 'number' },
+    desktopInputSpan:{ control: 'number' },
   },
 }
 
@@ -78,10 +82,10 @@ const Template = ({ defaultValue, ...args }) => {
     }, [defaultValue])
 
     return (
-      <>
+      <div className="grid">
         <ChoicesInput {...args} />
         <FormDebugger />
-      </>
+      </div>
     )
   }
   return <Content />
@@ -138,3 +142,13 @@ DisabledChoicesInput.args = {
   ...ChoicesWithLabel.args,
   disabled:true,
 }
+
+export const OnSingleRow = Template.bind({})
+OnSingleRow.args = {
+  ...Base.args,
+  label           :'Select color',
+  labelSpan       :4,
+  inputSpan       :4,
+  desktopLabelSpan:4,
+  desktopInputSpan:10,
+}

package/src/stories/f/QueryChoices.stories.jsx

@@ -28,8 +28,15 @@ export default {
     ),
   ],
   argTypes:{
-    isLoading:{ control: 'boolean' },
-    optional :{ control: 'boolean' },
+    color           :{ control: 'color' },
+    labelColor      :{ control: 'color' },
+    multiple        :{ control: 'boolean' },
+    isLoading       :{ control: 'boolean' },
+    optional        :{ control: 'boolean' },
+    labelSpan       :{ control: 'number' },
+    inputSpan       :{ control: 'number' },
+    desktopLabelSpan:{ control: 'number' },
+    desktopInputSpan:{ control: 'number' },
   },
 }
 
@@ -96,7 +103,7 @@ const Template = ({ isLoading, defaultFormikState, ...args }) => {
   }
 
   const Content = () => (
-    <>
+    <div className="grid">
       <QueryChoices
         name="status"
         label="Select Status"
@@ -111,7 +118,7 @@ const Template = ({ isLoading, defaultFormikState, ...args }) => {
         {...args}
       />
       <FormDebugger />
-    </>
+    </div>
   )
 
   const initialValues = defaultFormikState ?? { status: '' }
@@ -133,3 +140,12 @@ export const Optional = Template.bind({})
 Optional.args = {
   optional:true,
 }
+
+export const OnSingleRow = Template.bind({})
+OnSingleRow.args = {
+  ...Base.args,
+  labelSpan       :4,
+  inputSpan       :4,
+  desktopLabelSpan:4,
+  desktopInputSpan:10,
+}