Merge pull request #6085 from marmelab/fix-form-props

Fix FormWithRedirect Props

Author: fzaninotto

packages/ra-core/src/form/FormWithRedirect.tsx

@@ -190,7 +190,7 @@ export type FormWithRedirectProps = FormWithRedirectOwnProps &
 
 export type FormWithRedirectRenderProps = Omit<
     FormViewProps,
-    'chilren' | 'render' | 'setRedirect'
+    'children' | 'render' | 'setRedirect'
 >;
 export type FormWithRedirectRender = (
     props: FormWithRedirectRenderProps

packages/ra-ui-materialui/src/form/SimpleFormView.tsx

@@ -1,13 +1,13 @@
 import * as React from 'react';
-import { Children, FC, ReactElement } from 'react';
+import { Children, ReactElement, ReactNode } from 'react';
 import classnames from 'classnames';
 import FormInput from './FormInput';
 import PropTypes from 'prop-types';
 import { FormWithRedirectRenderProps, MutationMode, Record } from 'ra-core';
 import Toolbar from './Toolbar';
 import CardContentInner from '../layout/CardContentInner';
 
-export const SimpleFormView: FC<SimpleFormViewProps> = ({
+export const SimpleFormView = ({
     basePath,
     children,
     className,
@@ -27,7 +27,7 @@ export const SimpleFormView: FC<SimpleFormViewProps> = ({
     undoable,
     variant,
     ...rest
-}) => (
+}: SimpleFormViewProps): ReactElement => (
     <form
         className={classnames('simple-form', className)}
         {...sanitizeRestProps(rest)}
@@ -98,6 +98,7 @@ SimpleFormView.defaultProps = {
 
 export interface SimpleFormViewProps extends FormWithRedirectRenderProps {
     basePath?: string;
+    children?: ReactNode;
     className?: string;
     component?: React.ComponentType<any>;
     margin?: 'none' | 'normal' | 'dense';

packages/ra-ui-materialui/src/form/TabbedFormView.tsx

@@ -5,6 +5,7 @@ import {
     cloneElement,
     isValidElement,
     ReactElement,
+    ReactNode,
     useState,
 } from 'react';
 import PropTypes from 'prop-types';
@@ -22,7 +23,7 @@ import Toolbar from './Toolbar';
 import TabbedFormTabs, { getTabFullPath } from './TabbedFormTabs';
 import { ClassesOverride } from '../types';
 
-export const TabbedFormView = (props: TabbedFormViewProps) => {
+export const TabbedFormView = (props: TabbedFormViewProps): ReactElement => {
     const {
         basePath,
         children,
@@ -183,6 +184,7 @@ TabbedFormView.defaultProps = {
 
 export interface TabbedFormViewProps extends FormWithRedirectRenderProps {
     basePath?: string;
+    children?: ReactNode;
     classes?: ClassesOverride<typeof useTabbedFormViewStyles>;
     className?: string;
     margin?: 'none' | 'normal' | 'dense';