Skip to content

Commit 0c5c890

Browse files
committed
Merge branch 'master' of github.com:erikras/react-final-form-arrays
2 parents 405ad84 + c44ad1d commit 0c5c890

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/FieldArray.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ export default class FieldArray extends React.PureComponent<Props, State> {
5959
name,
6060
listener,
6161
subscription ? { ...subscription, length: true } : all,
62-
{ validate: this.validate }
62+
{
63+
getValidator: () => this.props.validate
64+
}
6365
)
6466
}
6567

@@ -80,9 +82,6 @@ export default class FieldArray extends React.PureComponent<Props, State> {
8082
}
8183
}
8284

83-
validate = (value: ?any, allValues: Object) =>
84-
this.props.validate && this.props.validate(value, allValues)
85-
8685
notify = (state: FieldState) => {
8786
setTimeout(() => this.setState({ state }))
8887
}

src/FieldArray.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ describe('FieldArray', () => {
7474
const dom = TestUtils.renderIntoDocument(<Container />)
7575
expect(renderArray).toHaveBeenCalled()
7676
expect(renderArray).toHaveBeenCalledTimes(1)
77-
expect(renderArray.mock.calls[0][0].value).toEqual(['Odie'])
77+
expect(renderArray.mock.calls[0][0].fields.value).toEqual(['Odie'])
7878

7979
const button = TestUtils.findRenderedDOMComponentWithTag(dom, 'button')
8080
TestUtils.Simulate.click(button)
8181
await sleep(2)
8282

8383
expect(renderArray).toHaveBeenCalledTimes(4)
84-
expect(renderArray.mock.calls[3][0].value).toEqual(['Garfield'])
84+
expect(renderArray.mock.calls[3][0].fields.value).toEqual(['Garfield'])
8585
})
8686

8787
it('should not resubscribe if name changes when not inside a <Form> (duh)', () => {

0 commit comments

Comments
 (0)