Fix inference types

marmelab · Feb 4, 2021 · b89ed15 · b89ed15
1 parent f2af29e
commit b89ed15
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/packages/ra-core/src/inference/index.ts b/packages/ra-core/src/inference/index.ts
@@ -2,5 +2,6 @@ import getElementsFromRecords from './getElementsFromRecords';
 import InferredElement from './InferredElement';
 
 export * from './inferTypeFromValues';
+export * from './types';
 
 export { getElementsFromRecords, InferredElement };
diff --git a/packages/ra-ui-materialui/src/detail/editFieldTypes.tsx b/packages/ra-ui-materialui/src/detail/editFieldTypes.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { ReactNode } from 'react';
+import { ReactNode, ReactElement } from 'react';
 import SimpleForm from '../form/SimpleForm';
 import SimpleFormIterator from '../form/SimpleFormIterator';
 import ArrayInput from '../input/ArrayInput';
@@ -12,9 +12,9 @@ import ReferenceArrayInput, {
 } from '../input/ReferenceArrayInput';
 import SelectInput from '../input/SelectInput';
 import TextInput from '../input/TextInput';
-import { InferredElement, InputProps } from 'ra-core';
+import { InferredElement, InferredTypeMap, InputProps } from 'ra-core';
 
-export default {
+const editFieldTypes: InferredTypeMap = {
     form: {
         component: SimpleForm,
         representation: (
@@ -74,7 +74,7 @@ ${children.map(child => `            ${child.getRepresentation()}`).join('\n')}
             }">${children.getRepresentation()}</ReferenceInput>`,
     },
     referenceChild: {
-        component: (props: InputProps) => (
+        component: (props: { children: ReactNode } & InputProps) => (
             <SelectInput optionText="id" {...props} />
         ), // eslint-disable-line react/display-name
         representation: () => `<SelectInput optionText="id" />`,
@@ -85,9 +85,9 @@ ${children.map(child => `            ${child.getRepresentation()}`).join('\n')}
             `<ReferenceArrayInput source="${props.source}" reference="${props.reference}"><TextInput source="id" /></ReferenceArrayInput>`,
     },
     referenceArrayChild: {
-        component: (props: InputProps) => (
-            <SelectInput optionText="id" {...props} />
-        ), // eslint-disable-line react/display-name
+        component: (
+            props: { children: ReactNode } & InputProps
+        ): ReactElement => <SelectInput optionText="id" {...props} />, // eslint-disable-line react/display-name
         representation: () => `<SelectInput optionText="id" />`,
     },
     richText: {
@@ -106,3 +106,5 @@ ${children.map(child => `            ${child.getRepresentation()}`).join('\n')}
             `<TextInput source="${props.source}" />`,
     },
 };
+
+export default editFieldTypes;
diff --git a/packages/ra-ui-materialui/src/detail/showFieldTypes.tsx b/packages/ra-ui-materialui/src/detail/showFieldTypes.tsx
@@ -12,9 +12,9 @@ import RichTextField from '../field/RichTextField';
 import SimpleShowLayout, { SimpleShowLayoutProps } from './SimpleShowLayout';
 import TextField from '../field/TextField';
 import UrlField from '../field/UrlField';
-import { InferredElement, InputProps } from 'ra-core';
+import { InferredElement, InferredTypeMap, InputProps } from 'ra-core';
 
-export default {
+const showFieldTypes: InferredTypeMap = {
     show: {
         component: (props: SimpleShowLayoutProps) => (
             <SimpleShowLayout {...props} />
@@ -71,7 +71,9 @@ ${children.map(child => `            ${child.getRepresentation()}`).join('\n')}
             `<ReferenceField source="${props.source}" reference="${props.reference}"><TextField source="id" /></ReferenceField>`,
     },
     referenceChild: {
-        component: (props: InputProps) => <TextField source="id" {...props} />, // eslint-disable-line react/display-name
+        component: (props: { children: ReactNode } & InputProps) => (
+            <TextField source="id" {...props} />
+        ), // eslint-disable-line react/display-name
         representation: () => `<TextField source="id" />`,
     },
     referenceArray: {
@@ -80,7 +82,9 @@ ${children.map(child => `            ${child.getRepresentation()}`).join('\n')}
             `<ReferenceArrayField source="${props.source}" reference="${props.reference}"><TextField source="id" /></ReferenceArrayField>`,
     },
     referenceArrayChild: {
-        component: (props: InputProps) => <TextField source="id" {...props} />, // eslint-disable-line react/display-name
+        component: (props: { children: ReactNode } & InputProps) => (
+            <TextField source="id" {...props} />
+        ), // eslint-disable-line react/display-name
         representation: () => `<TextField source="id" />`,
     },
     richText: {
@@ -99,3 +103,5 @@ ${children.map(child => `            ${child.getRepresentation()}`).join('\n')}
             `<UrlField source="${props.source}" />`,
     },
 };
+
+export default showFieldTypes;