Merge pull request #5953 from marmelab/fix-checkboxgroup-input-error-…

…style-in-reference-input Fix CheckboxGroup error style when in ReferenceArrayInput
marmelab · Feb 26, 2021 · 6cd5c6a · 6cd5c6a
2 parents 5a0903e + 5f6dab8
commit 6cd5c6a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 21 deletions.
diff --git a/packages/ra-ui-materialui/src/input/CheckboxGroupInput.tsx b/packages/ra-ui-materialui/src/input/CheckboxGroupInput.tsx
@@ -17,27 +17,6 @@ import classnames from 'classnames';
 import Labeled from './Labeled';
 import { LinearProgress } from '../layout';
 
-const sanitizeRestProps = ({
-    setFilter,
-    setPagination,
-    setSort,
-    loaded,
-    ...rest
-}: any) => sanitizeInputRestProps(rest);
-
-const useStyles = makeStyles(
-    theme => ({
-        root: {},
-        label: {
-            transform: 'translate(0, 8px) scale(0.75)',
-            transformOrigin: `top ${
-                theme.direction === 'ltr' ? 'left' : 'right'
-            }`,
-        },
-    }),
-    { name: 'RaCheckboxGroupInput' }
-);
-
 /**
  * An Input component for a checkbox group, using an array of objects for the options
  *
@@ -233,6 +212,28 @@ const CheckboxGroupInput: FunctionComponent<
     );
 };
 
+const sanitizeRestProps = ({
+    setFilter,
+    setPagination,
+    setSort,
+    loaded,
+    touched,
+    ...rest
+}: any) => sanitizeInputRestProps(rest);
+
+const useStyles = makeStyles(
+    theme => ({
+        root: {},
+        label: {
+            transform: 'translate(0, 8px) scale(0.75)',
+            transformOrigin: `top ${
+                theme.direction === 'ltr' ? 'left' : 'right'
+            }`,
+        },
+    }),
+    { name: 'RaCheckboxGroupInput' }
+);
+
 CheckboxGroupInput.propTypes = {
     choices: PropTypes.arrayOf(PropTypes.object),
     className: PropTypes.string,

diff --git a/packages/ra-ui-materialui/src/input/sanitizeInputRestProps.ts b/packages/ra-ui-materialui/src/input/sanitizeInputRestProps.ts
@@ -8,6 +8,7 @@ const sanitizeInputRestProps = ({
     component,
     data,
     defaultValue,
+    error,
     format,
     formatOnBlur,
     formClassName,
@@ -31,6 +32,7 @@ const sanitizeInputRestProps = ({
     render,
     resource,
     source,
+    submitError,
     subscription,
     textAlign,
     translate,