@pareto-engineering/design-system 2.0.0-alpha.22 → 2.0.0-alpha.26

package/src/stories/b/Logo.stories.jsx

@@ -24,14 +24,14 @@ export const Base = () => (
 
 export const Color = () => ALL_COLORS.map((color) => <Logo color={color} key={color} />)
 
-export const Animated = () => (
-  <Logo animated />
-)
+// export const Animated = () => (
+//   <Logo animated />
+// )
 
-export const Loop = () => (
-  <Logo animated loop />
-)
+// export const Loop = () => (
+//   <Logo animated loop />
+// )
 
-export const Beta = () => (
-  <Logo variant="beta" color="main1" />
-)
+// export const Beta = () => (
+//   <Logo variant="beta" color="main1" />
+// )

package/src/stories/f/SelectInput.stories.jsx

@@ -13,10 +13,9 @@ export default {
   decorators:[
     (storyfn) => (
       <Formik
-        initialValues={{ workType: 'Work' }}
+        initialValues={{ workType: '' }}
       >
         <Form>
-
           { storyfn() }
         </Form>
       </Formik>
@@ -32,7 +31,7 @@ export const Base = () => (
     <SelectInput
       name="workType"
       label="Work Type"
-      options={['Work', 'Managing', 'Training']}
+      options={[{ value: '', label: 'Select an option', disabled: true }, 'Work', 'Managing', 'Training']}
     />
     <FormDebugger />
   </>
@@ -55,9 +54,7 @@ export const RequiredSelect = () => {
         name="activity"
         label="Activity Type"
         options={[
-          {
-            value:'', label:'Select activity type', disabled:true,
-          },
+          { value: '', label: 'Select an option', disabled: true },
           { value: 'review', label: 'Review' },
           { value: 'Approve', label: 'Approve' },
         ]}
@@ -73,6 +70,7 @@ export const Objects = () => (
       name="workType"
       label="Work Type"
       options={[
+        { value: '', label: 'Select an option', disabled: true },
         { value: '20th Aug 2020 to 19th Sept, 2020', label: '20th Aug 2020 to 19th Sept, 2020' },
         { value: '20th Sept 2020 to 19th Oct, 2020', label: '20th Sept 2020 to 19th Oct, 2020' },
       ]}
@@ -86,7 +84,9 @@ export const StringAndObjects = () => (
     <SelectInput
       name="workType"
       label="Work Type"
-      options={['Work', 'Managing', 'Training',
+      options={[
+        { value: '', label: 'Select an option', disabled: true },
+        'Work', 'Managing', 'Training',
         { value: '20th Aug 2020 to 19th Sept, 2020', label: '20th Aug 2020 to 19th Sept, 2020' },
         { value: '20th Sept 2020 to 19th Oct, 2020', label: '20th Sept 2020 to 19th Oct, 2020' },
       ]}
@@ -99,7 +99,9 @@ export const DisabledSelectInput = () => (
     <SelectInput
       name="workType"
       label="Work Type"
-      options={['Work', 'Managing', 'Training',
+      options={[
+        { value: '', label: 'Select an option', disabled: true },
+        'Work', 'Managing', 'Training',
         { value: '20th Aug 2020 to 19th Sept, 2020', label: '20th Aug 2020 to 19th Sept, 2020' },
         { value: '20th Sept 2020 to 19th Oct, 2020', label: '20th Sept 2020 to 19th Oct, 2020' },
       ]}

package/src/stories/f/TextInput.stories.jsx

@@ -41,7 +41,7 @@ export const Base = () => {
     return errorMessage
   }
   return (
-    <div className="y-background1 b-dark-y u2 pb-u">
+    <div className=" u2 pb-u">
       <TextInput
         name="firstName"
         label="What's your first name ?"
@@ -52,18 +52,19 @@ export const Base = () => {
   )
 }
 
-export const TextInputWithPlaceHolder = () => (
-  <div className="y-background1 b-dark-y u2 pb-u">
+export const Placeholder = () => (
+  <div className="u2 pb-u">
     <TextInput
       name="firstName"
       label="What's your first name ?"
       placeholder="First Name"
     />
+    <FormDebugger />
   </div>
 )
 
-export const DisabledTextInput = () => (
-  <div className="y-background1 b-dark-y u2 pb-u">
+export const Disabled = () => (
+  <div className="u2 pb-u">
     <TextInput
       name="firstName"
       label="What's your first name ?"
@@ -73,7 +74,7 @@ export const DisabledTextInput = () => (
 )
 
 export const DateTime = () => (
-  <div className="y-background1 b-dark-y">
+  <div>
     <TextInput
       name="date"
       label="Select date"

package/src/stories/f/TextareaInput.stories.jsx

@@ -29,7 +29,7 @@ export default {
 }
 
 export const Base = () => (
-  <div className="y-background1 b-dark-y">
+  <div>
     <TextareaInput
       name="feedback"
       label="What can we improve on?"
@@ -39,7 +39,7 @@ export const Base = () => (
 )
 
 export const Placeholder = () => (
-  <div className="y-background1 b-dark-y">
+  <div>
     <TextareaInput
       name="feedback"
       label="What can we improve on?"
@@ -61,7 +61,7 @@ export const Validation = () => {
   }
 
   return (
-    <div className="y-background1 b-dark-y">
+    <div>
       <TextareaInput
         name="feedback"
         label="What can we improve on?"
@@ -74,7 +74,7 @@ export const Validation = () => {
 }
 
 export const Disabled = () => (
-  <div className="y-background1 b-dark-y">
+  <div>
     <TextareaInput
       name="feedback"
       label="What can we improve on?"

package/src/ui/a/BackgroundGradient/styles.scss

@@ -7,7 +7,7 @@
     left: 0;
     width: 100%;
     height: var(--gradient-height);
-    background-image: linear-gradient(transparent, var(--y) 25%, var(--light-y) 75%, transparent);
+    background-image: linear-gradient(var(--background1), var(--y) 25%, var(--light-y) 75%, var(--background1));
     opacity: .4;
     z-index: -1;
 }

package/src/ui/a/SVG/SVG.jsx

@@ -41,7 +41,7 @@ const SVG = ({
   const useSVGProps = useMemo(() => ({
     className:useClassName,
     source,
-    target,
+    ...target,
     sprite,
     strokeWidth,
   }), [

package/src/ui/a/Shapes/styles.scss

@@ -22,7 +22,7 @@ $default-shapes-opacity:.8;
     width: 100%;
 
     .triangle {
-      background-image: linear-gradient(transparent, var(--dark-y));
+      background-image: linear-gradient(var(--light-y), var(--dark-y));
       clip-path: polygon(0 0, 50% 100%, 100% 0);
       height: calc(var(--shape-height, #{$default-triangle-height}) * 0.86);
       opacity: $default-shapes-opacity;
@@ -30,7 +30,7 @@ $default-shapes-opacity:.8;
     }
 
     .inverted-triangle {
-      background-image: linear-gradient(var(--dark-y), transparent);
+      background-image: linear-gradient(var(--dark-y), var(--light-y));
       clip-path: polygon(50% 0, 0 100%, 100% 100%);
       height: calc(var(--shape-height, #{$default-triangle-height}) * 0.86);
       opacity: $default-shapes-opacity;
@@ -117,7 +117,7 @@ $default-shapes-opacity:.8;
     }
 
     .half-ellipse {
-      background-image: radial-gradient(ellipse at center bottom, var(--y) 10%, transparent 65%);
+      background-image: radial-gradient(ellipse at center bottom, var(--y) 10%, var(--light-y) 65%);
       clip-path: ellipse(60% 100% at 50% 0%);
       height: var(--shape-height, #{$default-ellipse-height});
       opacity: $default-shapes-opacity;
@@ -147,7 +147,7 @@ $default-shapes-opacity:.8;
       width: var(--shape-height, #{$default-ellipse-height});
 
       .first {
-        background-image: linear-gradient(to top, var(--dark-y), var(--y), var(--light-y) 50%, transparent);
+        background-image: linear-gradient(to top, var(--dark-y), var(--y), var(--light-y) 50%, var(--background1));
         clip-path: ellipse(50% 20% at 50% 60%);
         height: 100%;
         position: absolute;
@@ -156,7 +156,7 @@ $default-shapes-opacity:.8;
       }
 
       .second {
-        background-image: linear-gradient(to bottom,var(--dark-y), var(--y), var(--light-y) 45%, transparent);
+        background-image: linear-gradient(to bottom,var(--dark-y), var(--y), var(--light-y) 45%, var(--background1));
         clip-path: ellipse(50% 20% at 50% 40%);
         height: 100%;
         position: absolute;
@@ -175,7 +175,7 @@ $default-shapes-opacity:.8;
 
       > * {
         border-radius: 50%;
-        background: radial-gradient(ellipse at center bottom ,var(--dark-y) 10%, transparent 60%);
+        background: radial-gradient(ellipse at center bottom, var(--dark-y) 10%, var(--light-y) 60%);
         position: absolute;
         opacity: .5;
       }
@@ -244,12 +244,12 @@ $default-shapes-opacity:.8;
       }
 
       .left {
-        background-image: linear-gradient(to right ,var(--dark-y),var(--y), transparent);
+        background-image: linear-gradient(to right ,var(--dark-y),var(--y), var(--light-y));
         grid-column: 1 / 5;
       }
       .right {
-        background-image: linear-gradient(to left, var(--dark-y), var(--y), transparent);
+        background-image: linear-gradient(to left, var(--dark-y), var(--y), var(--light-y));
         grid-column: 4 / 8;
       }
     }
-}
+}

package/src/ui/b/Button/styles.scss

@@ -16,7 +16,7 @@ $default-animation-time: .3s;
   color: var(--on-x, var(--on-#{$default-color}));
   display: inline-flex;
   font-family: var(--theme-default-paragraph);
-  font-weight: 600;
+  font-weight: 400;
   justify-content: space-between;
   padding: $default-padding;
   transition: all .25s;

package/src/ui/b/Logo/Logo.jsx

@@ -15,37 +15,16 @@ const baseClassName = styleNames.base
 
 const componentClassName = 'logo'
 
-const defaultTargets = [
-  {
-    id    :'logo__p',
-    target:'logo__p',
-  },
-  {
-    id    :'logo__areto',
-    target:'logo__areto',
-  },
-  {
-    id    :'logo__t',
-    target:'logo__t',
-  },
-]
+const defaultTarget = {
+  id    :'logo',
+  target:'logo',
+}
 
 const contentMap = {
   default:{
-    sprite :'/logo_parts.svg',
-    viewBox:'0 0 688 250',
-    targets:defaultTargets,
-  },
-  beta:{
-    sprite :'/logo_parts_beta.svg',
-    viewBox:'0 0 1000 300',
-    targets:[
-      ...defaultTargets,
-      {
-        id    :'logo__beta',
-        target:'logo__beta',
-      },
-    ],
+    sprite :'/logo.svg',
+    viewBox:'0 0 39 39',
+    target :defaultTarget,
   },
 }
 
@@ -57,8 +36,6 @@ const Logo = ({
   className:userClassName,
   style,
   color,
-  animated,
-  loop,
   height,
   width,
   variant,
@@ -75,7 +52,7 @@ const Logo = ({
       height={height}
       width={width}
       viewBox={svgConfig.viewBox}
-      targets={svgConfig.targets}
+      target={svgConfig.target}
       sprite={svgConfig.sprite}
       id={id}
       className={[
@@ -83,12 +60,10 @@ const Logo = ({
         componentClassName,
         `x-${color}`,
         userClassName,
-        loop && 'loop',
       ]
         .filter((e) => e)
         .join(' ')}
       style={style}
-      animated={animated}
       // {...otherProps}
     />
   )
@@ -115,16 +90,6 @@ Logo.propTypes = {
    */
   color:PropTypes.string,
 
-  /**
-   *  Whether the logo is animated
-   */
-  animated:PropTypes.bool,
-
-  /**
-   *  Whether the animation loops
-   */
-  loop:PropTypes.bool,
-
   /**
    * The height of the element
    */
@@ -142,11 +107,9 @@ Logo.propTypes = {
 }
 
 Logo.defaultProps = {
-  color   :'primary',
-  animated:false,
-  loop    :false,
-  height  :'4em',
-  variant :'default',
+  color  :'paragraph',
+  height :'4em',
+  variant:'default',
 }
 
 export default Logo

package/src/ui/b/Logo/styles.scss

@@ -1,147 +1,9 @@
 /* @pareto-engineering/generator-front 1.0.12 */
 
-/* stylelint-disable selector-id-pattern, selector-max-id -- because of the custom svg */
-
 @use "@pareto-engineering/bem";
 
-// Main animation - finishes after the drawing
-
-@keyframes draw-logo-p {
-  0% {
-    stroke-dashoffset: var(--svg-origin-stroke-dashoffset, 1000);
-  }
-
-  20%,
-  100% {
-    stroke-dashoffset: var(--svg-target-stroke-dashoffset, 0);
-  }
-}
-@keyframes draw-logo-areto {
-  0%,
-  20% {
-    stroke-dashoffset: var(--svg-origin-stroke-dashoffset, 1000);
-  }
-
-  90%,
-  100% {
-    stroke-dashoffset: var(--svg-target-stroke-dashoffset, 0);
-  }
-}
-@keyframes draw-logo-t {
-  0%,
-  90% {
-    stroke-dashoffset: var(--svg-origin-stroke-dashoffset, 1000);
-  }
-
-  100% {
-    stroke-dashoffset: var(--svg-target-stroke-dashoffset, 0);
-  }
-}
-
-// Alt animation - looping
-
-@keyframes draw-alt-logo-p {
-  0% {
-    stroke-dashoffset: var(--svg-origin-stroke-dashoffset, 1000);
-  }
-
-  10%,
-  50% {
-    stroke-dashoffset: var(--svg-target-stroke-dashoffset, 0);
-  }
-
-  60%,
-  100% {
-    stroke-dashoffset: var(--svg-final-stroke-dashoffset, 1000);
-  }
-}
-@keyframes draw-alt-logo-areto {
-  0%,
-  10% {
-    stroke-dashoffset: var(--svg-origin-stroke-dashoffset, 1000);
-  }
-
-  45%,
-  60% {
-    stroke-dashoffset: var(--svg-target-stroke-dashoffset, 0);
-  }
-
-  95%,
-  100% {
-    stroke-dashoffset: var(--svg-final-stroke-dashoffset, 1000);
-  }
-}
-@keyframes draw-alt-logo-t {
-  0%,
-  45% {
-    stroke-dashoffset: var(--svg-origin-stroke-dashoffset, 1000);
-  }
-
-  50%,
-  95% {
-    stroke-dashoffset: var(--svg-target-stroke-dashoffset, 0);
-  }
-
-  100% {
-    stroke-dashoffset: var(--svg-final-stroke-dashoffset, 1000);
-  }
-}
-
 .#{bem.$base}.logo {
-  &.animated.animated {
-    --svg-animation-repeats: 1;
-    --svg-animation-time: 3.5s;
-
-    &:hover,
-    &:focus {
-      //--path-animation: dash-a 1s linear 0s 1 forwards;
-    }
-
-    use#logo__p {
-      //--svg-animation-delay: 0;
-      --svg-dasharray: 1000;
-      --svg-origin-stroke-dashoffset: -1000;
-      //--svg-target-stroke-dashoffset: 0;
-      --svg-final-stroke-dashoffset: 1000;
-      animation-name: draw-logo-p;
-    }
-
-    use#logo__areto {
-      --svg-dasharray: 2000;
-      --svg-origin-stroke-dashoffset: 2000;
-      //--svg-target-stroke-dashoffset: 0;
-      --svg-final-stroke-dashoffset: -2000;
-      animation-name: draw-logo-areto;
-    }
-
-    use#logo__t {
-      --svg-dasharray: 200;
-      --svg-origin-stroke-dashoffset: 200;
-      //--svg-target-stroke-dashoffset: 0;
-      --svg-final-stroke-dashoffset: -200;
-      animation-name: draw-logo-t;
-    }
-
-    &.loop.loop {
-      --svg-animation-time: 6s;
-      --svg-animation-repeats: infinite;
-
-      use#logo__p {
-        --svg-final-stroke-dashoffset: 1000;
-        animation-name: draw-alt-logo-p;
-      }
-
-      use#logo__areto {
-        --svg-final-stroke-dashoffset: -2000;
-        animation-name: draw-alt-logo-areto;
-      }
 
-      use#logo__t {
-        --svg-final-stroke-dashoffset: -200;
-        animation-name: draw-alt-logo-t;
-      }
-    }
-  }
 }
 
 

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/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/SelectInput/SelectInput.jsx

@@ -26,6 +26,7 @@ const SelectInput = ({
   style,
   name,
   label,
+  color,
   options,
   validate,
   description,
@@ -47,6 +48,7 @@ const SelectInput = ({
 
         componentClassName,
         userClassName,
+        `y-${color}`,
       ]
         .filter((e) => e)
         .join(' ')}
@@ -54,7 +56,7 @@ const SelectInput = ({
       // {...otherProps}
     >
       <FormLabel className="input-label" name={name}>{label}</FormLabel>
-      <select className="input v25 pv-v" {...field} value={field.value || ''} 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" }
@@ -65,6 +67,7 @@ const SelectInput = ({
               key={newOption.value}
               value={newOption.value}
               disabled={newOption?.disabled || false}
+              selected={newOption?.disabled || true}
             >
               {newOption.label}
             </option>
@@ -135,10 +138,16 @@ SelectInput.propTypes = {
    * 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(--main2);
-  }
-
   .input {
-    background: var(--light-background2);
-    color: var(--on-background2);
+    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-background2);
+      background: var(--y);
     }
   }
 }

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

@@ -27,6 +27,7 @@ const TextInput = ({
   type,
   name,
   label,
+  color,
   labelColor,
   validate,
   oneInputLabel,
@@ -48,6 +49,7 @@ const TextInput = ({
         baseClassName,
         componentClassName,
         userClassName,
+        `y-${color}`,
       ]
         .filter((e) => e)
         .join(' ')}
@@ -65,7 +67,7 @@ const TextInput = ({
       </FormLabel>
       <input
         id={name}
-        className={`input ${meta.touched && meta.error ? 'input-border-error' : 'input-border'}`}
+        className="input"
         type={type}
         disabled={disabled}
         placeholder={placeholder}
@@ -149,10 +151,16 @@ TextInput.propTypes = {
    * The placeholder text for the input
    */
   placeholder:PropTypes.string,
+
+  /**
+   * The text input color
+   */
+  color:PropTypes.string,
 }
 
 TextInput.defaultProps = {
   type    :'text',
+  color   :'background2',
   disabled:false,
 }