fix: component type

Author: adyfk

src/v2/components/FormGenerator.tsx

@@ -1,9 +1,10 @@
+/* eslint-disable react/no-array-index-key */
 /* eslint-disable react/jsx-no-useless-fragment */
 /* eslint-disable no-use-before-define */
 /* eslint-disable react/require-default-props */
 /* eslint-disable consistent-return */
 /* eslint-disable react/jsx-key */
-import { Suspense, useContext, useMemo } from "react";
+import { Fragment, Suspense, useContext, useMemo } from "react";
 import { ISchema, ISchemaCore } from "../types";
 import ComponentContext from "../contexts/ComponentContext";
 import { getSchemaName } from "../logic/createForm";
@@ -115,18 +116,21 @@ export function SchemaComponent({
           wrapper={wrapper}
           schema={schema}
         >
-          {({ value, container: Container }) => value?.map((data: any, index: number) => (
-            // eslint-disable-next-line react/no-array-index-key
-            <Container schema={schema} data={data} key={`${parent}-${identity}-${index}-${generatedKey}`}>
-              <FormGenerator
-                parent={`${identity}.${index}`}
-                schemas={updateSchemasAttributTitle(schema.childs, index)}
-                fallback={fallback}
-                fallbackComponentNotRegisterd={fallbackComponentNotRegisterd}
-                fallbackVariantNotRegistered={fallbackVariantNotRegistered}
-              />
-            </Container>
-          ))}
+          {({ value, container: Container }, indexContainer) => (
+            <Fragment key={indexContainer}>
+              {value?.map((data: any, indexValue: number) => (
+                <Container schema={schema} data={data} key={`${parent}-${identity}-${indexContainer}-${indexValue}-${generatedKey}`}>
+                  <FormGenerator
+                    parent={`${identity}.${indexValue}`}
+                    schemas={updateSchemasAttributTitle(schema.childs, indexValue)}
+                    fallback={fallback}
+                    fallbackComponentNotRegisterd={fallbackComponentNotRegisterd}
+                    fallbackVariantNotRegistered={fallbackVariantNotRegistered}
+                  />
+                </Container>
+              ))}
+            </Fragment>
+          )}
         </Component>
       </Suspense>
     );

src/v2/contexts/ComponentContext.tsx

@@ -1,51 +1,50 @@
-import { createContext } from "react";
+import { createContext, FC } from "react";
 import { ISchemaFieldCore } from "../types";
 
-export type IComponentContainer<T = any> = (
-  _propsContainer: {
-    data: T extends ISchemaFieldCore ?
-    NonNullable<T["initialValue"]>[0] extends object ?
-    NonNullable<T["initialValue"]>[0] : any
-    : any; children: any; schema: T
-  }) => any
+export type IComponentContainerProps<T = any> = {
+  data: T extends ISchemaFieldCore ?
+  NonNullable<T["initialValue"]>[0] extends object ?
+  NonNullable<T["initialValue"]>[0] : any
+  : any; children: any; schema: T
+}
 
-export type IComponent<T> = (_props: {
+export type IComponentProps<T> = {
   schema: T;
   wrapper?: any;
   schemas?: any[];
-}) => any
-export type IComponentGroup<T> = (_props: {
+};
+export type IComponentGroupProps<T> = {
   schema: T;
   wrapper?: any;
   children: any;
   schemas?: any[];
-}) => any
-export type IComponentArray<T> = (_props: {
+};
+export type IComponentArrayProps<T> = {
   schema: T;
   wrapper?: any;
   schemas?: any[];
-  children: (_propsChildren: {
+  children: FC<{
     value: any[],
-    container: IComponentContainer<T>
-  }) => any;
-}) => any
-export type IComponentObject<T> = (_props: {
+    container: FC<IComponentContainerProps<T>>
+  }>
+};
+export type IComponentObjectProps<T> = {
   schema: T;
   wrapper?: any;
   schemas?: any[];
-  children: (_propsChildren: {
+  children: FC<{
     value: Record<string, any>,
-    container: IComponentContainer<T>
-  }) => any;
-}) => any
+    container: FC<IComponentContainerProps<T>>
+  }>
+};
 // Record<IVariant, Record<string, Component<any>>>;
 // ;
 export type IComponents = {
-  FIELD: Record<string, IComponent<any>>;
-  VIEW: Record<string, IComponent<any>>;
-  GROUP: Record<string, IComponentGroup<any>>;
-  "FIELD-ARRAY": Record<string, IComponentArray<any>>;
-  "FIELD-OBJECT": Record<string, IComponentObject<any>>;
+  FIELD: Record<string, FC<IComponentProps<any>>>;
+  VIEW: Record<string, FC<IComponentProps<any>>>;
+  GROUP: Record<string, FC<IComponentGroupProps<any>>>;
+  "FIELD-ARRAY": Record<string, FC<IComponentArrayProps<any>>>;
+  "FIELD-OBJECT": Record<string, FC<IComponentObjectProps<any>>>;
 };
 
 export const ComponentContext = createContext<{ components: IComponents }>({