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

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

@@ -27,10 +27,12 @@ const TextInput = ({
   type,
   name,
   label,
+  labelColor,
   validate,
   oneInputLabel,
   description,
   disabled,
+  placeholder,
   // ...otherProps
 }) => {
   useLayoutEffect(() => {
@@ -53,11 +55,11 @@ 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>
@@ -66,6 +68,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))
@@ -104,6 +107,11 @@ TextInput.propTypes = {
    */
   label:PropTypes.string.isRequired,
 
+  /**
+   * The input label color
+   */
+  labelColor:PropTypes.string,
+
   /**
    * The type of the input (html)
    */
@@ -136,6 +144,11 @@ TextInput.propTypes = {
    * Whether the text input should be disabled
    */
   disabled     :PropTypes.bool,
+
+  /**
+   * The placeholder text for the input
+   */
+  placeholder:PropTypes.string,
 }
 
 TextInput.defaultProps = {

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

@@ -9,10 +9,6 @@ $default-padding: 0.75em 0.75em 0.55em;
   display: flex;
   flex-direction: column;
 
-  .input-label {
-    color: var(--main2);
-  }
-
   .input {
     background: var(--light-background2);
     color: var(--on-background2);

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

@@ -34,6 +34,7 @@ const TextareaInput = ({
   labelColor,
   description,
   disabled,
+  placeholder,
   // ...otherProps
 }) => {
   useLayoutEffect(() => {
@@ -52,7 +53,6 @@ const TextareaInput = ({
         componentClassName,
         userClassName,
         `x-${textAreaColor}`,
-        `y-${labelColor}`,
       ]
         .filter((e) => e)
         .join(' ')}
@@ -60,11 +60,11 @@ 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>
@@ -72,6 +72,7 @@ const TextareaInput = ({
         id={textAreaId}
         className={`textarea v50 pv-v ${meta.touched && meta.error ? 'input-border-error' : 'input-border'}`}
         {...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:'background1',
-  labelColor   :'main2',
   disabled     :false,
 }