@pareto-engineering/design-system 2.0.0-alpha.15 → 2.0.0-alpha.16

package/dist/cjs/f/fields/SelectInput/SelectInput.js

@@ -38,13 +38,18 @@ var SelectInput = _ref => {
     name,
     label,
     options,
+    validate,
+    description,
     disabled // ...otherProps
 
   } = _ref;
   (0, React.useLayoutEffect)(() => {
     Promise.resolve().then(() => _interopRequireWildcard(require("./styles.scss")));
   }, []);
-  var [field, meta] = (0, _formik.useField)(name);
+  var [field, meta] = (0, _formik.useField)({
+    name,
+    validate
+  });
   return /*#__PURE__*/React.createElement("div", {
     id: id,
     className: [baseClassName, componentClassName, userClassName].filter(e => e).join(' '),
@@ -56,6 +61,7 @@ var SelectInput = _ref => {
   }, label), /*#__PURE__*/React.createElement("select", _extends({
     className: "input v25 pv-v"
   }, field, {
+    value: field.value || '',
     id: name,
     disabled: disabled
   }), options.map(option => {
@@ -66,11 +72,13 @@ var SelectInput = _ref => {
     } : option;
     return /*#__PURE__*/React.createElement("option", {
       key: newOption.value,
-      value: newOption.value
+      value: newOption.value,
+      disabled: (newOption === null || newOption === void 0 ? void 0 : newOption.disabled) || false
     }, newOption.label);
-  })), meta.error && meta.touched && /*#__PURE__*/React.createElement(_common.FormDescription, {
-    error: true
-  }, meta.error));
+  })), (description || meta.touched && meta.error) && /*#__PURE__*/React.createElement(_common.FormDescription, {
+    isError: !!meta.error,
+    className: "v50 mt-v s-1"
+  }, meta.error || description));
 };
 
 SelectInput.propTypes = {
@@ -99,12 +107,23 @@ SelectInput.propTypes = {
    */
   label: _propTypes.default.string,
 
+  /**
+   * The input field validator function
+   */
+  validate: _propTypes.default.func,
+
+  /**
+   * The select input description
+   */
+  description: _propTypes.default.string,
+
   /**
    * The options of the select input
    */
   options: _propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.shape({
     value: _propTypes.default.string,
-    label: _propTypes.default.string
+    label: _propTypes.default.string,
+    disabled: _propTypes.default.bool
   })])),
 
   /**

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

@@ -18,12 +18,12 @@ $default-padding: 0.75em 0.75em 0.55em;
   }
 
   .input {
-    background: var(--light-background1);
-    color: var(--on-background1);
+    background: var(--light-background2);
+    color: var(--on-background2);
     padding: $default-padding;
 
     &:focus {
-      background: var(--dark-background1);
+      background: var(--dark-background2);
     }
   }
 }

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

@@ -41,7 +41,8 @@ var TextInput = _ref => {
     validate,
     oneInputLabel,
     description,
-    disabled // ...otherProps
+    disabled,
+    placeholder // ...otherProps
 
   } = _ref;
   (0, React.useLayoutEffect)(() => {
@@ -63,7 +64,8 @@ var TextInput = _ref => {
     id: name,
     className: "input ".concat(meta.touched && meta.error ? 'input-border-error' : 'input-border'),
     type: type,
-    disabled: disabled
+    disabled: disabled,
+    placeholder: placeholder
   }, field)), (description || meta.touched && meta.error) && /*#__PURE__*/React.createElement(_common.FormDescription, {
     isError: !!meta.error,
     className: "v50 mt-v s-1"
@@ -119,7 +121,12 @@ TextInput.propTypes = {
   /**
    * Whether the text input should be disabled
    */
-  disabled: _propTypes.default.bool
+  disabled: _propTypes.default.bool,
+
+  /**
+   * The placeholder text for the input
+   */
+  placeholder: _propTypes.default.string
 };
 TextInput.defaultProps = {
   type: 'text',

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

@@ -21,13 +21,18 @@ const SelectInput = ({
   name,
   label,
   options,
+  validate,
+  description,
   disabled // ...otherProps
 
 }) => {
   useLayoutEffect(() => {
     import("./styles.scss");
   }, []);
-  const [field, meta] = useField(name);
+  const [field, meta] = useField({
+    name,
+    validate
+  });
   return /*#__PURE__*/React.createElement("div", {
     id: id,
     className: [baseClassName, componentClassName, userClassName].filter(e => e).join(' '),
@@ -39,6 +44,7 @@ const SelectInput = ({
   }, label), /*#__PURE__*/React.createElement("select", _extends({
     className: "input v25 pv-v"
   }, field, {
+    value: field.value || '',
     id: name,
     disabled: disabled
   }), options.map(option => {
@@ -49,11 +55,13 @@ const SelectInput = ({
     } : option;
     return /*#__PURE__*/React.createElement("option", {
       key: newOption.value,
-      value: newOption.value
+      value: newOption.value,
+      disabled: (newOption === null || newOption === void 0 ? void 0 : newOption.disabled) || false
     }, newOption.label);
-  })), meta.error && meta.touched && /*#__PURE__*/React.createElement(FormDescription, {
-    error: true
-  }, meta.error));
+  })), (description || meta.touched && meta.error) && /*#__PURE__*/React.createElement(FormDescription, {
+    isError: !!meta.error,
+    className: "v50 mt-v s-1"
+  }, meta.error || description));
 };
 
 SelectInput.propTypes = {
@@ -82,12 +90,23 @@ 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
+    label: PropTypes.string,
+    disabled: PropTypes.bool
   })])),
 
   /**

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

@@ -18,12 +18,12 @@ $default-padding: 0.75em 0.75em 0.55em;
   }
 
   .input {
-    background: var(--light-background1);
-    color: var(--on-background1);
+    background: var(--light-background2);
+    color: var(--on-background2);
     padding: $default-padding;
 
     &:focus {
-      background: var(--dark-background1);
+      background: var(--dark-background2);
     }
   }
 }

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

@@ -24,7 +24,8 @@ const TextInput = ({
   validate,
   oneInputLabel,
   description,
-  disabled // ...otherProps
+  disabled,
+  placeholder // ...otherProps
 
 }) => {
   useLayoutEffect(() => {
@@ -46,7 +47,8 @@ const TextInput = ({
     id: name,
     className: `input ${meta.touched && meta.error ? 'input-border-error' : 'input-border'}`,
     type: type,
-    disabled: disabled
+    disabled: disabled,
+    placeholder: placeholder
   }, field)), (description || meta.touched && meta.error) && /*#__PURE__*/React.createElement(FormDescription, {
     isError: !!meta.error,
     className: "v50 mt-v s-1"
@@ -102,7 +104,12 @@ TextInput.propTypes = {
   /**
    * Whether the text input should be disabled
    */
-  disabled: PropTypes.bool
+  disabled: PropTypes.bool,
+
+  /**
+   * The placeholder text for the input
+   */
+  placeholder: PropTypes.string
 };
 TextInput.defaultProps = {
   type: 'text',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pareto-engineering/design-system",
-  "version": "2.0.0-alpha.15",
+  "version": "2.0.0-alpha.16",
   "description": "",
   "main": "dist/cjs/index.js",
   "module": "dist/es/index.js",

package/src/__snapshots__/Storyshots.test.js.snap

@@ -9273,18 +9273,22 @@ exports[`Storyshots f/FormInput Base 1`] = `
       name="food"
       onBlur={[Function]}
       onChange={[Function]}
+      value=""
     >
       <option
+        disabled={false}
         value="italian"
       >
         A nice pizza
       </option>
       <option
+        disabled={false}
         value="turkish"
       >
         A delicious kebab
       </option>
       <option
+        disabled={false}
         value="french"
       >
         A three course delicate french meal
@@ -9458,18 +9462,22 @@ exports[`Storyshots f/FormInput Disabled Form Input 1`] = `
       name="food"
       onBlur={[Function]}
       onChange={[Function]}
+      value=""
     >
       <option
+        disabled={false}
         value="italian"
       >
         A nice pizza
       </option>
       <option
+        disabled={false}
         value="turkish"
       >
         A delicious kebab
       </option>
       <option
+        disabled={false}
         value="french"
       >
         A three course delicate french meal
@@ -11124,16 +11132,19 @@ exports[`Storyshots f/fields/SelectInput Base 1`] = `
       value="Work"
     >
       <option
+        disabled={false}
         value="Work"
       >
         Work
       </option>
       <option
+        disabled={false}
         value="Managing"
       >
         Managing
       </option>
       <option
+        disabled={false}
         value="Training"
       >
         Training
@@ -11179,26 +11190,31 @@ exports[`Storyshots f/fields/SelectInput Disabled Select Input 1`] = `
       value="Work"
     >
       <option
+        disabled={false}
         value="Work"
       >
         Work
       </option>
       <option
+        disabled={false}
         value="Managing"
       >
         Managing
       </option>
       <option
+        disabled={false}
         value="Training"
       >
         Training
       </option>
       <option
+        disabled={false}
         value="20th Aug 2020 to 19th Sept, 2020"
       >
         20th Aug 2020 to 19th Sept, 2020
       </option>
       <option
+        disabled={false}
         value="20th Sept 2020 to 19th Oct, 2020"
       >
         20th Sept 2020 to 19th Oct, 2020
@@ -11244,11 +11260,13 @@ exports[`Storyshots f/fields/SelectInput Objects 1`] = `
       value="Work"
     >
       <option
+        disabled={false}
         value="20th Aug 2020 to 19th Sept, 2020"
       >
         20th Aug 2020 to 19th Sept, 2020
       </option>
       <option
+        disabled={false}
         value="20th Sept 2020 to 19th Oct, 2020"
       >
         20th Sept 2020 to 19th Oct, 2020
@@ -11269,6 +11287,64 @@ exports[`Storyshots f/fields/SelectInput Objects 1`] = `
 </form>
 `;
 
+exports[`Storyshots f/fields/SelectInput Required Select 1`] = `
+<form
+  action="#"
+  onReset={[Function]}
+  onSubmit={[Function]}
+>
+  <div
+    className="base select-input"
+  >
+    <label
+      className="base label input-label x-main2"
+      htmlFor="activity"
+    >
+      Activity Type
+    </label>
+    <select
+      className="input v25 pv-v"
+      disabled={false}
+      id="activity"
+      name="activity"
+      onBlur={[Function]}
+      onChange={[Function]}
+      value=""
+    >
+      <option
+        disabled={true}
+        value=""
+      >
+        Select activity type
+      </option>
+      <option
+        disabled={false}
+        value="review"
+      >
+        Review
+      </option>
+      <option
+        disabled={false}
+        value="Approve"
+      >
+        Approve
+      </option>
+    </select>
+  </div>
+  <div
+    className="debugger"
+  >
+    <button
+      className="base button x-main2"
+      onClick={[Function]}
+      type="button"
+    >
+      Open FormDebugger
+    </button>
+  </div>
+</form>
+`;
+
 exports[`Storyshots f/fields/SelectInput String And Objects 1`] = `
 <form
   action="#"
@@ -11294,26 +11370,31 @@ exports[`Storyshots f/fields/SelectInput String And Objects 1`] = `
       value="Work"
     >
       <option
+        disabled={false}
         value="Work"
       >
         Work
       </option>
       <option
+        disabled={false}
         value="Managing"
       >
         Managing
       </option>
       <option
+        disabled={false}
         value="Training"
       >
         Training
       </option>
       <option
+        disabled={false}
         value="20th Aug 2020 to 19th Sept, 2020"
       >
         20th Aug 2020 to 19th Sept, 2020
       </option>
       <option
+        disabled={false}
         value="20th Sept 2020 to 19th Oct, 2020"
       >
         20th Sept 2020 to 19th Oct, 2020
@@ -11530,6 +11611,40 @@ exports[`Storyshots f/fields/TextInput Disabled Text Input 1`] = `
 </form>
 `;
 
+exports[`Storyshots f/fields/TextInput Text Input With Place Holder 1`] = `
+<form
+  action="#"
+  onReset={[Function]}
+  onSubmit={[Function]}
+>
+  <div
+    className="y-background1 b-dark-y u2 pb-u"
+  >
+    <div
+      className="base text-input"
+    >
+      <label
+        className="base label input-label v50 mb-v x-main2"
+        htmlFor="firstName"
+      >
+        What's your first name ?
+      </label>
+      <input
+        className="input input-border"
+        disabled={false}
+        id="firstName"
+        name="firstName"
+        onBlur={[Function]}
+        onChange={[Function]}
+        placeholder="First Name"
+        type="text"
+        value=""
+      />
+    </div>
+  </div>
+</form>
+`;
+
 exports[`Storyshots f/fields/TextareaInput Base 1`] = `
 <form
   action="#"

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

@@ -38,6 +38,35 @@ export const Base = () => (
   </>
 )
 
+export const RequiredSelect = () => {
+  const requiredInput = (inputValue) => {
+    let error = ''
+
+    if (!inputValue || !inputValue?.length === 0) {
+      error = 'This information is required'
+    }
+    return error
+  }
+
+  return (
+    <>
+      <SelectInput
+        validate={requiredInput}
+        name="activity"
+        label="Activity Type"
+        options={[
+          {
+            value:'', label:'Select activity type', disabled:true,
+          },
+          { value: 'review', label: 'Review' },
+          { value: 'Approve', label: 'Approve' },
+        ]}
+      />
+      <FormDebugger />
+    </>
+  )
+}
+
 export const Objects = () => (
   <>
     <SelectInput

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

@@ -52,6 +52,16 @@ export const Base = () => {
   )
 }
 
+export const TextInputWithPlaceHolder = () => (
+  <div className="y-background1 b-dark-y u2 pb-u">
+    <TextInput
+      name="firstName"
+      label="What's your first name ?"
+      placeholder="First Name"
+    />
+  </div>
+)
+
 export const DisabledTextInput = () => (
   <div className="y-background1 b-dark-y u2 pb-u">
     <TextInput

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

@@ -27,6 +27,8 @@ const SelectInput = ({
   name,
   label,
   options,
+  validate,
+  description,
   disabled,
   // ...otherProps
 }) => {
@@ -34,7 +36,7 @@ const SelectInput = ({
     import('./styles.scss')
   }, [])
 
-  const [field, meta] = useField(name)
+  const [field, meta] = useField({ name, validate })
 
   return (
     <div
@@ -52,18 +54,30 @@ 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 v25 pv-v" {...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}
+            >
+              {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,12 +107,28 @@ 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,
+        })],
     ),
   ),
   /**

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

@@ -18,12 +18,12 @@ $default-padding: 0.75em 0.75em 0.55em;
   }
 
   .input {
-    background: var(--light-background1);
-    color: var(--on-background1);
+    background: var(--light-background2);
+    color: var(--on-background2);
     padding: $default-padding;
 
     &:focus {
-      background: var(--dark-background1);
+      background: var(--dark-background2);
     }
   }
 }

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

@@ -31,6 +31,7 @@ const TextInput = ({
   oneInputLabel,
   description,
   disabled,
+  placeholder,
   // ...otherProps
 }) => {
   useLayoutEffect(() => {
@@ -66,6 +67,7 @@ const TextInput = ({
         className={`input ${meta.touched && meta.error ? 'input-border-error' : 'input-border'}`}
         type={type}
         disabled={disabled}
+        placeholder={placeholder}
         {...field}
       />
       {(description || (meta.touched && meta.error))
@@ -136,6 +138,11 @@ TextInput.propTypes = {
    * Whether the text input should be disabled
    */
   disabled     :PropTypes.bool,
+
+  /**
+   * The placeholder text for the input
+   */
+  placeholder:PropTypes.string,
 }
 
 TextInput.defaultProps = {