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

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/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/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,
 }
 

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

@@ -10,12 +10,25 @@ $default-padding: 0.75em 0.75em 0.55em;
   flex-direction: column;
 
   .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;
 
+    &::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-background2);
+      background: var(--light-background4);
     }
   }
 }

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

@@ -52,7 +52,7 @@ const TextareaInput = ({
 
         componentClassName,
         userClassName,
-        `x-${textAreaColor}`,
+        `y-${textAreaColor}`,
       ]
         .filter((e) => e)
         .join(' ')}
@@ -70,7 +70,7 @@ const TextareaInput = ({
       </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}
@@ -163,7 +163,7 @@ TextareaInput.propTypes = {
 
 TextareaInput.defaultProps = {
   rows         :3,
-  textAreaColor:'background1',
+  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/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-background1 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 />
-  </>
-)

package/src/stories/f/TaskRecommendationInput.stories.jsx

@@ -1,38 +0,0 @@
-/* @pareto-engineering/generator-front 1.0.12 */
-import * as React from 'react'
-import { Formik, Form } from 'formik'
-import { TaskRecommendationInput } from 'ui'
-
-export default {
-  title        :'f/fields/TaskRecommendationInput',
-  component    :TaskRecommendationInput,
-  subcomponents:{
-    // Item:TaskRecommendation.Item
-  },
-  decorators:[
-    (storyfn) => (
-      <Formik
-        initialValues={{ taskRecommendations: [] }}
-      >
-        <Form>
-          { storyfn() }
-        </Form>
-      </Formik>
-    ),
-  ],
-  argTypes:{
-    backgroundColor:{ control: 'color' },
-  },
-}
-
-export const Base = () => (
-  <div className="y-background1 b-y v2 p-v" style={{ height: '100%' }}>
-    <TaskRecommendationInput
-      name="taskRecommendations"
-      value="businessTypes"
-      oneLiner="Build a list of contacts at businesses based on my criteria for potential customers"
-      label="Find potential business customers"
-      image="/Fundraising.svg"
-    />
-  </div>
-)

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

@@ -1,107 +0,0 @@
-/* @pareto-engineering/generator-front 1.0.12 */
-import * as React from 'react'
-
-import { useLayoutEffect, memo } from 'react'
-
-import { useField } from 'formik'
-
-import PropTypes from 'prop-types'
-
-import styleNames from '@pareto-engineering/bem'
-
-import { FormLabel, FormDescription } from '../../common'
-
-// Local Definitions
-
-const baseClassName = styleNames.base
-
-const componentClassName = 'checkbox-input'
-
-/**
- * This is the component description.
- */
-const CheckboxInput = ({
-  id,
-  className:userClassName,
-  style,
-  children,
-  value,
-  name,
-  // ...otherProps
-}) => {
-  useLayoutEffect(() => {
-    import('./styles.scss')
-  }, [])
-
-  const [field, meta] = useField(name)
-
-  const isOptionSelected = !!(field.value?.length > 0 && field.value.includes(value))
-
-  return (
-    <div
-      id={id}
-      className={[
-
-        baseClassName,
-
-        componentClassName,
-        userClassName,
-      ]
-        .filter((e) => e)
-        .join(' ')}
-      style={style}
-      // {...otherProps}
-    >
-      <div
-        className={`${isOptionSelected ? 'selected' : 'not-selected'} input-content uc v1 pv-v`}
-      >
-        <FormLabel name={name}>
-          <input {...field} id={name} value={value} className="input" type="checkbox" />
-          <span>
-            {children}
-          </span>
-        </FormLabel>
-      </div>
-      {meta.error && meta.touched && <FormDescription error>{meta.error}</FormDescription>}
-
-    </div>
-  )
-}
-
-CheckboxInput.propTypes = {
-  /**
-   * The HTML id for this element
-   */
-  id:PropTypes.string,
-
-  /**
-   * The HTML class names for this element
-   */
-  className:PropTypes.string,
-
-  /**
-   * The input name (html - and Formik state)
-   */
-  name:PropTypes.string.isRequired,
-
-  /**
-   * The input value
-   */
-  value:PropTypes.string.isRequired,
-
-  /**
-   * The React-written, css properties for this element.
-   */
-  style:PropTypes.objectOf(PropTypes.string),
-
-  /**
-   *  The children JSX
-   */
-  children:PropTypes.node,
-}
-
-CheckboxInput.defaultProps = {
-  // someProp:false
-}
-
-export default memo(CheckboxInput)

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

@@ -1,2 +0,0 @@
-/* @pareto-engineering/generator-front 1.0.12 */
-export { default as CheckboxInput } from './CheckboxInput'