Merge pull request #4139 from marmelab/fix-alwayson-warning

Better prop sanitation for reference inputs
marmelab · Dec 11, 2019 · 8a5ebf3 · 8a5ebf3
2 parents 5f9a2f2 + 8a13dbe
commit 8a5ebf3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 41 deletions.
diff --git a/packages/ra-ui-materialui/src/input/ReferenceArrayInput.js b/packages/ra-ui-materialui/src/input/ReferenceArrayInput.js
@@ -6,6 +6,7 @@ import {
     useTranslate,
 } from 'ra-core';
 
+import sanitizeInputProps from './sanitizeRestProps';
 import LinearProgress from '../layout/LinearProgress';
 import Labeled from '../input/Labeled';
 import ReferenceError from './ReferenceError';
@@ -164,33 +165,13 @@ ReferenceArrayInput.defaultProps = {
 };
 
 const sanitizeRestProps = ({
-    alwaysOn,
-    basePath,
-    component,
     crudGetMany,
     crudGetMatching,
-    defaultValue,
     filterToQuery,
-    formClassName,
-    initializeForm,
-    input,
-    isRequired,
-    label,
-    locale,
-    meta,
-    optionText,
-    optionValue,
     perPage,
-    record,
     referenceSource,
-    resource,
-    allowEmpty,
-    source,
-    textAlign,
-    translate,
-    translateChoice,
     ...rest
-}) => rest;
+}) => sanitizeInputProps(rest);
 
 export const ReferenceArrayInputView = ({
     allowEmpty,

diff --git a/packages/ra-ui-materialui/src/input/ReferenceInput.tsx b/packages/ra-ui-materialui/src/input/ReferenceInput.tsx
@@ -14,6 +14,7 @@ import {
     Sort,
 } from 'ra-core';
 
+import sanitizeInputProps from './sanitizeRestProps';
 import LinearProgress from '../layout/LinearProgress';
 import Labeled from './Labeled';
 import ReferenceError from './ReferenceError';
@@ -165,41 +166,23 @@ ReferenceInput.defaultProps = {
 };
 
 const sanitizeRestProps = ({
-    allowEmpty,
-    basePath,
     choices,
     className,
-    component,
     crudGetMatching,
     crudGetOne,
-    defaultValue,
     filter,
     filterToQuery,
-    formClassName,
-    initializeForm,
-    input,
-    isRequired,
-    label,
-    locale,
-    meta,
     onChange,
-    optionValue,
-    optionText,
     perPage,
-    record,
     reference,
     referenceSource,
-    resource,
     setFilter,
     setPagination,
     setSort,
     sort,
-    source,
-    textAlign,
-    translateChoice,
     validation,
     ...rest
-}: any) => rest;
+}: any) => sanitizeInputProps(rest);
 
 interface ReferenceInputViewProps {
     allowEmpty?: boolean;

diff --git a/packages/ra-ui-materialui/src/input/sanitizeRestProps.ts b/packages/ra-ui-materialui/src/input/sanitizeRestProps.ts
@@ -1,4 +1,5 @@
 export default ({
+    allowEmpty,
     alwaysOn,
     basePath,
     component,
@@ -16,7 +17,6 @@ export default ({
     optionValue,
     record,
     resource,
-    allowEmpty,
     source,
     textAlign,
     translate,