Skip to content

Fixed FieldArray re-render on every change when subscription is empty… #100

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.

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
Aug 4, 2019
Merged
Changes from all commits
Commits
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
62 changes: 58 additions & 4 deletions src/FieldArray.test.js
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ import React from 'react'
import { render, fireEvent, cleanup } from '@testing-library/react'
import 'jest-dom/extend-expect'
import arrayMutators from 'final-form-arrays'
import { ErrorBoundary, Toggle } from './testUtils'
import { ErrorBoundary, Toggle, wrapWith } from './testUtils'
import { Form, Field } from 'react-final-form'
import { FieldArray, version } from '.'

@@ -129,7 +129,7 @@ describe('FieldArray', () => {
const renderArray = jest.fn(() => <div />)
class Container extends React.Component {
state = { name: 'dogs' }
render() {
return (
<form>
@@ -149,10 +149,10 @@ describe('FieldArray', () => {
expect(renderArray).toHaveBeenCalled()
expect(renderArray).toHaveBeenCalledTimes(1)
expect(renderArray.mock.calls[0][0].value).toBeUndefined()
const button = TestUtils.findRenderedDOMComponentWithTag(dom, 'button')
TestUtils.Simulate.click(button)
expect(renderArray).toHaveBeenCalledTimes(2)
expect(renderArray.mock.calls[1][0].value).toBeUndefined()
})
@@ -445,6 +445,60 @@ describe('FieldArray', () => {
expect(queryByTestId('names[1]')).not.toBe(null)
})

it('should not re-render Field when subscription is empty object', () => {
const nameFieldRender = jest.fn()
const surnameFieldRender = jest.fn()

const { getByTestId } = render(
<Form
onSubmit={onSubmitMock}
mutators={arrayMutators}
subscription={{}}
initialValues={{
names: [{ id: 1, name: 'John', surname: 'Doe' }]
}}
>
{({ handleSubmit }) => (
<form onSubmit={handleSubmit} data-testid="form">
<FieldArray name="names" subscription={{}}>
{({ fields }) =>
fields.map(field => {
return (
<div key={`${field}.id`}>
<Field name={`${field}.name`}>
{wrapWith(nameFieldRender, ({ input }) => (
<input data-testid={`${field}.name`} {...input} />
))}
</Field>
<Field name={`${field}.surname`}>
{wrapWith(surnameFieldRender, ({ input }) => (
<input data-testid={`${field}.surname`} {...input} />
))}
</Field>
</div>
)
})
}
</FieldArray>
</form>
)}
</Form>
)

fireEvent.change(getByTestId('names[0].name'), {
target: { value: 'Sue' }
})
expect(getByTestId('names[0].name').value).toBe('Sue')

fireEvent.change(getByTestId('names[0].name'), {
target: { value: 'Paul' }
})
expect(getByTestId('names[0].name').value).toBe('Paul')

expect(nameFieldRender).toHaveBeenCalledTimes(3)
expect(surnameFieldRender).toHaveBeenCalledTimes(1)
})

it('should allow Fields to be rendered for complex objects', () => {
const onSubmit = jest.fn()
const { getByTestId, getByText, queryByTestId } = render(
5 changes: 5 additions & 0 deletions src/testUtils.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import React from 'react'

export const wrapWith = (mock, fn) => (...args) => {
mock(...args)
return fn(...args)
}

/** A simple container component that allows boolean to be toggled with a button */
export function Toggle({ children }) {
const [on, setOn] = React.useState(false)
2 changes: 1 addition & 1 deletion src/useFieldArray.js
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@ const useFieldArray = (
input,
...fieldState
} = useField(name, {
subscription: { ...subscription, value: true, length: true },
subscription: { ...subscription, length: true },
isEqual,
validate,
format: v => v