refactor: replace lodash/merge with deepmerge (ant-design#6542)

guoyunhe · Feb 6, 2024 · 76e3583 · 76e3583
1 parent ca09a21
commit 76e3583
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -25,6 +25,7 @@
     "antd-mobile-v5-count": "^1.0.1",
     "classnames": "^2.3.2",
     "dayjs": "^1.11.7",
+    "deepmerge": "^4.3.1",
     "lodash": "^4.17.21",
     "nano-memoize": "^3.0.16",
     "rc-field-form": "~1.27.4",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/components/form/form.tsx b/src/components/form/form.tsx
@@ -12,7 +12,7 @@ import { defaultFormContext, FormContext, FormContextType } from './context'
 import { mergeProps } from '../../utils/with-default-props'
 import { Header } from './header'
 import { useConfig } from '../config-provider'
-import merge from 'lodash/merge'
+import merge from 'deepmerge'
 import { FormArray } from './form-array'
 import { traverseReactNode } from '../../utils/traverse-react-node'
 
@@ -78,9 +78,8 @@ export const Form = forwardRef<FormInstance, FormProps>((p, ref) => {
   const validateMessages = useMemo(
     () =>
       merge(
-        {},
         locale.Form.defaultValidateMessages,
-        formProps.validateMessages
+        formProps.validateMessages || {}
       ),
     [locale.Form.defaultValidateMessages, formProps.validateMessages]
   )