File tree Expand file tree Collapse file tree 3 files changed +5
-5
lines changed
Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ export { default as useMergedState } from './hooks/useMergedState';
33export { default as useControlledState } from './hooks/useControlledState' ;
44export { supportNodeRef , supportRef , useComposeRef } from './ref' ;
55export { default as get } from './utils/get' ;
6- export { default as set , merge } from './utils/set' ;
6+ export { default as set , merge , mergeWith } from './utils/set' ;
77export { default as warning , noteOnce } from './warning' ;
88export { default as omit } from './omit' ;
99export { default as toArray } from './Children/toArray' ;
Original file line number Diff line number Diff line change @@ -76,7 +76,7 @@ export type MergeFn = (current: any, next: any) => any;
7676 * It will return empty [] by default.
7777 * So when match array, it will auto be override with next array in sources.
7878 */
79- export function customMerge < T extends object > (
79+ export function mergeWith < T extends object > (
8080 sources : T [ ] ,
8181 config : {
8282 prepareArray ?: MergeFn ;
@@ -130,5 +130,5 @@ export function customMerge<T extends object>(
130130 * Arrays will be replaced by default.
131131 */
132132export function merge < T extends object > ( ...sources : T [ ] ) {
133- return customMerge ( sources ) ;
133+ return mergeWith ( sources ) ;
134134}
Original file line number Diff line number Diff line change 11import pickAttrs from '../src/pickAttrs' ;
22import get from '../src/utils/get' ;
3- import set , { customMerge , merge } from '../src/utils/set' ;
3+ import set , { mergeWith , merge } from '../src/utils/set' ;
44
55describe ( 'utils' , ( ) => {
66 it ( 'get' , ( ) => {
@@ -270,7 +270,7 @@ describe('utils', () => {
270270 ] ,
271271 } ;
272272
273- const merged = customMerge < any > ( [ src , tgt ] , {
273+ const merged = mergeWith < any > ( [ src , tgt ] , {
274274 prepareArray : current => {
275275 return [ ...( current || [ ] ) ] ;
276276 } ,
You can’t perform that action at this time.
0 commit comments