Skip to content

Commit

Permalink
Updated to FF@4.15.0 to get typed FieldState
Browse files Browse the repository at this point in the history
  • Loading branch information
erikras committed Jun 14, 2019
1 parent a0fa455 commit ab2e970
Show file tree
Hide file tree
Showing 9 changed files with 181 additions and 156 deletions.
285 changes: 155 additions & 130 deletions package-lock.json

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,50 +45,50 @@
"@babel/preset-env": "^7.4.5",
"@babel/preset-flow": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"@types/react": "^16.8.18",
"@testing-library/react": "^8.0.1",
"@types/react": "^16.8.20",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^10.0.1",
"babel-jest": "^24.8.0",
"bundlesize": "^0.17.2",
"doctoc": "^1.4.0",
"dtslint": "^0.7.6",
"dtslint": "^0.8.0",
"eslint": "^5.16.0",
"eslint-config-react-app": "^4.0.0",
"eslint-plugin-babel": "^5.2.1",
"eslint-plugin-flowtype": "^3.9.1",
"eslint-plugin-flowtype": "^3.10.3",
"eslint-plugin-import": "^2.17.3",
"eslint-plugin-jsx-a11y": "^6.2.1",
"eslint-plugin-react": "^7.13.0",
"eslint-plugin-react-hooks": "^1.6.0",
"fast-deep-equal": "^2.0.1",
"final-form": "^4.14.0",
"final-form": "^4.15.0",
"flow-bin": "^0.98.1",
"glow": "^1.2.2",
"husky": "^2.3.0",
"husky": "^2.4.1",
"jest": "^24.8.0",
"jest-dom": "^3.4.0",
"jest-dom": "^3.5.0",
"jest-mock-console": "^1.0.0",
"lint-staged": "^8.1.7",
"lint-staged": "^8.2.1",
"nps": "^5.9.4",
"nps-utils": "^1.7.0",
"opencollective": "^1.0.3",
"prettier": "^1.17.0",
"prettier": "^1.18.2",
"prettier-eslint-cli": "^4.7.1",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-testing-library": "^7.0.1",
"rollup": "^1.12.4",
"rollup": "^1.15.4",
"rollup-plugin-babel": "^4.3.2",
"rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-node-resolve": "^5.0.0",
"rollup-plugin-node-resolve": "^5.0.2",
"rollup-plugin-replace": "^2.2.0",
"rollup-plugin-uglify": "^6.0.2",
"tar": "^4.4.8",
"tslint": "^5.16.0",
"typescript": "^3.4.5"
"tar": "^4.4.10",
"tslint": "^5.17.0",
"typescript": "^3.5.2"
},
"peerDependencies": {
"final-form": "^4.14.0",
"final-form": "^4.15.0",
"react": "^16.8.0"
},
"lint-staged": {
Expand Down Expand Up @@ -123,6 +123,6 @@
},
"dependencies": {
"@babel/runtime": "^7.4.5",
"ts-essentials": "^2.0.2"
"ts-essentials": "^2.0.8"
}
}
2 changes: 1 addition & 1 deletion src/Field.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import { render, fireEvent, cleanup, act } from 'react-testing-library'
import { render, fireEvent, cleanup, act } from '@testing-library/react'
import 'jest-dom/extend-expect'
import { ErrorBoundary, Toggle, wrapWith } from './testUtils'
import Form from './ReactFinalForm'
Expand Down
2 changes: 1 addition & 1 deletion src/FormSpy.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import { render, fireEvent, cleanup } from 'react-testing-library'
import { render, fireEvent, cleanup } from '@testing-library/react'
import 'jest-dom/extend-expect'
import { ErrorBoundary, Toggle, wrapWith } from './testUtils'
import Form from './ReactFinalForm'
Expand Down
2 changes: 1 addition & 1 deletion src/ReactFinalForm.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import { render, fireEvent, cleanup } from 'react-testing-library'
import { render, fireEvent, cleanup } from '@testing-library/react'
import 'jest-dom/extend-expect'
import deepEqual from 'fast-deep-equal'
import { ErrorBoundary, Toggle, wrapWith } from './testUtils'
Expand Down
2 changes: 1 addition & 1 deletion src/useField.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import { render, fireEvent, cleanup } from 'react-testing-library'
import { render, fireEvent, cleanup } from '@testing-library/react'
import 'jest-dom/extend-expect'
import { ErrorBoundary } from './testUtils'
import Form from './ReactFinalForm'
Expand Down
2 changes: 1 addition & 1 deletion src/useForm.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import { render, cleanup } from 'react-testing-library'
import { render, cleanup } from '@testing-library/react'
import 'jest-dom/extend-expect'
import { ErrorBoundary } from './testUtils'
import Form from './ReactFinalForm'
Expand Down
2 changes: 1 addition & 1 deletion src/useFormState.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import { render, cleanup } from 'react-testing-library'
import { render, cleanup } from '@testing-library/react'
import { ErrorBoundary } from './testUtils'
import useFormState from './useFormState'

Expand Down
8 changes: 4 additions & 4 deletions typescript/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ export interface ReactContext<FormValues> {
reactFinalForm: FormApi<FormValues>;
}

export type FieldMetaState = Omit<
FieldState,
export type FieldMetaState<FieldValue> = Omit<
FieldState<FieldValue>,
'blur' | 'change' | 'focus' | 'name' | 'value'
>;

Expand All @@ -39,7 +39,7 @@ interface AnyObject {

export interface FieldRenderProps<FieldValue, T extends HTMLElement> {
input: FieldInputProps<FieldValue, T>;
meta: FieldMetaState;
meta: FieldMetaState<FieldValue>;
}

export interface FormRenderProps<FormValues = AnyObject>
Expand Down Expand Up @@ -83,7 +83,7 @@ export interface UseFieldConfig<FieldValue> {
parse?: (value: any, name: string) => FieldValue;
subscription?: FieldSubscription;
type?: string;
validate?: FieldValidator;
validate?: FieldValidator<FieldValue>;
validateFields?: string[];
value?: FieldValue;
}
Expand Down

0 comments on commit ab2e970

Please sign in to comment.