Merge pull request #6253 from marmelab/typescript-selectfield-typography

[TypeScript] Fix SelectField doesn't accept Typography props
marmelab · May 7, 2021 · c5afe12 · c5afe12
2 parents c498478 + 6cc5aba
commit c5afe12
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/examples/crm/src/companies/CompanyCard.tsx b/examples/crm/src/companies/CompanyCard.tsx
@@ -62,7 +62,6 @@ export const CompanyCard = ({ record }: { record: Company }) => {
                             {record.name}
                         </Typography>
                         <SelectField
-                            // @ts-ignore
                             color="textSecondary"
                             source="sector"
                             choices={sectors}

diff --git a/packages/ra-ui-materialui/src/field/SelectField.tsx b/packages/ra-ui-materialui/src/field/SelectField.tsx
@@ -3,7 +3,7 @@ import { FC, memo } from 'react';
 import PropTypes from 'prop-types';
 import get from 'lodash/get';
 import { ChoicesProps, useChoices, useRecordContext } from 'ra-core';
-import Typography from '@material-ui/core/Typography';
+import { Typography, TypographyProps } from '@material-ui/core';
 
 import sanitizeFieldRestProps from './sanitizeFieldRestProps';
 import { PublicFieldProps, InjectedFieldProps, fieldPropTypes } from './types';
@@ -144,7 +144,8 @@ SelectField.propTypes = {
 export interface SelectFieldProps
     extends ChoicesProps,
         PublicFieldProps,
-        InjectedFieldProps {}
+        InjectedFieldProps,
+        TypographyProps {}
 
 SelectField.displayName = 'SelectField';