From f35108989b066d3482eec4151bf7f11e19607392 Mon Sep 17 00:00:00 2001 From: asvarcas Date: Fri, 3 Sep 2021 10:33:37 -0300 Subject: [PATCH 1/2] Fix BooleanField default props --- .../ra-ui-materialui/src/field/BooleanField.tsx | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/packages/ra-ui-materialui/src/field/BooleanField.tsx b/packages/ra-ui-materialui/src/field/BooleanField.tsx index 75ebad2f3bd..7635cf09040 100644 --- a/packages/ra-ui-materialui/src/field/BooleanField.tsx +++ b/packages/ra-ui-materialui/src/field/BooleanField.tsx @@ -27,15 +27,16 @@ const useStyles = makeStyles( const BooleanField = (props: BooleanFieldProps) => { const { + addLabel = true, className, classes: classesOverride, emptyText, source, valueLabelTrue, valueLabelFalse, - TrueIcon, - FalseIcon, - looseValue, + TrueIcon = DoneIcon, + FalseIcon = ClearIcon, + looseValue = false, ...rest } = props; const record = useRecordContext(props); @@ -84,13 +85,6 @@ const BooleanField = (props: BooleanFieldProps) => { ); }; -BooleanField.defaultProps = { - addLabel: true, - TrueIcon: DoneIcon, - FalseIcon: ClearIcon, - looseValue: false, -}; - BooleanField.propTypes = { // @ts-ignore ...Typography.propTypes, From 31de266095f6b3b85ac947fbfdf93fbce91dfe9c Mon Sep 17 00:00:00 2001 From: asvarcas Date: Wed, 8 Sep 2021 10:56:46 -0300 Subject: [PATCH 2/2] Fix BooleanField default props again --- .../src/field/BooleanField.tsx | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/ra-ui-materialui/src/field/BooleanField.tsx b/packages/ra-ui-materialui/src/field/BooleanField.tsx index 7635cf09040..75b011dc233 100644 --- a/packages/ra-ui-materialui/src/field/BooleanField.tsx +++ b/packages/ra-ui-materialui/src/field/BooleanField.tsx @@ -25,18 +25,17 @@ const useStyles = makeStyles( } ); -const BooleanField = (props: BooleanFieldProps) => { +const BooleanField = memo((props: BooleanFieldProps) => { const { - addLabel = true, className, classes: classesOverride, emptyText, source, valueLabelTrue, valueLabelFalse, - TrueIcon = DoneIcon, - FalseIcon = ClearIcon, - looseValue = false, + TrueIcon, + FalseIcon, + looseValue, ...rest } = props; const record = useRecordContext(props); @@ -83,8 +82,17 @@ const BooleanField = (props: BooleanFieldProps) => { {emptyText} ); +}); + +// @ts-ignore +BooleanField.defaultProps = { + addLabel: true, + TrueIcon: DoneIcon, + FalseIcon: ClearIcon, + looseValue: false, }; +// @ts-ignore BooleanField.propTypes = { // @ts-ignore ...Typography.propTypes, @@ -107,4 +115,4 @@ export interface BooleanFieldProps looseValue?: boolean; } -export default memo(BooleanField); +export default BooleanField;