diff --git a/packages/component-faraday-ui/src/FormikMenuCountry.js b/packages/component-faraday-ui/src/FormikMenuCountry.js new file mode 100644 index 0000000000000000000000000000000000000000..d8442ad9cc637e5a9bab53212c45b55d0a3f266e --- /dev/null +++ b/packages/component-faraday-ui/src/FormikMenuCountry.js @@ -0,0 +1,22 @@ +import React from 'react' +import { Field } from 'formik' + +import { MenuCountry } from './' + +const FormikMenuCountry = ({ name }) => ( + <Field name={name}> + {({ field, form }) => + console.log({ field, form }) || ( + <MenuCountry + onChange={v => { + // field.onChange(v) + form.setFieldValue(field.name, v) + }} + value={field.value} + /> + ) + } + </Field> +) + +export default FormikMenuCountry diff --git a/packages/component-faraday-ui/src/index.js b/packages/component-faraday-ui/src/index.js index 6d5f3b1be3fa8bc2fe83cf3c2bff21242bb75160..f16ba298ecee239c06b53ec3088d3572d4dfe380 100644 --- a/packages/component-faraday-ui/src/index.js +++ b/packages/component-faraday-ui/src/index.js @@ -52,6 +52,7 @@ export { default as ReviewerReportAuthor } from './ReviewerReportAuthor' export { default as PasswordValidation } from './PasswordValidation' export { default as MenuCountry } from './MenuCountry' export { default as ValidatedMenuField } from './ValidatedMenuField' +export { default as FormikMenuCountry } from './FormikMenuCountry' export { SubmitRevision } from './submissionRevision' diff --git a/packages/component-user/app/components/AdminUserForm.js b/packages/component-user/app/components/AdminUserForm.js index 50a314f428bc0251880441d6a49f18d591d14f96..5db406ab50cbc4be69fa6b70668d76abe80448a4 100644 --- a/packages/component-user/app/components/AdminUserForm.js +++ b/packages/component-user/app/components/AdminUserForm.js @@ -20,6 +20,7 @@ import { IconButton, RowOverrideAlert, ItemOverrideAlert, + FormikMenuCountry, ValidatedMenuField, withRoles, withFetching, @@ -90,7 +91,6 @@ const FormModal = ({ component={TextField} inline name="email" - validate={[required]} /> </ItemOverrideAlert> <ItemOverrideAlert ml={1} vertical> @@ -126,7 +126,7 @@ const FormModal = ({ </ItemOverrideAlert> <ItemOverrideAlert ml={1} vertical> <Label>Country</Label> - <ValidatedMenuField name="country" options={countries} /> + <FormikMenuCountry name="country" /> </ItemOverrideAlert> </RowOverrideAlert> @@ -183,9 +183,10 @@ export default compose( })), withHandlers({ onSubmit: ({ onSubmit, ...props }) => (values, formProps) => { - if (typeof onSubmit === 'function') { - onSubmit(values, { ...formProps, ...props }) - } + console.log('the values', values) + // if (typeof onSubmit === 'function') { + // onSubmit(values, { ...formProps, ...props }) + // } }, onClose: ({ onCancel, ...props }) => () => { if (typeof onCancel === 'function') {