Skip to content

fix: Should force re render when shouldUpdate is true #117

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 2 commits into from
Apr 25, 2020
Merged

fix: Should force re render when shouldUpdate is true #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a10d250
test first
zombieJ Apr 25, 2020
6df25ef
force re-render
zombieJ Apr 25, 2020
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
6 changes: 6 additions & 0 deletions src/Field.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,15 @@ class Field extends React.Component<InternalFieldProps, FieldState> implements F

// ============================== Subscriptions ==============================
public componentDidMount() {
const { shouldUpdate } = this.props;
const { getInternalHooks }: InternalFormInstance = this.context;
const { registerField } = getInternalHooks(HOOK_MARK);
this.cancelRegisterFunc = registerField(this);

// One more render for component in case fields not ready
if (shouldUpdate === true) {
this.reRender();
}
}

public componentWillUnmount() {
Expand Down
95 changes: 63 additions & 32 deletions tests/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,44 +311,75 @@ describe('Form.Basic', () => {
expect(wrapper.find('.anything').props().light).toEqual('bamboo');
});

it('shouldUpdate', async () => {
let isAllTouched;
let hasError;
describe('shouldUpdate', () => {
it('work', async () => {
let isAllTouched;
let hasError;

const wrapper = mount(
<Form>
<Field name="username" rules={[{ required: true }]}>
<Input />
</Field>
<Field name="password" rules={[{ required: true }]}>
<Input />
</Field>
<Field shouldUpdate>
{(_, __, { getFieldsError, isFieldsTouched }) => {
isAllTouched = isFieldsTouched(true);
hasError = getFieldsError().filter(({ errors }) => errors.length).length;
const wrapper = mount(
<Form>
<Field name="username" rules={[{ required: true }]}>
<Input />
</Field>
<Field name="password" rules={[{ required: true }]}>
<Input />
</Field>
<Field shouldUpdate>
{(_, __, { getFieldsError, isFieldsTouched }) => {
isAllTouched = isFieldsTouched(true);
hasError = getFieldsError().filter(({ errors }) => errors.length).length;

return null;
}}
</Field>
</Form>,
);
return null;
}}
</Field>
</Form>,
);

await changeValue(getField(wrapper, 'username'), '');
expect(isAllTouched).toBeFalsy();
expect(hasError).toBeTruthy();

await changeValue(getField(wrapper, 'username'), '');
expect(isAllTouched).toBeFalsy();
expect(hasError).toBeTruthy();
await changeValue(getField(wrapper, 'username'), 'Bamboo');
expect(isAllTouched).toBeFalsy();
expect(hasError).toBeFalsy();

await changeValue(getField(wrapper, 'password'), 'Light');
expect(isAllTouched).toBeTruthy();
expect(hasError).toBeFalsy();

await changeValue(getField(wrapper, 'password'), '');
expect(isAllTouched).toBeTruthy();
expect(hasError).toBeTruthy();
});

await changeValue(getField(wrapper, 'username'), 'Bamboo');
expect(isAllTouched).toBeFalsy();
expect(hasError).toBeFalsy();
it('true will force one more update', async () => {
let renderPhase = 0;

await changeValue(getField(wrapper, 'password'), 'Light');
expect(isAllTouched).toBeTruthy();
expect(hasError).toBeFalsy();
const wrapper = mount(
<Form initialValues={{ username: 'light' }}>
<Field name="username">
<Input />
</Field>
<Field shouldUpdate>
{(_, __, form) => {
renderPhase += 1;
return (
<span
id="holder"
data-touched={form.isFieldsTouched(true)}
data-value={form.getFieldsValue()}
/>
);
}}
</Field>
</Form>,
);

await changeValue(getField(wrapper, 'password'), '');
expect(isAllTouched).toBeTruthy();
expect(hasError).toBeTruthy();
const props = wrapper.find('#holder').props();
expect(renderPhase).toEqual(2);
expect(props['data-touched']).toBeFalsy();
expect(props['data-value']).toEqual({ username: 'light' });
});
});

describe('setFields', () => {
Expand Down