Skip to content
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: 49 additions & 13 deletions src/rhf/useFieldArray.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useMemo } from 'react';
import { useCallback, useMemo } from 'react';
import {
type FieldArray,
type FieldArrayPath,
Expand Down Expand Up @@ -29,58 +29,94 @@ export function useFieldArray<
TKeyName extends string = 'id',
>(props: UseFieldArrayProps<TFieldValues, TFieldArrayName, TKeyName>): UseFieldArrayReturn<TFieldValues, TFieldArrayName, TKeyName> {
const original = useFieldArrayOriginal(props);
const newFields = useMemo(() => {

const fields = useMemo(() => {
if (!props.getTransformer) {
return original.fields;
}

return original.fields.map(props.getTransformer);
}, [original.fields, props.getTransformer]);

return {
fields: newFields,
move: original.move,
remove: original.remove,
swap: original.swap,
prepend: (value, options) => {
const move = useCallback(original.move, [original.move]);

const remove = useCallback(original.remove, [original.remove]);

const swap = useCallback(original.swap, [original.swap]);

const prepend = useCallback<typeof original.prepend>(
(value, options) => {
if (!props.setTransformer) {
return original.prepend(value, options);
}

const newValue = Array.isArray(value) ? value.map(props.setTransformer) : props.setTransformer(value);
original.prepend(newValue, options);
},
append: (value, options) => {
[original.prepend, props.setTransformer],
);

const append = useCallback<typeof original.append>(
(value, options) => {
if (!props.setTransformer) {
return original.append(value, options);
}

const newValue = Array.isArray(value) ? value.map(props.setTransformer) : props.setTransformer(value);
original.append(newValue, options);
},
insert: (index, value, options) => {
[original.append, props.setTransformer],
);

const insert = useCallback<typeof original.insert>(
(index, value, options) => {
if (!props.setTransformer) {
return original.insert(index, value, options);
}

const newValue = Array.isArray(value) ? value.map(props.setTransformer) : props.setTransformer(value);
original.insert(index, newValue, options);
},
update: (index, value) => {
[original.insert, props.setTransformer],
);

const update = useCallback<typeof original.update>(
(index, value) => {
if (!props.setTransformer) {
return original.update(index, value);
}

const newValue = props.setTransformer(value);
original.update(index, newValue);
},
replace: (value) => {
[original.update, props.setTransformer],
);

const replace = useCallback<typeof original.replace>(
(value) => {
if (!props.setTransformer) {
return original.replace(value);
}

const newValue = props.setTransformer(value);
original.replace(newValue);
},
};
[original.replace, props.setTransformer],
);

const fieldArray = useMemo<UseFieldArrayReturn<TFieldValues, TFieldArrayName, TKeyName>>(() => {
return {
fields,
move,
remove,
swap,
prepend,
append,
insert,
update,
replace,
};
}, [fields, move, remove, swap, prepend, append, insert, update, replace]);

return fieldArray;
}
Loading