From adb2820b834bbd6dec9679aab932ed5938dd9042 Mon Sep 17 00:00:00 2001 From: asvarcas Date: Mon, 6 Jan 2020 14:19:31 -0300 Subject: [PATCH 01/14] Remove components named exports in favor of the default ones. --- packages/ra-core/src/form/FormField.tsx | 2 +- packages/ra-ui-materialui/src/field/FileField.tsx | 2 +- packages/ra-ui-materialui/src/field/ImageField.tsx | 2 +- packages/ra-ui-materialui/src/field/ReferenceArrayField.js | 2 +- packages/ra-ui-materialui/src/input/ArrayInput.tsx | 2 +- packages/ra-ui-materialui/src/input/DateInput.tsx | 2 +- packages/ra-ui-materialui/src/input/DateTimeInput.tsx | 2 +- packages/ra-ui-materialui/src/input/Labeled.tsx | 2 +- packages/ra-ui-materialui/src/input/ReferenceInput.tsx | 2 +- packages/ra-ui-materialui/src/input/TextInput.tsx | 2 +- packages/ra-ui-materialui/src/layout/LoadingIndicator.js | 6 +----- packages/ra-ui-materialui/src/list/DatagridCell.js | 2 +- 12 files changed, 12 insertions(+), 16 deletions(-) diff --git a/packages/ra-core/src/form/FormField.tsx b/packages/ra-core/src/form/FormField.tsx index f424a8b17bc..fe0b3f25ed3 100644 --- a/packages/ra-core/src/form/FormField.tsx +++ b/packages/ra-core/src/form/FormField.tsx @@ -24,7 +24,7 @@ interface Props validate?: Validator | Validator[]; } -export const FormField: FunctionComponent = ({ +const FormField: FunctionComponent = ({ id, input, validate, diff --git a/packages/ra-ui-materialui/src/field/FileField.tsx b/packages/ra-ui-materialui/src/field/FileField.tsx index dde47b6a636..0e37eb3a1b0 100644 --- a/packages/ra-ui-materialui/src/field/FileField.tsx +++ b/packages/ra-ui-materialui/src/field/FileField.tsx @@ -21,7 +21,7 @@ interface Props extends FieldProps { classes?: object; } -export const FileField: FunctionComponent = ({ +const FileField: FunctionComponent = ({ className, classes: classesOverride, record, diff --git a/packages/ra-ui-materialui/src/field/ImageField.tsx b/packages/ra-ui-materialui/src/field/ImageField.tsx index 4b93b8c9f6c..cbac9cb42af 100644 --- a/packages/ra-ui-materialui/src/field/ImageField.tsx +++ b/packages/ra-ui-materialui/src/field/ImageField.tsx @@ -27,7 +27,7 @@ interface Props extends FieldProps { classes?: object; } -export const ImageField: FunctionComponent = ({ +const ImageField: FunctionComponent = ({ className, classes: classesOverride, record, diff --git a/packages/ra-ui-materialui/src/field/ReferenceArrayField.js b/packages/ra-ui-materialui/src/field/ReferenceArrayField.js index b08317912e5..85cc19b2ad4 100644 --- a/packages/ra-ui-materialui/src/field/ReferenceArrayField.js +++ b/packages/ra-ui-materialui/src/field/ReferenceArrayField.js @@ -37,7 +37,7 @@ import { fieldPropTypes } from './types'; * * */ -export const ReferenceArrayField = ({ children, ...props }) => { +const ReferenceArrayField = ({ children, ...props }) => { if (React.Children.count(children) !== 1) { throw new Error( ' only accepts a single child (like )' diff --git a/packages/ra-ui-materialui/src/input/ArrayInput.tsx b/packages/ra-ui-materialui/src/input/ArrayInput.tsx index 97e31bd9501..7dee08fffe7 100644 --- a/packages/ra-ui-materialui/src/input/ArrayInput.tsx +++ b/packages/ra-ui-materialui/src/input/ArrayInput.tsx @@ -47,7 +47,7 @@ import sanitizeRestProps from './sanitizeRestProps'; * * @see https://github.com/final-form/react-final-form-arrays */ -export const ArrayInput = ({ +const ArrayInput = ({ className, defaultValue, label, diff --git a/packages/ra-ui-materialui/src/input/DateInput.tsx b/packages/ra-ui-materialui/src/input/DateInput.tsx index be1ba1d2091..39179377235 100644 --- a/packages/ra-ui-materialui/src/input/DateInput.tsx +++ b/packages/ra-ui-materialui/src/input/DateInput.tsx @@ -42,7 +42,7 @@ const getStringFromDate = (value: string | Date) => { return convertDateToString(new Date(value)); }; -export const DateInput: FunctionComponent< +const DateInput: FunctionComponent< InputProps & Omit > = ({ format = getStringFromDate, diff --git a/packages/ra-ui-materialui/src/input/DateTimeInput.tsx b/packages/ra-ui-materialui/src/input/DateTimeInput.tsx index bd4c17b782c..72dcb141351 100644 --- a/packages/ra-ui-materialui/src/input/DateTimeInput.tsx +++ b/packages/ra-ui-materialui/src/input/DateTimeInput.tsx @@ -63,7 +63,7 @@ const parseDateTime = (value: string) => new Date(value); /** * Input component for entering a date and a time with timezone, using the browser locale */ -export const DateTimeInput: FunctionComponent< +const DateTimeInput: FunctionComponent< InputProps & Omit > = ({ format = formatDateTime, diff --git a/packages/ra-ui-materialui/src/input/Labeled.tsx b/packages/ra-ui-materialui/src/input/Labeled.tsx index 80b0cf7926f..5105cdcae58 100644 --- a/packages/ra-ui-materialui/src/input/Labeled.tsx +++ b/packages/ra-ui-materialui/src/input/Labeled.tsx @@ -55,7 +55,7 @@ interface Props { * * */ -export const Labeled: FunctionComponent = ({ +const Labeled: FunctionComponent = ({ children, className, classes: classesOverride, diff --git a/packages/ra-ui-materialui/src/input/ReferenceInput.tsx b/packages/ra-ui-materialui/src/input/ReferenceInput.tsx index 4da477eb06a..41fb0c78b01 100644 --- a/packages/ra-ui-materialui/src/input/ReferenceInput.tsx +++ b/packages/ra-ui-materialui/src/input/ReferenceInput.tsx @@ -109,7 +109,7 @@ interface Props { * * */ -export const ReferenceInput: FunctionComponent = ({ +const ReferenceInput: FunctionComponent = ({ format, onBlur, onChange, diff --git a/packages/ra-ui-materialui/src/input/TextInput.tsx b/packages/ra-ui-materialui/src/input/TextInput.tsx index 00ff175e1c0..d3476a7be36 100644 --- a/packages/ra-ui-materialui/src/input/TextInput.tsx +++ b/packages/ra-ui-materialui/src/input/TextInput.tsx @@ -24,7 +24,7 @@ export type TextInputProps = InputProps & * * The object passed as `options` props is passed to the component */ -export const TextInput: FunctionComponent = ({ +const TextInput: FunctionComponent = ({ label, format, helperText, diff --git a/packages/ra-ui-materialui/src/layout/LoadingIndicator.js b/packages/ra-ui-materialui/src/layout/LoadingIndicator.js index dd505842858..b93588d9382 100644 --- a/packages/ra-ui-materialui/src/layout/LoadingIndicator.js +++ b/packages/ra-ui-materialui/src/layout/LoadingIndicator.js @@ -16,11 +16,7 @@ const useStyles = makeStyles( { name: 'RaLoadingIndicator' } ); -export const LoadingIndicator = ({ - classes: classesOverride, - className, - ...rest -}) => { +const LoadingIndicator = ({ classes: classesOverride, className, ...rest }) => { const loading = useSelector(state => state.admin.loading > 0); const classes = useStyles({ classes: classesOverride }); return loading ? ( diff --git a/packages/ra-ui-materialui/src/list/DatagridCell.js b/packages/ra-ui-materialui/src/list/DatagridCell.js index 6c2aa1ee97e..9d4c3e4240b 100644 --- a/packages/ra-ui-materialui/src/list/DatagridCell.js +++ b/packages/ra-ui-materialui/src/list/DatagridCell.js @@ -15,7 +15,7 @@ const sanitizeRestProps = ({ ...rest }) => rest; -export const DatagridCell = ({ +const DatagridCell = ({ className, field, record, From 4789fa3b8c61cef95a369edac4110f7fd77d535d Mon Sep 17 00:00:00 2001 From: asvarcas Date: Mon, 6 Jan 2020 14:28:20 -0300 Subject: [PATCH 02/14] SimpleShowLayout exported twice. --- packages/ra-ui-materialui/src/detail/SimpleShowLayout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ra-ui-materialui/src/detail/SimpleShowLayout.js b/packages/ra-ui-materialui/src/detail/SimpleShowLayout.js index fd35c7f27d3..1aee01dd0cd 100644 --- a/packages/ra-ui-materialui/src/detail/SimpleShowLayout.js +++ b/packages/ra-ui-materialui/src/detail/SimpleShowLayout.js @@ -49,7 +49,7 @@ const sanitizeRestProps = ({ * ); * export default App; */ -export const SimpleShowLayout = ({ +const SimpleShowLayout = ({ basePath, className, children, From f5152f672a88598cc607f53c2732be0042fbae79 Mon Sep 17 00:00:00 2001 From: asvarcas Date: Mon, 6 Jan 2020 14:34:25 -0300 Subject: [PATCH 03/14] Test corrected. --- packages/ra-ui-materialui/src/list/DatagridCell.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ra-ui-materialui/src/list/DatagridCell.spec.js b/packages/ra-ui-materialui/src/list/DatagridCell.spec.js index 76e81b049f5..55be959ff63 100644 --- a/packages/ra-ui-materialui/src/list/DatagridCell.spec.js +++ b/packages/ra-ui-materialui/src/list/DatagridCell.spec.js @@ -3,7 +3,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { shallow } from 'enzyme'; -import { DatagridCell } from './DatagridCell'; +import DatagridCell from './DatagridCell'; describe('', () => { const Field = () =>
; From 3f8f7b6bc802860fe228932d7b0f08107b0603fb Mon Sep 17 00:00:00 2001 From: asvarcas Date: Mon, 6 Jan 2020 14:54:39 -0300 Subject: [PATCH 04/14] More components exported twice. --- packages/ra-ui-materialui/src/button/CloneButton.tsx | 2 +- packages/ra-ui-materialui/src/field/ArrayField.tsx | 5 +---- packages/ra-ui-materialui/src/field/BooleanField.tsx | 2 +- packages/ra-ui-materialui/src/field/ChipField.tsx | 2 +- packages/ra-ui-materialui/src/field/DateField.tsx | 2 +- packages/ra-ui-materialui/src/field/NumberField.tsx | 2 +- packages/ra-ui-materialui/src/field/SelectField.tsx | 2 +- .../ra-ui-materialui/src/input/RadioButtonGroupInput.tsx | 2 +- .../ra-ui-materialui/src/input/ReferenceArrayInput.js | 2 +- packages/ra-ui-materialui/src/layout/Responsive.js | 9 +-------- packages/ra-ui-materialui/src/list/DatagridHeaderCell.js | 2 +- packages/ra-ui-materialui/src/list/FilterForm.js | 2 +- 12 files changed, 12 insertions(+), 22 deletions(-) diff --git a/packages/ra-ui-materialui/src/button/CloneButton.tsx b/packages/ra-ui-materialui/src/button/CloneButton.tsx index 89427b90c85..e0ad3ff298b 100644 --- a/packages/ra-ui-materialui/src/button/CloneButton.tsx +++ b/packages/ra-ui-materialui/src/button/CloneButton.tsx @@ -8,7 +8,7 @@ import { Record } from 'ra-core'; import Button, { ButtonProps } from './Button'; -export const CloneButton: FC = ({ +const CloneButton: FC = ({ basePath = '', label = 'ra.action.clone', record, diff --git a/packages/ra-ui-materialui/src/field/ArrayField.tsx b/packages/ra-ui-materialui/src/field/ArrayField.tsx index 3acfedb937f..16093a2e62e 100644 --- a/packages/ra-ui-materialui/src/field/ArrayField.tsx +++ b/packages/ra-ui-materialui/src/field/ArrayField.tsx @@ -78,10 +78,7 @@ const initialState = { * ) * TagsField.defaultProps = { addLabel: true }; */ -export class ArrayField extends Component< - FieldProps & InjectedFieldProps, - State -> { +class ArrayField extends Component { constructor(props: FieldProps & InjectedFieldProps) { super(props); this.state = props.record diff --git a/packages/ra-ui-materialui/src/field/BooleanField.tsx b/packages/ra-ui-materialui/src/field/BooleanField.tsx index 44a622554ba..f6366893567 100644 --- a/packages/ra-ui-materialui/src/field/BooleanField.tsx +++ b/packages/ra-ui-materialui/src/field/BooleanField.tsx @@ -17,7 +17,7 @@ interface Props extends FieldProps { valueLabelFalse?: string; } -export const BooleanField: FunctionComponent< +const BooleanField: FunctionComponent< Props & InjectedFieldProps & TypographyProps > = ({ className, diff --git a/packages/ra-ui-materialui/src/field/ChipField.tsx b/packages/ra-ui-materialui/src/field/ChipField.tsx index a648aadc4ab..fbdf777087a 100644 --- a/packages/ra-ui-materialui/src/field/ChipField.tsx +++ b/packages/ra-ui-materialui/src/field/ChipField.tsx @@ -16,7 +16,7 @@ const useStyles = makeStyles( { name: 'RaChipField' } ); -export const ChipField: FunctionComponent< +const ChipField: FunctionComponent< FieldProps & InjectedFieldProps & ChipProps > = ({ className, classes: classesOverride, source, record = {}, ...rest }) => { const classes = useStyles({ classes: classesOverride }); diff --git a/packages/ra-ui-materialui/src/field/DateField.tsx b/packages/ra-ui-materialui/src/field/DateField.tsx index 09cc429cb9e..cb62a14b147 100644 --- a/packages/ra-ui-materialui/src/field/DateField.tsx +++ b/packages/ra-ui-materialui/src/field/DateField.tsx @@ -48,7 +48,7 @@ interface Props extends FieldProps { * mercredi 7 novembre 2012 */ -export const DateField: FunctionComponent< +const DateField: FunctionComponent< Props & InjectedFieldProps & TypographyProps > = ({ className, diff --git a/packages/ra-ui-materialui/src/field/NumberField.tsx b/packages/ra-ui-materialui/src/field/NumberField.tsx index ad847013e4e..0c730100d2f 100644 --- a/packages/ra-ui-materialui/src/field/NumberField.tsx +++ b/packages/ra-ui-materialui/src/field/NumberField.tsx @@ -46,7 +46,7 @@ interface Props extends FieldProps { * // renders the record { id: 1234, price: 25.99 } as * 25,99 $US */ -export const NumberField: FunctionComponent< +const NumberField: FunctionComponent< Props & InjectedFieldProps & TypographyProps > = ({ className, record, source, locales, options, textAlign, ...rest }) => { if (!record) { diff --git a/packages/ra-ui-materialui/src/field/SelectField.tsx b/packages/ra-ui-materialui/src/field/SelectField.tsx index a5224a6a2a6..ec1f8315b2c 100644 --- a/packages/ra-ui-materialui/src/field/SelectField.tsx +++ b/packages/ra-ui-materialui/src/field/SelectField.tsx @@ -67,7 +67,7 @@ import { FieldProps, InjectedFieldProps, fieldPropTypes } from './types'; * * **Tip**: sets `translateChoice` to false by default. */ -export const SelectField: FunctionComponent< +const SelectField: FunctionComponent< ChoicesProps & FieldProps & InjectedFieldProps > = ({ className, diff --git a/packages/ra-ui-materialui/src/input/RadioButtonGroupInput.tsx b/packages/ra-ui-materialui/src/input/RadioButtonGroupInput.tsx index 6d33cf173d1..48b610cf91c 100644 --- a/packages/ra-ui-materialui/src/input/RadioButtonGroupInput.tsx +++ b/packages/ra-ui-materialui/src/input/RadioButtonGroupInput.tsx @@ -85,7 +85,7 @@ const useStyles = makeStyles( * * The object passed as `options` props is passed to the material-ui component */ -export const RadioButtonGroupInput: FunctionComponent< +const RadioButtonGroupInput: FunctionComponent< ChoicesProps & InputProps & FormControlProps > = ({ choices = [], diff --git a/packages/ra-ui-materialui/src/input/ReferenceArrayInput.js b/packages/ra-ui-materialui/src/input/ReferenceArrayInput.js index c53c237ec1a..6958246b9d7 100644 --- a/packages/ra-ui-materialui/src/input/ReferenceArrayInput.js +++ b/packages/ra-ui-materialui/src/input/ReferenceArrayInput.js @@ -89,7 +89,7 @@ import ReferenceError from './ReferenceError'; * * */ -export const ReferenceArrayInput = ({ +const ReferenceArrayInput = ({ children, id: idOverride, onBlur, diff --git a/packages/ra-ui-materialui/src/layout/Responsive.js b/packages/ra-ui-materialui/src/layout/Responsive.js index 11adebbdc99..82e588be9ea 100644 --- a/packages/ra-ui-materialui/src/layout/Responsive.js +++ b/packages/ra-ui-materialui/src/layout/Responsive.js @@ -5,14 +5,7 @@ import withWidth from '@material-ui/core/withWidth'; /** * @deprecated use useMediaQuery instead */ -export const Responsive = ({ - xsmall, - small, - medium, - large, - width, - ...rest -}) => { +const Responsive = ({ xsmall, small, medium, large, width, ...rest }) => { let element; switch (width) { case 'xs': diff --git a/packages/ra-ui-materialui/src/list/DatagridHeaderCell.js b/packages/ra-ui-materialui/src/list/DatagridHeaderCell.js index 487217f3f6f..7199d514ea1 100644 --- a/packages/ra-ui-materialui/src/list/DatagridHeaderCell.js +++ b/packages/ra-ui-materialui/src/list/DatagridHeaderCell.js @@ -23,7 +23,7 @@ const useStyles = makeStyles( { name: 'RaDatagridHeaderCell' } ); -export const DatagridHeaderCell = ({ +const DatagridHeaderCell = ({ className, classes: classesOverride, field, diff --git a/packages/ra-ui-materialui/src/list/FilterForm.js b/packages/ra-ui-materialui/src/list/FilterForm.js index 42dbcef65c7..e88bb734131 100644 --- a/packages/ra-ui-materialui/src/list/FilterForm.js +++ b/packages/ra-ui-materialui/src/list/FilterForm.js @@ -82,7 +82,7 @@ const sanitizeRestProps = ({ ...props }) => props; -export const FilterForm = ({ +const FilterForm = ({ classes = {}, className, resource, From 1ff788794b1b0fc6ced8b2255a3795ed144ab20f Mon Sep 17 00:00:00 2001 From: asvarcas Date: Mon, 6 Jan 2020 14:55:18 -0300 Subject: [PATCH 05/14] FormInput named export removed. --- packages/ra-ui-materialui/src/form/FormInput.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ra-ui-materialui/src/form/FormInput.js b/packages/ra-ui-materialui/src/form/FormInput.js index c7573d07c85..94170ce2993 100644 --- a/packages/ra-ui-materialui/src/form/FormInput.js +++ b/packages/ra-ui-materialui/src/form/FormInput.js @@ -14,7 +14,7 @@ const useStyles = makeStyles( { name: 'RaFormInput' } ); -export const FormInput = ({ input, classes: classesOverride, ...rest }) => { +const FormInput = ({ input, classes: classesOverride, ...rest }) => { const classes = useStyles({ classes: classesOverride }); return input ? (
Date: Mon, 6 Jan 2020 14:55:37 -0300 Subject: [PATCH 06/14] Tests imports corrected. --- packages/ra-ui-materialui/src/field/BooleanField.spec.js | 2 +- packages/ra-ui-materialui/src/field/ChipField.spec.js | 2 +- packages/ra-ui-materialui/src/field/DateField.spec.js | 2 +- packages/ra-ui-materialui/src/field/NumberField.spec.js | 2 +- packages/ra-ui-materialui/src/field/SelectField.spec.js | 2 +- packages/ra-ui-materialui/src/list/DatagridHeaderCell.spec.js | 2 +- packages/ra-ui-materialui/src/list/Filter.spec.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/ra-ui-materialui/src/field/BooleanField.spec.js b/packages/ra-ui-materialui/src/field/BooleanField.spec.js index 655de62f99b..e73560e8c8f 100644 --- a/packages/ra-ui-materialui/src/field/BooleanField.spec.js +++ b/packages/ra-ui-materialui/src/field/BooleanField.spec.js @@ -1,6 +1,6 @@ import React from 'react'; import expect from 'expect'; -import { BooleanField } from './BooleanField'; +import BooleanField from './BooleanField'; import { render, cleanup } from '@testing-library/react'; const defaultProps = { diff --git a/packages/ra-ui-materialui/src/field/ChipField.spec.js b/packages/ra-ui-materialui/src/field/ChipField.spec.js index 33f359aac85..e6cb67d2653 100644 --- a/packages/ra-ui-materialui/src/field/ChipField.spec.js +++ b/packages/ra-ui-materialui/src/field/ChipField.spec.js @@ -1,6 +1,6 @@ import React from 'react'; import expect from 'expect'; -import { ChipField } from './ChipField'; +import ChipField from './ChipField'; import { render, cleanup } from '@testing-library/react'; describe('', () => { diff --git a/packages/ra-ui-materialui/src/field/DateField.spec.js b/packages/ra-ui-materialui/src/field/DateField.spec.js index e134a08bd38..3fe3d796752 100644 --- a/packages/ra-ui-materialui/src/field/DateField.spec.js +++ b/packages/ra-ui-materialui/src/field/DateField.spec.js @@ -1,7 +1,7 @@ import React from 'react'; import assert from 'assert'; import { shallow } from 'enzyme'; -import { DateField } from './DateField'; +import DateField from './DateField'; describe('', () => { it('should return null when the record is not set', () => diff --git a/packages/ra-ui-materialui/src/field/NumberField.spec.js b/packages/ra-ui-materialui/src/field/NumberField.spec.js index 2eef8a159b6..0c4b83656b9 100644 --- a/packages/ra-ui-materialui/src/field/NumberField.spec.js +++ b/packages/ra-ui-materialui/src/field/NumberField.spec.js @@ -1,7 +1,7 @@ import React from 'react'; import assert from 'assert'; import { render, shallow } from 'enzyme'; -import { NumberField } from './NumberField'; +import NumberField from './NumberField'; describe('', () => { it('should return null when the record is not set', () => diff --git a/packages/ra-ui-materialui/src/field/SelectField.spec.js b/packages/ra-ui-materialui/src/field/SelectField.spec.js index 1921ca3739f..6b272c6dd8e 100644 --- a/packages/ra-ui-materialui/src/field/SelectField.spec.js +++ b/packages/ra-ui-materialui/src/field/SelectField.spec.js @@ -3,7 +3,7 @@ import expect from 'expect'; import { render, cleanup } from '@testing-library/react'; import { TestTranslationProvider, renderWithRedux } from 'ra-core'; -import { SelectField } from './SelectField'; +import SelectField from './SelectField'; describe('', () => { afterEach(cleanup); diff --git a/packages/ra-ui-materialui/src/list/DatagridHeaderCell.spec.js b/packages/ra-ui-materialui/src/list/DatagridHeaderCell.spec.js index c056d13f6f0..ad08ee88bf0 100644 --- a/packages/ra-ui-materialui/src/list/DatagridHeaderCell.spec.js +++ b/packages/ra-ui-materialui/src/list/DatagridHeaderCell.spec.js @@ -2,7 +2,7 @@ import expect from 'expect'; import React from 'react'; import { render, cleanup } from '@testing-library/react'; -import { DatagridHeaderCell } from './DatagridHeaderCell'; +import DatagridHeaderCell from './DatagridHeaderCell'; describe('', () => { afterEach(cleanup); diff --git a/packages/ra-ui-materialui/src/list/Filter.spec.js b/packages/ra-ui-materialui/src/list/Filter.spec.js index fef8daf155a..00bcae06320 100644 --- a/packages/ra-ui-materialui/src/list/Filter.spec.js +++ b/packages/ra-ui-materialui/src/list/Filter.spec.js @@ -1,6 +1,6 @@ import React from 'react'; import { render, cleanup } from '@testing-library/react'; -import { TextInput } from '../input/TextInput'; +import TextInput from '../input/TextInput'; import Filter from './Filter'; describe('', () => { From dcd6d7b22e8ded75ea121a559210a2e8a6637591 Mon Sep 17 00:00:00 2001 From: asvarcas Date: Mon, 6 Jan 2020 15:12:05 -0300 Subject: [PATCH 07/14] Tests imports corrected. --- packages/ra-ui-materialui/src/button/CloneButton.spec.tsx | 2 +- packages/ra-ui-materialui/src/field/ArrayField.spec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ra-ui-materialui/src/button/CloneButton.spec.tsx b/packages/ra-ui-materialui/src/button/CloneButton.spec.tsx index c786f58f6c3..b0ba772c244 100644 --- a/packages/ra-ui-materialui/src/button/CloneButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/CloneButton.spec.tsx @@ -2,7 +2,7 @@ import expect from 'expect'; import { shallow } from 'enzyme'; import React from 'react'; -import { CloneButton } from './CloneButton'; +import CloneButton from './CloneButton'; describe('', () => { it('should pass a clone of the record in the location state', () => { diff --git a/packages/ra-ui-materialui/src/field/ArrayField.spec.js b/packages/ra-ui-materialui/src/field/ArrayField.spec.js index 1534945bc2f..29a02942e1c 100644 --- a/packages/ra-ui-materialui/src/field/ArrayField.spec.js +++ b/packages/ra-ui-materialui/src/field/ArrayField.spec.js @@ -1,7 +1,7 @@ import React from 'react'; import { render, cleanup } from '@testing-library/react'; -import { ArrayField } from './ArrayField'; +import ArrayField from './ArrayField'; import NumberField from './NumberField'; import TextField from './TextField'; import Datagrid from '../list/Datagrid'; From 9165a619a5cf918a72259fe99dba84df3b87011c Mon Sep 17 00:00:00 2001 From: asvarcas Date: Mon, 6 Jan 2020 15:13:01 -0300 Subject: [PATCH 08/14] ImageField test import corrected. --- packages/ra-ui-materialui/src/field/ImageField.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ra-ui-materialui/src/field/ImageField.spec.js b/packages/ra-ui-materialui/src/field/ImageField.spec.js index ee93bb4cd76..3fc8438a2ab 100644 --- a/packages/ra-ui-materialui/src/field/ImageField.spec.js +++ b/packages/ra-ui-materialui/src/field/ImageField.spec.js @@ -1,7 +1,7 @@ import React from 'react'; import expect from 'expect'; import { render, cleanup } from '@testing-library/react'; -import { ImageField } from './ImageField'; +import ImageField from './ImageField'; const defaultProps = { classes: {}, From 2ea9cb6a2556a21f8854c2e0852d233eec2074b7 Mon Sep 17 00:00:00 2001 From: asvarcas Date: Mon, 6 Jan 2020 15:16:19 -0300 Subject: [PATCH 09/14] FileField test import corrected. --- packages/ra-ui-materialui/src/field/FileField.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ra-ui-materialui/src/field/FileField.spec.js b/packages/ra-ui-materialui/src/field/FileField.spec.js index e017ab7a588..406aa0f9c7c 100644 --- a/packages/ra-ui-materialui/src/field/FileField.spec.js +++ b/packages/ra-ui-materialui/src/field/FileField.spec.js @@ -1,6 +1,6 @@ import React from 'react'; import expect from 'expect'; -import { FileField } from './FileField'; +import FileField from './FileField'; import { render, cleanup } from '@testing-library/react'; const defaultProps = { From fee6453f2be071e3ce920f140dd328f9b8c65fe3 Mon Sep 17 00:00:00 2001 From: asvarcas Date: Mon, 6 Jan 2020 15:27:59 -0300 Subject: [PATCH 10/14] Responsive test import corrected. --- packages/ra-ui-materialui/src/layout/Responsive.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ra-ui-materialui/src/layout/Responsive.spec.js b/packages/ra-ui-materialui/src/layout/Responsive.spec.js index 7e4eba1a119..a008cd77f61 100644 --- a/packages/ra-ui-materialui/src/layout/Responsive.spec.js +++ b/packages/ra-ui-materialui/src/layout/Responsive.spec.js @@ -2,7 +2,7 @@ import assert from 'assert'; import { shallow } from 'enzyme'; import React from 'react'; -import { Responsive } from './Responsive'; +import Responsive from './Responsive'; describe('', () => { const Small = () =>
; From 85a3e31fcd65f263595793f46cc21e28f5e02329 Mon Sep 17 00:00:00 2001 From: asvarcas Date: Mon, 6 Jan 2020 16:27:42 -0300 Subject: [PATCH 11/14] Reverted back Responsive component. --- packages/ra-ui-materialui/src/layout/Responsive.js | 9 ++++++++- packages/ra-ui-materialui/src/layout/Responsive.spec.js | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/ra-ui-materialui/src/layout/Responsive.js b/packages/ra-ui-materialui/src/layout/Responsive.js index 82e588be9ea..11adebbdc99 100644 --- a/packages/ra-ui-materialui/src/layout/Responsive.js +++ b/packages/ra-ui-materialui/src/layout/Responsive.js @@ -5,7 +5,14 @@ import withWidth from '@material-ui/core/withWidth'; /** * @deprecated use useMediaQuery instead */ -const Responsive = ({ xsmall, small, medium, large, width, ...rest }) => { +export const Responsive = ({ + xsmall, + small, + medium, + large, + width, + ...rest +}) => { let element; switch (width) { case 'xs': diff --git a/packages/ra-ui-materialui/src/layout/Responsive.spec.js b/packages/ra-ui-materialui/src/layout/Responsive.spec.js index a008cd77f61..7e4eba1a119 100644 --- a/packages/ra-ui-materialui/src/layout/Responsive.spec.js +++ b/packages/ra-ui-materialui/src/layout/Responsive.spec.js @@ -2,7 +2,7 @@ import assert from 'assert'; import { shallow } from 'enzyme'; import React from 'react'; -import Responsive from './Responsive'; +import { Responsive } from './Responsive'; describe('', () => { const Small = () =>
; From 6f413894e4a614f47d0507e1d25e405c76fc8952 Mon Sep 17 00:00:00 2001 From: asvarcas Date: Mon, 6 Jan 2020 16:46:23 -0300 Subject: [PATCH 12/14] Reverted back DateField, NumberField and CloneButton components. --- packages/ra-ui-materialui/src/button/CloneButton.spec.tsx | 2 +- packages/ra-ui-materialui/src/button/CloneButton.tsx | 2 +- packages/ra-ui-materialui/src/field/DateField.spec.js | 2 +- packages/ra-ui-materialui/src/field/DateField.tsx | 2 +- packages/ra-ui-materialui/src/field/NumberField.spec.js | 2 +- packages/ra-ui-materialui/src/field/NumberField.tsx | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/ra-ui-materialui/src/button/CloneButton.spec.tsx b/packages/ra-ui-materialui/src/button/CloneButton.spec.tsx index b0ba772c244..c786f58f6c3 100644 --- a/packages/ra-ui-materialui/src/button/CloneButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/CloneButton.spec.tsx @@ -2,7 +2,7 @@ import expect from 'expect'; import { shallow } from 'enzyme'; import React from 'react'; -import CloneButton from './CloneButton'; +import { CloneButton } from './CloneButton'; describe('', () => { it('should pass a clone of the record in the location state', () => { diff --git a/packages/ra-ui-materialui/src/button/CloneButton.tsx b/packages/ra-ui-materialui/src/button/CloneButton.tsx index e0ad3ff298b..89427b90c85 100644 --- a/packages/ra-ui-materialui/src/button/CloneButton.tsx +++ b/packages/ra-ui-materialui/src/button/CloneButton.tsx @@ -8,7 +8,7 @@ import { Record } from 'ra-core'; import Button, { ButtonProps } from './Button'; -const CloneButton: FC = ({ +export const CloneButton: FC = ({ basePath = '', label = 'ra.action.clone', record, diff --git a/packages/ra-ui-materialui/src/field/DateField.spec.js b/packages/ra-ui-materialui/src/field/DateField.spec.js index 3fe3d796752..e134a08bd38 100644 --- a/packages/ra-ui-materialui/src/field/DateField.spec.js +++ b/packages/ra-ui-materialui/src/field/DateField.spec.js @@ -1,7 +1,7 @@ import React from 'react'; import assert from 'assert'; import { shallow } from 'enzyme'; -import DateField from './DateField'; +import { DateField } from './DateField'; describe('', () => { it('should return null when the record is not set', () => diff --git a/packages/ra-ui-materialui/src/field/DateField.tsx b/packages/ra-ui-materialui/src/field/DateField.tsx index cb62a14b147..09cc429cb9e 100644 --- a/packages/ra-ui-materialui/src/field/DateField.tsx +++ b/packages/ra-ui-materialui/src/field/DateField.tsx @@ -48,7 +48,7 @@ interface Props extends FieldProps { * mercredi 7 novembre 2012 */ -const DateField: FunctionComponent< +export const DateField: FunctionComponent< Props & InjectedFieldProps & TypographyProps > = ({ className, diff --git a/packages/ra-ui-materialui/src/field/NumberField.spec.js b/packages/ra-ui-materialui/src/field/NumberField.spec.js index 0c4b83656b9..2eef8a159b6 100644 --- a/packages/ra-ui-materialui/src/field/NumberField.spec.js +++ b/packages/ra-ui-materialui/src/field/NumberField.spec.js @@ -1,7 +1,7 @@ import React from 'react'; import assert from 'assert'; import { render, shallow } from 'enzyme'; -import NumberField from './NumberField'; +import { NumberField } from './NumberField'; describe('', () => { it('should return null when the record is not set', () => diff --git a/packages/ra-ui-materialui/src/field/NumberField.tsx b/packages/ra-ui-materialui/src/field/NumberField.tsx index 0c730100d2f..ad847013e4e 100644 --- a/packages/ra-ui-materialui/src/field/NumberField.tsx +++ b/packages/ra-ui-materialui/src/field/NumberField.tsx @@ -46,7 +46,7 @@ interface Props extends FieldProps { * // renders the record { id: 1234, price: 25.99 } as * 25,99 $US */ -const NumberField: FunctionComponent< +export const NumberField: FunctionComponent< Props & InjectedFieldProps & TypographyProps > = ({ className, record, source, locales, options, textAlign, ...rest }) => { if (!record) { From fee8b18c98786d73c70893428cb18232cd495505 Mon Sep 17 00:00:00 2001 From: asvarcas Date: Tue, 7 Jan 2020 04:55:46 -0300 Subject: [PATCH 13/14] Reverted back components with HOC exports as default. --- packages/ra-ui-materialui/src/field/ArrayField.spec.js | 2 +- packages/ra-ui-materialui/src/field/ArrayField.tsx | 5 ++++- packages/ra-ui-materialui/src/field/BooleanField.spec.js | 2 +- packages/ra-ui-materialui/src/field/BooleanField.tsx | 2 +- packages/ra-ui-materialui/src/field/ChipField.spec.js | 2 +- packages/ra-ui-materialui/src/field/ChipField.tsx | 2 +- packages/ra-ui-materialui/src/field/SelectField.spec.js | 2 +- packages/ra-ui-materialui/src/field/SelectField.tsx | 2 +- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/ra-ui-materialui/src/field/ArrayField.spec.js b/packages/ra-ui-materialui/src/field/ArrayField.spec.js index 29a02942e1c..1534945bc2f 100644 --- a/packages/ra-ui-materialui/src/field/ArrayField.spec.js +++ b/packages/ra-ui-materialui/src/field/ArrayField.spec.js @@ -1,7 +1,7 @@ import React from 'react'; import { render, cleanup } from '@testing-library/react'; -import ArrayField from './ArrayField'; +import { ArrayField } from './ArrayField'; import NumberField from './NumberField'; import TextField from './TextField'; import Datagrid from '../list/Datagrid'; diff --git a/packages/ra-ui-materialui/src/field/ArrayField.tsx b/packages/ra-ui-materialui/src/field/ArrayField.tsx index 16093a2e62e..3acfedb937f 100644 --- a/packages/ra-ui-materialui/src/field/ArrayField.tsx +++ b/packages/ra-ui-materialui/src/field/ArrayField.tsx @@ -78,7 +78,10 @@ const initialState = { * ) * TagsField.defaultProps = { addLabel: true }; */ -class ArrayField extends Component { +export class ArrayField extends Component< + FieldProps & InjectedFieldProps, + State +> { constructor(props: FieldProps & InjectedFieldProps) { super(props); this.state = props.record diff --git a/packages/ra-ui-materialui/src/field/BooleanField.spec.js b/packages/ra-ui-materialui/src/field/BooleanField.spec.js index e73560e8c8f..655de62f99b 100644 --- a/packages/ra-ui-materialui/src/field/BooleanField.spec.js +++ b/packages/ra-ui-materialui/src/field/BooleanField.spec.js @@ -1,6 +1,6 @@ import React from 'react'; import expect from 'expect'; -import BooleanField from './BooleanField'; +import { BooleanField } from './BooleanField'; import { render, cleanup } from '@testing-library/react'; const defaultProps = { diff --git a/packages/ra-ui-materialui/src/field/BooleanField.tsx b/packages/ra-ui-materialui/src/field/BooleanField.tsx index f6366893567..44a622554ba 100644 --- a/packages/ra-ui-materialui/src/field/BooleanField.tsx +++ b/packages/ra-ui-materialui/src/field/BooleanField.tsx @@ -17,7 +17,7 @@ interface Props extends FieldProps { valueLabelFalse?: string; } -const BooleanField: FunctionComponent< +export const BooleanField: FunctionComponent< Props & InjectedFieldProps & TypographyProps > = ({ className, diff --git a/packages/ra-ui-materialui/src/field/ChipField.spec.js b/packages/ra-ui-materialui/src/field/ChipField.spec.js index e6cb67d2653..33f359aac85 100644 --- a/packages/ra-ui-materialui/src/field/ChipField.spec.js +++ b/packages/ra-ui-materialui/src/field/ChipField.spec.js @@ -1,6 +1,6 @@ import React from 'react'; import expect from 'expect'; -import ChipField from './ChipField'; +import { ChipField } from './ChipField'; import { render, cleanup } from '@testing-library/react'; describe('', () => { diff --git a/packages/ra-ui-materialui/src/field/ChipField.tsx b/packages/ra-ui-materialui/src/field/ChipField.tsx index fbdf777087a..a648aadc4ab 100644 --- a/packages/ra-ui-materialui/src/field/ChipField.tsx +++ b/packages/ra-ui-materialui/src/field/ChipField.tsx @@ -16,7 +16,7 @@ const useStyles = makeStyles( { name: 'RaChipField' } ); -const ChipField: FunctionComponent< +export const ChipField: FunctionComponent< FieldProps & InjectedFieldProps & ChipProps > = ({ className, classes: classesOverride, source, record = {}, ...rest }) => { const classes = useStyles({ classes: classesOverride }); diff --git a/packages/ra-ui-materialui/src/field/SelectField.spec.js b/packages/ra-ui-materialui/src/field/SelectField.spec.js index 6b272c6dd8e..1921ca3739f 100644 --- a/packages/ra-ui-materialui/src/field/SelectField.spec.js +++ b/packages/ra-ui-materialui/src/field/SelectField.spec.js @@ -3,7 +3,7 @@ import expect from 'expect'; import { render, cleanup } from '@testing-library/react'; import { TestTranslationProvider, renderWithRedux } from 'ra-core'; -import SelectField from './SelectField'; +import { SelectField } from './SelectField'; describe('', () => { afterEach(cleanup); diff --git a/packages/ra-ui-materialui/src/field/SelectField.tsx b/packages/ra-ui-materialui/src/field/SelectField.tsx index ec1f8315b2c..a5224a6a2a6 100644 --- a/packages/ra-ui-materialui/src/field/SelectField.tsx +++ b/packages/ra-ui-materialui/src/field/SelectField.tsx @@ -67,7 +67,7 @@ import { FieldProps, InjectedFieldProps, fieldPropTypes } from './types'; * * **Tip**: sets `translateChoice` to false by default. */ -const SelectField: FunctionComponent< +export const SelectField: FunctionComponent< ChoicesProps & FieldProps & InjectedFieldProps > = ({ className, From 1334059a916e1b434a6b2530298cc152099f1d34 Mon Sep 17 00:00:00 2001 From: asvarcas Date: Tue, 7 Jan 2020 06:00:23 -0300 Subject: [PATCH 14/14] Reverted back DatagridHeaderCell an FilterForm. --- packages/ra-ui-materialui/src/list/DatagridHeaderCell.js | 2 +- packages/ra-ui-materialui/src/list/DatagridHeaderCell.spec.js | 2 +- packages/ra-ui-materialui/src/list/FilterForm.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/ra-ui-materialui/src/list/DatagridHeaderCell.js b/packages/ra-ui-materialui/src/list/DatagridHeaderCell.js index 7199d514ea1..487217f3f6f 100644 --- a/packages/ra-ui-materialui/src/list/DatagridHeaderCell.js +++ b/packages/ra-ui-materialui/src/list/DatagridHeaderCell.js @@ -23,7 +23,7 @@ const useStyles = makeStyles( { name: 'RaDatagridHeaderCell' } ); -const DatagridHeaderCell = ({ +export const DatagridHeaderCell = ({ className, classes: classesOverride, field, diff --git a/packages/ra-ui-materialui/src/list/DatagridHeaderCell.spec.js b/packages/ra-ui-materialui/src/list/DatagridHeaderCell.spec.js index ad08ee88bf0..c056d13f6f0 100644 --- a/packages/ra-ui-materialui/src/list/DatagridHeaderCell.spec.js +++ b/packages/ra-ui-materialui/src/list/DatagridHeaderCell.spec.js @@ -2,7 +2,7 @@ import expect from 'expect'; import React from 'react'; import { render, cleanup } from '@testing-library/react'; -import DatagridHeaderCell from './DatagridHeaderCell'; +import { DatagridHeaderCell } from './DatagridHeaderCell'; describe('', () => { afterEach(cleanup); diff --git a/packages/ra-ui-materialui/src/list/FilterForm.js b/packages/ra-ui-materialui/src/list/FilterForm.js index e88bb734131..42dbcef65c7 100644 --- a/packages/ra-ui-materialui/src/list/FilterForm.js +++ b/packages/ra-ui-materialui/src/list/FilterForm.js @@ -82,7 +82,7 @@ const sanitizeRestProps = ({ ...props }) => props; -const FilterForm = ({ +export const FilterForm = ({ classes = {}, className, resource,