@pareto-engineering/design-system 2.0.0-alpha.62 → 2.0.0-alpha.63

package/src/stories/f/ChoicesInput.stories.jsx

@@ -1,8 +1,8 @@
 /* @pareto-engineering/generator-front 1.0.12 */
 import * as React from 'react'
-
+import { useEffect } from 'react'
 import { ChoicesInput, FormDebugger } from 'ui'
-import { Formik, Form } from 'formik'
+import { Formik, Form, useField } from 'formik'
 
 export default {
   title        :'f/fields/ChoicesInput',
@@ -29,14 +29,6 @@ export default {
   },
 }
 
-const Template = (args) => (
-  <>
-    <ChoicesInput {...args} />
-    <FormDebugger />
-  </>
-)
-
-export const Base = Template.bind({})
 const optionsMap = [
   {
     value:'red',
@@ -72,18 +64,54 @@ const optionsMap = [
   },
 ]
 
+// eslint-disable-next-line react/prop-types
+const Template = ({ defaultValue, ...args }) => {
+  const Content = () => {
+    const [, , helpers] = useField(args.name)
+    const { setValue } = helpers
+
+    useEffect(() => {
+      if (defaultValue) {
+        setValue(defaultValue)
+      }
+    }, [defaultValue])
+
+    return (
+      <>
+        <ChoicesInput {...args} />
+        <FormDebugger />
+      </>
+    )
+  }
+  return <Content />
+}
+
+export const Base = Template.bind({})
 Base.args = {
   id     :'colors',
   options:optionsMap,
   name   :'color',
 }
 
+export const WithDefaultFormikValue = Template.bind({})
+WithDefaultFormikValue.args = {
+  ...Base.args,
+  defaultValue:'red',
+}
+
 export const Multiple = Template.bind({})
 Multiple.args = {
   ...Base.args,
   multiple:true,
 }
 
+export const MultipleWithDefaultFormikValue = Template.bind({})
+MultipleWithDefaultFormikValue.args = {
+  ...Base.args,
+  multiple    :true,
+  defaultValue:['brown', 'violet'],
+}
+
 export const MultipleWithGrid = Template.bind({})
 MultipleWithGrid.args = {
   ...Base.args,

package/src/ui/f/FormInput/FormInput.jsx

@@ -100,6 +100,7 @@ const FormInput = ({
     return (
       <Checkbox
         className={newClassName}
+        disabled={disabled}
         {...otherProps}
       />
     )

package/src/ui/f/common/Label/Label.jsx

@@ -11,7 +11,7 @@ import styleNames from '@pareto-engineering/bem'
 
 const baseClassName = styleNames.base
 
-const componentClassName = 'label'
+const componentClassName = 'form-label'
 
 /**
  * This is the component description.

package/src/ui/f/common/Label/styles.scss

@@ -3,9 +3,6 @@
 @use "@pareto-engineering/bem";
 @use "../../../form.scss";
 
-
-.#{bem.$base}.label {
+.#{bem.$base}.form-label {
  color: var(--dark-x);
 }
-
-

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

@@ -72,7 +72,7 @@ const ChoicesInput = ({
           <Choice
             key={choice.value}
             name={name}
-            id={`${id}-${choice.value}`}
+            id={`${name}-${choice.value}`}
             multiple={multiple}
             validate={validate}
             disabled={disabled}

package/src/ui/f/fields/ChoicesInput/common/Choice/Choice.jsx

@@ -28,7 +28,15 @@ const Choice = ({
   validate,
   disabled,
 }) => {
-  const [field] = useField({ name, validate })
+  const type = multiple ? 'checkbox' : 'radio'
+
+  const [field] = useField({
+    name,
+    validate,
+    type,
+    value,
+  })
+
   return (
     <div
       className={[
@@ -43,7 +51,7 @@ const Choice = ({
       style={style}
     >
       <input
-        type={multiple ? 'checkbox' : 'radio'}
+        type={type}
         id={id}
         name={name}
         {...field}

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

@@ -33,13 +33,14 @@ const QueryCombobox = ({
   optionsKeyMap,
   minLength,
   transformSearch,
+  validate,
   // ...otherProps
 }) => {
   useLayoutEffect(() => {
     import('./styles.scss')
   }, [])
 
-  const [, meta, helpers] = useField(name)
+  const [, meta, helpers] = useField({ name, validate })
 
   const { setValue, setError } = helpers
 
@@ -209,6 +210,11 @@ QueryCombobox.propTypes = {
    * The function to transform the search input
    */
   transformSearch:PropTypes.func,
+
+  /**
+   * The query combobox field validator function
+   */
+  validate:PropTypes.func,
 }
 
 QueryCombobox.defaultProps = {

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

@@ -30,9 +30,10 @@ const QuerySelect = ({
   color,
   loadingOption,
   defaultOption,
+  validate,
   // ...otherProps
 }) => {
-  const [, , helpers] = useField(name)
+  const [, , helpers] = useField({ name, validate })
 
   const { setError } = helpers
 
@@ -180,6 +181,11 @@ QuerySelect.propTypes = {
     label   :PropTypes.string.isRequired,
     disabled:PropTypes.bool.isRequired,
   }),
+
+  /**
+   * The query select field validator function
+   */
+  validate:PropTypes.func,
 }
 
 QuerySelect.defaultProps = {

package/src/ui/f/fields/RatingsInput/common/Rating/Rating.jsx

@@ -25,12 +25,13 @@ const Rating = ({
   ratingId,
   hover,
   setHover,
+  validate,
   activeBackgroundColor,
   inactiveBackgroundColor,
   showRatingValue,
   // ...otherProps
 }) => {
-  const [field] = useField(name)
+  const [field] = useField({ name, validate })
 
   return (
     <div
@@ -125,6 +126,11 @@ Rating.propTypes = {
    * Determines if the rating start value should be shown
    */
   showRatingValue        :PropTypes.bool,
+
+  /**
+   * The rating field validator function
+   */
+  validate:PropTypes.func,
 }
 
 Rating.defaultProps = {