@pareto-engineering/design-system 2.0.0-alpha.13 → 2.0.0-alpha.17

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/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/fields/ChoicesInput/ChoicesInput.jsx

@@ -148,7 +148,7 @@ ChoicesInput.defaultProps = {
   gridColumnsMobile :2,
   gridColumnsDesktop:3,
   color             :'background2',
-  colorChecked      :'main1',
+  colorChecked      :'main2',
   disabled          :false,
 }
 

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

@@ -14,16 +14,16 @@ $default-padding: 0.75em 0.75em 0.55em;
 
 
   .input-label {
-    color: var(--main1);
+    color: var(--main2);
   }
 
   .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/TaskRecommendationInput/TaskRecommendationInput.jsx

@@ -124,7 +124,7 @@ TaskRecommendationInput.propTypes = {
 }
 
 TaskRecommendationInput.defaultProps = {
-  color:'main1',
+  color:'main2',
 }
 
 export default memo(TaskRecommendationInput)

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(() => {
@@ -58,6 +60,7 @@ const TextInput = ({
           .filter((e) => e)
           .join(' ')}
         name={name}
+        color={labelColor}
       >
         { label }
       </FormLabel>
@@ -66,6 +69,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 +108,11 @@ TextInput.propTypes = {
    */
   label:PropTypes.string.isRequired,
 
+  /**
+   * The input label color
+   */
+  labelColor:PropTypes.string,
+
   /**
    * The type of the input (html)
    */
@@ -136,6 +145,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

@@ -10,16 +10,16 @@ $default-padding: 0.75em 0.75em 0.55em;
   flex-direction: column;
 
   .input-label {
-    color: var(--main1);
+    color: var(--main2);
   }
 
   .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/TextareaInput/TextareaInput.jsx

@@ -152,7 +152,7 @@ TextareaInput.propTypes = {
 TextareaInput.defaultProps = {
   rows         :3,
   textAreaColor:'background1',
-  labelColor   :'main1',
+  labelColor   :'main2',
   disabled     :false,
 }