Skip to content

[V2] refactor(renderer): refactor render single field #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 18, 2020
Merged

[V2] refactor(renderer): refactor render single field #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,885 changes: 1,226 additions & 1,659 deletions packages/pf3-component-mapper/src/tests/__snapshots__/input-addon.test.js.snap
View file
Open in desktop

Large diffs are not rendered by default.

2,193 changes: 1,059 additions & 1,134 deletions packages/pf4-component-mapper/src/tests/wizard/__snapshots__/wizard.test.js.snap
View file
Open in desktop

Large diffs are not rendered by default.

53 changes: 0 additions & 53 deletions packages/react-form-renderer/src/form-renderer/field-wrapper.js
View file
Open in desktop

This file was deleted.

65 changes: 45 additions & 20 deletions packages/react-form-renderer/src/form-renderer/render-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
import React, { Fragment, useContext } from 'react';
import React, { useContext } from 'react';
import PropTypes from 'prop-types';
import { childrenPropTypes } from '@data-driven-forms/common/src/prop-types-templates';
import { dataTypeValidator } from '../validators';
import RendererContext from '../components/renderer-context';
import Condition from './condition';
import { memoize } from '../validators/helpers';
import FieldWrapper from './field-wrapper';
import componentTypes from '../components/component-types';
import composeValidators from '../components/compose-validators';
import convertInitialValue from './convert-initial-value';

const assignSpecialType = (componentType) => ([componentTypes.CHECKBOX, componentTypes.RADIO].includes(componentType) ? componentType : undefined);

const FormFieldHideWrapper = ({ hideField, children }) => (hideField ? <div hidden>{children}</div> : children);

Expand All @@ -27,29 +31,49 @@ FormConditionWrapper.propTypes = {

const prepareValidator = (validator, mapper) => (typeof validator === 'function' ? memoize(validator) : mapper[validator.type]({ ...validator }));

const getValidate = (validate, dataType, mapper) => ({
validate: validate
const getValidate = (validate, dataType, mapper) =>
validate
? [...validate.map((validator) => prepareValidator(validator, mapper)), dataType && dataTypeValidator(dataType)()]
: [dataType && dataTypeValidator(dataType)()]
});
: [dataType && dataTypeValidator(dataType)()];

const prepareArrayValidator = (validation) => (value = []) => {
if (!Array.isArray(value)) {
return;
}

const arrayValidator = composeValidators(validation);
let result = arrayValidator(value && value.length > 0 ? value : undefined);
if (typeof result === 'function') {
result = result(value);
}

return result;
};

const SingleField = ({ component, condition, hideField, validate, ...rest }) => {
const { componentMapper, validatorMapper } = useContext(RendererContext);

const validation = getValidate(validate, rest.dataType, validatorMapper);

const componentProps = {
type: assignSpecialType(component),
...rest,
...(Object.prototype.hasOwnProperty.call(rest, 'initialValue') && Object.prototype.hasOwnProperty.call(rest, 'dataType')
? { initialValue: convertInitialValue(rest.initialValue, rest.dataType) }
: {}),
...(componentTypes.FIELD_ARRAY === component
? { arrayValidator: prepareArrayValidator(validation) }
: { validate: composeValidators(validation) })
};

const Component = componentMapper[component];

return (
<Fragment key={rest.key || rest.name}>
<FormConditionWrapper condition={condition}>
<FormFieldHideWrapper hideField={hideField}>
<FieldWrapper
componentType={component}
component={componentMapper[component]}
name={rest.name || rest.key}
{...rest}
{...(validate || rest.dataType ? getValidate(validate, rest.dataType, validatorMapper) : {})}
/>
</FormFieldHideWrapper>
</FormConditionWrapper>
</Fragment>
<FormConditionWrapper condition={condition}>
<FormFieldHideWrapper hideField={hideField}>
<Component {...componentProps} />
</FormFieldHideWrapper>
</FormConditionWrapper>
);
};

Expand All @@ -58,7 +82,8 @@ SingleField.propTypes = {
condition: PropTypes.object,
hideField: PropTypes.bool,
dataType: PropTypes.string,
validate: PropTypes.array
validate: PropTypes.arrayOf(PropTypes.func),
initialValue: PropTypes.any
};

const renderForm = (fields) => fields.map((field) => (Array.isArray(field) ? renderForm(field) : <SingleField key={field.name} {...field} />));
Expand Down
124 changes: 49 additions & 75 deletions ...ages/react-form-renderer/src/tests/form-renderer/__snapshots__/form-renderer.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,29 +134,23 @@ exports[`<FormRenderer /> should render form from schema 1`] = `
<FormFieldHideWrapper
hideField={false}
>
<FieldWrapper
component={[Function]}
componentType="text-field"
<TextField
name="component1"
validate={[Function]}
>
<TextField
name="component1"
validate={[Function]}
<div
className="nested-item"
>
<div
className="nested-item"
>
<input
id="component1"
name="component1"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
value=""
/>
</div>
</TextField>
</FieldWrapper>
<input
id="component1"
name="component1"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
value=""
/>
</div>
</TextField>
</FormFieldHideWrapper>
</FormConditionWrapper>
</SingleField>
Expand All @@ -169,22 +163,16 @@ exports[`<FormRenderer /> should render form from schema 1`] = `
<FormFieldHideWrapper
hideField={false}
>
<FieldWrapper
component={[Function]}
componentType="select"
<Component
name="secret"
validate={[Function]}
>
<Component
name="secret"
validate={[Function]}
<div
className="nested-item"
>
<div
className="nested-item"
>
Select field
</div>
</Component>
</FieldWrapper>
Select field
</div>
</Component>
</FormFieldHideWrapper>
</FormConditionWrapper>
</SingleField>
Expand Down Expand Up @@ -367,31 +355,24 @@ exports[`<FormRenderer /> should render hidden field 1`] = `
<FormFieldHideWrapper
hideField={false}
>
<FieldWrapper
component={[Function]}
componentType="text-field"
<TextField
label="Visible"
name="visible"
validate={[Function]}
>
<TextField
label="Visible"
name="visible"
validate={[Function]}
<div
className="nested-item"
>
<div
className="nested-item"
>
<input
id="visible"
name="visible"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
value=""
/>
</div>
</TextField>
</FieldWrapper>
<input
id="visible"
name="visible"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
value=""
/>
</div>
</TextField>
</FormFieldHideWrapper>
</FormConditionWrapper>
</SingleField>
Expand All @@ -409,31 +390,24 @@ exports[`<FormRenderer /> should render hidden field 1`] = `
<div
hidden={true}
>
<FieldWrapper
component={[Function]}
componentType="text-field"
<TextField
label="Hidden"
name="hidden"
validate={[Function]}
>
<TextField
label="Hidden"
name="hidden"
validate={[Function]}
<div
className="nested-item"
>
<div
className="nested-item"
>
<input
id="hidden"
name="hidden"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
value=""
/>
</div>
</TextField>
</FieldWrapper>
<input
id="hidden"
name="hidden"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
value=""
/>
</div>
</TextField>
</div>
</FormFieldHideWrapper>
</FormConditionWrapper>
Expand Down
Loading