Skip to content

Commit

Permalink
馃悶 fix useFieldArray action type incorrectness (#8660)
Browse files Browse the repository at this point in the history 
* fix field array type incorrectness

* update tests cases and api extrator

* update tests for insert api

* fix type error
  • Loading branch information
@bluebill1049
bluebill1049 committed Jul 13, 2022
1 parent f27824d commit ab2ac78
Show file tree
Hide file tree
Showing 5 changed files with 136 additions and 31 deletions.
8 changes: 4 additions & 4 deletions reports/api-extractor.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -504,16 +504,16 @@ export type UseControllerReturn<TFieldValues extends FieldValues = FieldValues,
export function useFieldArray<TFieldValues extends FieldValues = FieldValues, TFieldArrayName extends FieldArrayPath<TFieldValues> = FieldArrayPath<TFieldValues>, TKeyName extends string = 'id'>(props: UseFieldArrayProps<TFieldValues, TFieldArrayName, TKeyName>): UseFieldArrayReturn<TFieldValues, TFieldArrayName, TKeyName>;

// @public
export type UseFieldArrayAppend<TFieldValues extends FieldValues, TFieldArrayName extends FieldArrayPath<TFieldValues> = FieldArrayPath<TFieldValues>> = (value: Partial<FieldArray<TFieldValues, TFieldArrayName>> | Partial<FieldArray<TFieldValues, TFieldArrayName>>[], options?: FieldArrayMethodProps) => void;
export type UseFieldArrayAppend<TFieldValues extends FieldValues, TFieldArrayName extends FieldArrayPath<TFieldValues> = FieldArrayPath<TFieldValues>> = (value: FieldArray<TFieldValues, TFieldArrayName> | FieldArray<TFieldValues, TFieldArrayName>[], options?: FieldArrayMethodProps) => void;

// @public
export type UseFieldArrayInsert<TFieldValues extends FieldValues, TFieldArrayName extends FieldArrayPath<TFieldValues> = FieldArrayPath<TFieldValues>> = (index: number, value: Partial<FieldArray<TFieldValues, TFieldArrayName>> | Partial<FieldArray<TFieldValues, TFieldArrayName>>[], options?: FieldArrayMethodProps) => void;
export type UseFieldArrayInsert<TFieldValues extends FieldValues, TFieldArrayName extends FieldArrayPath<TFieldValues> = FieldArrayPath<TFieldValues>> = (index: number, value: FieldArray<TFieldValues, TFieldArrayName> | FieldArray<TFieldValues, TFieldArrayName>[], options?: FieldArrayMethodProps) => void;

// @public
export type UseFieldArrayMove = (indexA: number, indexB: number) => void;

// @public
export type UseFieldArrayPrepend<TFieldValues extends FieldValues, TFieldArrayName extends FieldArrayPath<TFieldValues> = FieldArrayPath<TFieldValues>> = (value: Partial<FieldArray<TFieldValues, TFieldArrayName>> | Partial<FieldArray<TFieldValues, TFieldArrayName>>[], options?: FieldArrayMethodProps) => void;
export type UseFieldArrayPrepend<TFieldValues extends FieldValues, TFieldArrayName extends FieldArrayPath<TFieldValues> = FieldArrayPath<TFieldValues>> = (value: FieldArray<TFieldValues, TFieldArrayName> | FieldArray<TFieldValues, TFieldArrayName>[], options?: FieldArrayMethodProps) => void;

// @public (undocumented)
export type UseFieldArrayProps<TFieldValues extends FieldValues = FieldValues, TFieldArrayName extends FieldArrayPath<TFieldValues> = FieldArrayPath<TFieldValues>, TKeyName extends string = 'id'> = {
Expand All @@ -528,7 +528,7 @@ export type UseFieldArrayProps<TFieldValues extends FieldValues = FieldValues, T
export type UseFieldArrayRemove = (index?: number | number[]) => void;

// @public
export type UseFieldArrayReplace<TFieldValues extends FieldValues, TFieldArrayName extends FieldArrayPath<TFieldValues> = FieldArrayPath<TFieldValues>> = (value: Partial<FieldArray<TFieldValues, TFieldArrayName>> | Partial<FieldArray<TFieldValues, TFieldArrayName>>[]) => void;
export type UseFieldArrayReplace<TFieldValues extends FieldValues, TFieldArrayName extends FieldArrayPath<TFieldValues> = FieldArrayPath<TFieldValues>> = (value: FieldArray<TFieldValues, TFieldArrayName> | FieldArray<TFieldValues, TFieldArrayName>[]) => void;

// @public (undocumented)
export type UseFieldArrayReturn<TFieldValues extends FieldValues = FieldValues, TFieldArrayName extends FieldArrayPath<TFieldValues> = FieldArrayPath<TFieldValues>, TKeyName extends string = 'id'> = {
Expand Down
42 changes: 42 additions & 0 deletions src/__tests__/__snapshots__/useFieldArray.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,77 +109,93 @@ Array [
Object {
"test": "append",
"test1": "append",
"test2": Array [],
},
],
Array [
Object {
"test": "append",
"test1": "append",
"test2": Array [],
},
],
Array [
Object {
"test": "prepend",
"test1": "prepend",
"test2": Array [],
},
Object {
"test": "append",
"test1": "append",
"test2": Array [],
},
],
Array [
Object {
"test": "prepend",
"test1": "prepend",
"test2": Array [],
},
Object {
"test": "append",
"test1": "append",
"test2": Array [],
},
],
Array [
Object {
"test": "prepend",
"test1": "prepend",
"test2": Array [],
},
Object {
"test": "insert",
"test1": "insert",
"test2": Array [],
},
Object {
"test": "append",
"test1": "append",
"test2": Array [],
},
],
Array [
Object {
"test": "prepend",
"test1": "prepend",
"test2": Array [],
},
Object {
"test": "insert",
"test1": "insert",
"test2": Array [],
},
Object {
"test": "append",
"test1": "append",
"test2": Array [],
},
],
Array [
Object {
"test": "prepend",
"test1": "prepend",
"test2": Array [],
},
Object {
"test": "insert",
"test1": "insert",
"test2": Array [],
},
Object {
"test": "append",
"test1": "append",
"test2": Array [],
},
Object {
"test": "append",
"test1": "",
"test2": Array [
Object {
"test": "test",
Expand All @@ -191,17 +207,21 @@ Array [
Object {
"test": "prepend",
"test1": "prepend",
"test2": Array [],
},
Object {
"test": "insert",
"test1": "insert",
"test2": Array [],
},
Object {
"test": "append",
"test1": "append",
"test2": Array [],
},
Object {
"test": "append",
"test1": "",
"test2": Array [
Object {
"test": "test",
Expand All @@ -212,6 +232,7 @@ Array [
Array [
Object {
"test": "prepend",
"test1": "",
"test2": Array [
Object {
"test": "test",
Expand All @@ -221,17 +242,21 @@ Array [
Object {
"test": "prepend",
"test1": "prepend",
"test2": Array [],
},
Object {
"test": "insert",
"test1": "insert",
"test2": Array [],
},
Object {
"test": "append",
"test1": "append",
"test2": Array [],
},
Object {
"test": "append",
"test1": "",
"test2": Array [
Object {
"test": "test",
Expand All @@ -242,6 +267,7 @@ Array [
Array [
Object {
"test": "prepend",
"test1": "",
"test2": Array [
Object {
"test": "test",
Expand All @@ -251,17 +277,21 @@ Array [
Object {
"test": "prepend",
"test1": "prepend",
"test2": Array [],
},
Object {
"test": "insert",
"test1": "insert",
"test2": Array [],
},
Object {
"test": "append",
"test1": "append",
"test2": Array [],
},
Object {
"test": "append",
"test1": "",
"test2": Array [
Object {
"test": "test",
Expand All @@ -272,6 +302,7 @@ Array [
Array [
Object {
"test": "prepend",
"test1": "",
"test2": Array [
Object {
"test": "test",
Expand All @@ -280,6 +311,7 @@ Array [
},
Object {
"test": "insert",
"test1": "",
"test2": Array [
Object {
"test": "test",
Expand All @@ -289,17 +321,21 @@ Array [
Object {
"test": "prepend",
"test1": "prepend",
"test2": Array [],
},
Object {
"test": "insert",
"test1": "insert",
"test2": Array [],
},
Object {
"test": "append",
"test1": "append",
"test2": Array [],
},
Object {
"test": "append",
"test1": "",
"test2": Array [
Object {
"test": "test",
Expand All @@ -310,6 +346,7 @@ Array [
Array [
Object {
"test": "prepend",
"test1": "",
"test2": Array [
Object {
"test": "test",
Expand All @@ -318,6 +355,7 @@ Array [
},
Object {
"test": "insert",
"test1": "",
"test2": Array [
Object {
"test": "test",
Expand All @@ -327,17 +365,21 @@ Array [
Object {
"test": "prepend",
"test1": "prepend",
"test2": Array [],
},
Object {
"test": "insert",
"test1": "insert",
"test2": Array [],
},
Object {
"test": "append",
"test1": "append",
"test2": Array [],
},
Object {
"test": "append",
"test1": "",
"test2": Array [
Object {
"test": "test",
Expand Down

0 comments on commit ab2ac78

Please sign in to comment.