fix(antd/next): fix useRecord return function (#3227)

alibaba · Jun 26, 2022 · 505db59 · 505db59
1 parent 8c9ab06
commit 505db59
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/packages/antd/src/array-base/index.tsx b/packages/antd/src/array-base/index.tsx
@@ -74,6 +74,8 @@ const ArrayBaseContext = createContext<IArrayBaseContext>(null)
 
 const ItemContext = createContext<IArrayBaseItemProps>(null)
 
+const takeRecord = (val: any) => (typeof val === 'function' ? val() : val)
+
 const useArray = () => {
   return useContext(ArrayBaseContext)
 }
@@ -85,7 +87,7 @@ const useIndex = (index?: number) => {
 
 const useRecord = (record?: number) => {
   const ctx = useContext(ItemContext)
-  return ctx ? ctx.record : record
+  return takeRecord(ctx ? ctx.record : record)
 }
 
 const getSchemaDefaultValue = (schema: Schema) => {
@@ -123,9 +125,7 @@ ArrayBase.Item = ({ children, ...props }) => {
     <ItemContext.Provider value={props}>
       <RecordScope
         getIndex={() => props.index}
-        getRecord={() =>
-          typeof props.record === 'function' ? props.record() : props.record
-        }
+        getRecord={() => takeRecord(props.record)}
       >
         {children}
       </RecordScope>

diff --git a/packages/next/src/array-base/index.tsx b/packages/next/src/array-base/index.tsx
@@ -70,6 +70,8 @@ const ArrayBaseContext = createContext<IArrayBaseContext>(null)
 
 const ItemContext = createContext<IArrayBaseItemProps>(null)
 
+const takeRecord = (val: any) => (typeof val === 'function' ? val() : val)
+
 const useArray = () => {
   return useContext(ArrayBaseContext)
 }
@@ -81,7 +83,7 @@ const useIndex = (index?: number) => {
 
 const useRecord = (record?: number) => {
   const ctx = useContext(ItemContext)
-  return ctx ? ctx.record : record
+  return takeRecord(ctx ? ctx.record : record)
 }
 
 const getSchemaDefaultValue = (schema: Schema) => {
@@ -119,9 +121,7 @@ ArrayBase.Item = ({ children, ...props }) => {
     <ItemContext.Provider value={props}>
       <RecordScope
         getIndex={() => props.index}
-        getRecord={() =>
-          typeof props.record === 'function' ? props.record() : props.record
-        }
+        getRecord={() => takeRecord(props.record)}
       >
         {children}
       </RecordScope>