@pareto-engineering/design-system 2.0.0-alpha.2 → 2.0.0-alpha.23

package/src/ui/c/ContentSlides/common/Navigator/Navigator.jsx

@@ -77,6 +77,7 @@ const Navigator = ({
                 setNextStepIndex(stepsForward)
               }
             }}
+            isCompact
           >
             Next
           </Button>
@@ -140,8 +141,8 @@ Navigator.propTypes = {
 
 Navigator.defaultProps = {
   canMoveForward:true,
-  previousColor :'main1',
-  nextColor     :'main1',
+  previousColor :'main2',
+  nextColor     :'main2',
   stepsForward  :1,
   stepsBackwards:1,
 }

package/src/ui/c/ContentSlides/styles.scss

@@ -14,7 +14,7 @@ $class-navigator:navigator;
 $default-sidebar-width:minmax(250px, 330px);
 $default-border:none;//2px solid var(--grid);
 $default-border-radius:var(--theme-border-radius);
-$default-content-background:var(--y);
+$default-content-background: var(--background1);
 $default-padding:var(--u);
 
 $mobile-content-margin:6em;
@@ -61,7 +61,6 @@ $mobile-content-margin:6em;
 
   //.#{$class-main-container} {
   main {
-    background: var(--dark-y);
     overflow: hidden;
     position: relative;
 
@@ -79,7 +78,7 @@ $mobile-content-margin:6em;
         .#{bem.$element-content} {
           background: $default-content-background;
 
-          border: $default-border;
+          border: var(--theme-border);
           border-radius: $default-border-radius;
           max-width: 600px;
           padding: $default-padding;
@@ -108,8 +107,9 @@ $mobile-content-margin:6em;
 
   .#{$class-horizontal-menu} {
     background: $default-content-background;
-    border-bottom: $default-border;
+    border-bottom: var(--theme-border);
     color: var(--heading);
+    z-index: 1;
 
     .#{bem.$element-content} {
       display: grid;
@@ -124,6 +124,11 @@ $mobile-content-margin:6em;
 
       .left {
         text-align: left;
+
+        .prev-button {
+          font-family: var(--theme-default-paragraph);
+          font-size: calc(var(--s2) * 1em);
+        }
       }
 
       .right {
@@ -210,6 +215,7 @@ $mobile-content-margin:6em;
 
               .next {
                 flex-grow: 1;
+                justify-content: flex-end;
               }
             }
           }

package/src/ui/f/common/Debugger/Debugger.jsx

@@ -41,7 +41,7 @@ const Debugger = ({
         .join(' ')}
       style={style}
     >
-      <Button onClick={toggleDebugger} color="main1">
+      <Button onClick={toggleDebugger} color="main2">
         { isOpen
           ? 'Close FormDebugger'
           : 'Open FormDebugger'}

package/src/ui/f/common/Label/Label.jsx

@@ -90,7 +90,7 @@ Label.propTypes = {
 Label.defaultProps = {
   // someProp:false
   as   :'label',
-  color:'main1',
+  color:'main2',
 }
 
 export default Label

package/src/ui/f/common/Label/styles.scss

@@ -5,7 +5,7 @@
 
 
 .#{bem.$base}.label {
- color: var(--x);
+ color: var(--dark-x);
 }
 
 

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

@@ -147,8 +147,8 @@ ChoicesInput.propTypes = {
 ChoicesInput.defaultProps = {
   gridColumnsMobile :2,
   gridColumnsDesktop:3,
-  color             :'background',
-  colorChecked      :'main1',
+  color             :'background2',
+  colorChecked      :'main2',
   disabled          :false,
 }
 

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

@@ -29,10 +29,21 @@ $default-transition:all .3s;
         z-index: -1;
       }
 
+      input:disabled + label {
+        background-color: var(--dark-x);
+      }
+
+      input:not(:disabled) + label {
+        &:hover {
+          border-color: var(--light-y);
+        }
+      }
+
       label {
-        background: var(--x);
-        border-radius: var(--theme-border-radius);
+        border: var(--theme-border-style) var(--dark-x);
+        background: var(--light-x);
         color: var(--on-x);
+        border-radius: var(--theme-border-radius);
         display: block;
         height: 100%;
         padding: $default-padding;
@@ -44,6 +55,10 @@ $default-transition:all .3s;
       input:checked + label {
         background: var(--y);
         color: var(--on-y);
+
+        &:hover {
+          border-color: var(--y);
+        }
       }
     }
   }

package/src/ui/f/fields/RatingsInput/common/Rating/Rating.jsx

@@ -128,8 +128,8 @@ Rating.propTypes = {
 }
 
 Rating.defaultProps = {
-  activeBackgroundColor  :'secondary2',
-  inactiveBackgroundColor:'background',
+  activeBackgroundColor  :'main1',
+  inactiveBackgroundColor:'background2',
   showRatingValue        :false,
 }
 

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

@@ -26,7 +26,10 @@ const SelectInput = ({
   style,
   name,
   label,
+  color,
   options,
+  validate,
+  description,
   disabled,
   // ...otherProps
 }) => {
@@ -34,7 +37,7 @@ const SelectInput = ({
     import('./styles.scss')
   }, [])
 
-  const [field, meta] = useField(name)
+  const [field, meta] = useField({ name, validate })
 
   return (
     <div
@@ -45,6 +48,7 @@ const SelectInput = ({
 
         componentClassName,
         userClassName,
+        `y-${color}`,
       ]
         .filter((e) => e)
         .join(' ')}
@@ -52,18 +56,31 @@ const SelectInput = ({
       // {...otherProps}
     >
       <FormLabel className="input-label" name={name}>{label}</FormLabel>
-      <select className="input v25 pv-v" {...field} id={name} disabled={disabled}>
+      <select className="input" {...field} value={field.value || ''} id={name} disabled={disabled}>
         {
         options.map((option) => {
           // i.e if option is a string like "blah", return { value: "blah", label: "blah" }
           const newOption = typeof option === 'string' ? { value: option, label: option } : option
+
           return (
-            <option key={newOption.value} value={newOption.value}>{newOption.label}</option>
+            <option
+              key={newOption.value}
+              value={newOption.value}
+              disabled={newOption?.disabled || false}
+              selected={newOption?.disabled || true}
+            >
+              {newOption.label}
+            </option>
           )
         })
       }
       </select>
-      {meta.error && meta.touched && <FormDescription error>{meta.error}</FormDescription>}
+      {(description || (meta.touched && meta.error))
+      && (
+      <FormDescription isError={!!meta.error} className="v50 mt-v s-1">
+        { meta.error || description }
+      </FormDescription>
+      )}
     </div>
   )
 }
@@ -93,22 +110,44 @@ SelectInput.propTypes = {
    */
   label:PropTypes.string,
 
+  /**
+   * The input field validator function
+   */
+  validate:PropTypes.func,
+
+  /**
+   * The select input description
+   */
+  description:PropTypes.string,
+
   /**
    * The options of the select input
    */
   options:PropTypes.arrayOf(
     PropTypes.oneOfType(
-      [PropTypes.string, PropTypes.shape({ value: PropTypes.string, label: PropTypes.string })],
+      [
+        PropTypes.string,
+        PropTypes.shape({
+          value   :PropTypes.string,
+          label   :PropTypes.string,
+          disabled:PropTypes.bool,
+        })],
     ),
   ),
   /**
    * Whether the select input should be disabled
    */
   disabled:PropTypes.bool,
+
+  /**
+   * The color of the select input
+   */
+  color:PropTypes.string,
 }
 
 SelectInput.defaultProps = {
   disabled:false,
+  color   :'background2',
 }
 
 export default memo(SelectInput)

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

@@ -5,7 +5,7 @@
 @use "../../../form.scss";
 
 
-$default-padding: 0.75em 0.75em 0.55em;
+$default-padding: 0.75em;
 
 
 .#{bem.$base}.select-input {
@@ -13,17 +13,22 @@ $default-padding: 0.75em 0.75em 0.55em;
   flex-direction: column;
 
 
-  .input-label {
-    color: var(--main1);
-  }
-
   .input {
-    background: var(--light-background);
-    color: var(--on-background);
+    border: var(--theme-border-style) var(--dark-y);
+    background: var(--light-y);
+    color:var(--on-y);
     padding: $default-padding;
 
+     &:not(:disabled):hover{
+      border: var(--theme-border-style) var(--light-background4);
+    }
+
+     &:disabled {
+      background-color: var(--dark-y);
+    }
+
     &:focus {
-      background: var(--dark-background);
+      background: var(--y);
     }
   }
 }

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

@@ -27,10 +27,13 @@ const TextInput = ({
   type,
   name,
   label,
+  color,
+  labelColor,
   validate,
   oneInputLabel,
   description,
   disabled,
+  placeholder,
   // ...otherProps
 }) => {
   useLayoutEffect(() => {
@@ -46,6 +49,7 @@ const TextInput = ({
         baseClassName,
         componentClassName,
         userClassName,
+        `y-${color}`,
       ]
         .filter((e) => e)
         .join(' ')}
@@ -53,19 +57,20 @@ const TextInput = ({
       // {...otherProps}
     >
       <FormLabel
-        className={[
-          'input-label', oneInputLabel ? 'md-s2 s0 v1 mb-v' : 'v50 mb-v']
+        className={[oneInputLabel ? 'md-s2 s0 v1 mb-v' : 'v50 mb-v']
           .filter((e) => e)
           .join(' ')}
         name={name}
+        color={labelColor}
       >
         { label }
       </FormLabel>
       <input
         id={name}
-        className={`input ${meta.touched && meta.error ? 'input-border-error' : 'input-border'}`}
+        className="input"
         type={type}
         disabled={disabled}
+        placeholder={placeholder}
         {...field}
       />
       {(description || (meta.touched && meta.error))
@@ -104,6 +109,11 @@ TextInput.propTypes = {
    */
   label:PropTypes.string.isRequired,
 
+  /**
+   * The input label color
+   */
+  labelColor:PropTypes.string,
+
   /**
    * The type of the input (html)
    */
@@ -136,10 +146,21 @@ TextInput.propTypes = {
    * Whether the text input should be disabled
    */
   disabled     :PropTypes.bool,
+
+  /**
+   * The placeholder text for the input
+   */
+  placeholder:PropTypes.string,
+
+  /**
+   * The text input color
+   */
+  color:PropTypes.string,
 }
 
 TextInput.defaultProps = {
   type    :'text',
+  color   :'background2',
   disabled:false,
 }
 

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

@@ -9,17 +9,26 @@ $default-padding: 0.75em 0.75em 0.55em;
   display: flex;
   flex-direction: column;
 
-  .input-label {
-    color: var(--main1);
-  }
-
   .input {
-    background: var(--light-background);
-    color: var(--on-background);
+    border: var(--theme-border-style) var(--dark-y);
+    background: var(--light-y);
+    color: var(--on-y);
     padding: $default-padding;
 
+    &::placeholder{
+      color: var(--metadata);
+    }
+
+    &:not(:disabled):hover{
+      border: var(--theme-border-style) var(--light-background4);
+    }
+
+    &:disabled {
+      background-color: var(--dark-y);
+    }
+
     &:focus {
-      background: var(--dark-background);
+      background: var(--light-background4);
     }
   }
 }

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

@@ -34,6 +34,7 @@ const TextareaInput = ({
   labelColor,
   description,
   disabled,
+  placeholder,
   // ...otherProps
 }) => {
   useLayoutEffect(() => {
@@ -51,8 +52,7 @@ const TextareaInput = ({
 
         componentClassName,
         userClassName,
-        `x-${textAreaColor}`,
-        `y-${labelColor}`,
+        `y-${textAreaColor}`,
       ]
         .filter((e) => e)
         .join(' ')}
@@ -60,18 +60,19 @@ const TextareaInput = ({
       // {...otherProps}
     >
       <FormLabel
-        className={[
-          'c-y', labelAsDescription ? 'md-s2 s0 v1 mb-v' : 'v50 mb-v']
+        className={[labelAsDescription ? 'md-s2 s0 v1 mb-v' : 'v50 mb-v']
           .filter((e) => e)
           .join(' ')}
         name={name}
+        color={labelColor}
       >
         { label }
       </FormLabel>
       <textarea
         id={textAreaId}
-        className={`textarea v50 pv-v ${meta.touched && meta.error ? 'input-border-error' : 'input-border'}`}
+        className="textarea"
         {...field}
+        placeholder={placeholder}
         rows={rows}
         disabled={disabled}
       >
@@ -123,36 +124,46 @@ TextareaInput.propTypes = {
    * If the text area depends on it's label's text as the default description
    */
   labelAsDescription:PropTypes.bool,
+
   /**
    * The textarea id
   */
-  textAreaId        :PropTypes.string,
+  textAreaId:PropTypes.string,
+
   /**
    * The number of rows int the text area
    */
-  rows              :PropTypes.number,
+  rows:PropTypes.number,
+
   /**
    * Text area base color
    */
-  textAreaColor     :PropTypes.string,
+  textAreaColor:PropTypes.string,
+
   /**
    * Label base color
    */
-  labelColor        :PropTypes.string,
+  labelColor:PropTypes.string,
+
   /**
    * Text area description
    */
-  description       :PropTypes.string,
+  description:PropTypes.string,
+
   /**
    * Whether the text area should be disabled
    */
-  disabled          :PropTypes.bool,
+  disabled:PropTypes.bool,
+
+  /**
+   * The textarea placeholder text
+   */
+  placeholder:PropTypes.string,
 }
 
 TextareaInput.defaultProps = {
   rows         :3,
-  textAreaColor:'background',
-  labelColor   :'main1',
+  textAreaColor:'background2',
   disabled     :false,
 }
 

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

@@ -1,19 +1,32 @@
 /* @pareto-engineering/generator-front 1.0.12 */
 @use "@pareto-engineering/bem";
 
+$default-padding: .5em;
+
 .#{bem.$base}.text-area-input{
   display: flex;
   flex-direction: column;
 
   .textarea {
-    background: var(--light-x);
-    color: var(--on-x);
+    border: var(--theme-border-style) var(--dark-y);
+    background: var(--light-y);
+    color: var(--on-y);
+    padding: $default-padding;
 
-    &:focus {
-      background: var(--dark-x);
+    &::placeholder{
+      color: var(--metadata);
     }
-  }
-}
 
+    &:not(:disabled):hover{
+      border: var(--theme-border-style) var(--light-background4);
+    }
 
+     &:disabled {
+      background-color: var(--dark-y);
+    }
 
+    &:focus {
+      background: var(--light-background4);
+    }
+  }
+}

package/src/ui/f/fields/index.js

@@ -1,8 +1,5 @@
 export { TextInput } from './TextInput'
 export { SelectInput } from './SelectInput'
-export { RadioInput } from './RadioInput'
-export { CheckboxInput } from './CheckboxInput'
-export { TaskRecommendationInput } from './TaskRecommendationInput'
 export { ChoicesInput } from './ChoicesInput'
 export { TextareaInput } from './TextareaInput'
 export { RatingsInput } from './RatingsInput'

package/src/ui/form-reset.scss

@@ -19,7 +19,7 @@ button,
 textarea,
 label,
 select {
-  background-color: inherit;
+  // background-color: inherit;
   border: 0;
   display: inline-block;
   font: inherit;

package/src/ui/form.scss

@@ -1,6 +1,6 @@
 @use "form-reset.scss";
 
-$form-input-border-bottom: 1px solid var(--dark-background);
+$form-input-border-bottom: 1px solid var(--dark-background1);
 $form-input-on-focus-border-bottom: 1px solid var(--light-main1);
 $form-input-on-error-border-bottom: 1px solid var(--error);
 $label-input-heigth-width: 100%;

package/src/stories/f/CheckboxInput.stories.jsx

@@ -1,37 +0,0 @@
-/* @pareto-engineering/generator-front 1.0.12 */
-import * as React from 'react'
-import { Formik, Form } from 'formik'
-
-import { CheckboxInput, FormDebugger } from 'ui'
-
-export default {
-  title        :'f/fields/CheckboxInput',
-  component    :CheckboxInput,
-  subcomponents:{
-    // Item:CheckboxInput.Item
-  },
-  decorators:[
-    (storyfn) => (
-      <Formik
-        initialValues={{ businessTypes: [] }}
-      >
-        <Form>
-          { storyfn() }
-        </Form>
-      </Formik>
-    ),
-  ],
-  argTypes:{
-    backgroundColor:{ control: 'color' },
-  },
-}
-
-export const Base = () => (
-  <div className="y-background b-y">
-    <CheckboxInput value="Business to customer" name="businessTypes">Business to customer</CheckboxInput>
-    <CheckboxInput value="Business to business" name="businessTypes">Business to business</CheckboxInput>
-    <CheckboxInput value="E-commerce" name="businessTypes">E-commerce</CheckboxInput>
-    <CheckboxInput value="Marketplace" name="businessTypes">Marketplace</CheckboxInput>
-    <FormDebugger />
-  </div>
-)

package/src/stories/f/RadioInput.stories.jsx

@@ -1,37 +0,0 @@
-/* @pareto-engineering/generator-front 1.0.12 */
-import * as React from 'react'
-import { Formik, Form } from 'formik'
-
-import { RadioInput, FormDebugger } from 'ui'
-
-export default {
-  title        :'f/fields/RadioInput',
-  component    :RadioInput,
-  subcomponents:{
-    // Item:RadioInput.Item
-  },
-  decorators:[
-    (storyfn) => (
-      <Formik
-        initialValues={{ companySize: '' }}
-      >
-        <Form>
-          { storyfn() }
-        </Form>
-      </Formik>
-    ),
-  ],
-  argTypes:{
-    backgroundColor:{ control: 'color' },
-  },
-}
-
-export const Base = () => (
-  <>
-    <RadioInput value="1-3" name="companySize">1-3</RadioInput>
-    <RadioInput value="4-7" name="companySize">4-7</RadioInput>
-    <RadioInput value="8-10" name="companySize">8-10</RadioInput>
-    <RadioInput value="11-20" name="companySize">11-20</RadioInput>
-    <FormDebugger />
-  </>
-)