Removed unwanted props from uniforms-bootstrap3 (#64).

vazco · Jul 19, 2016 · adc5c8f · adc5c8f
1 parent 6443e4d
commit adc5c8f
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 123 deletions.
diff --git a/packages/uniforms-bootstrap3/src/components/fields/ErrorField.js b/packages/uniforms-bootstrap3/src/components/fields/ErrorField.js
@@ -1,34 +1,17 @@
-import React          from 'react';
-import classnames     from 'classnames';
-import {connectField} from 'uniforms';
-import {nothing}      from 'uniforms';
+import React            from 'react';
+import classnames       from 'classnames';
+import {connectField}   from 'uniforms';
+import {filterDOMProps} from 'uniforms';
+import {nothing}        from 'uniforms';
 
 const Error = ({
-    changed,      // eslint-disable-line no-unused-vars
-    changedMap,   // eslint-disable-line no-unused-vars
     children,
     className,
-    disabled,     // eslint-disable-line no-unused-vars
-    error,        // eslint-disable-line no-unused-vars
     errorMessage,
-    field,        // eslint-disable-line no-unused-vars
-    fieldType,    // eslint-disable-line no-unused-vars
-    fields,       // eslint-disable-line no-unused-vars
-    findError,    // eslint-disable-line no-unused-vars
-    findField,    // eslint-disable-line no-unused-vars
-    findValue,    // eslint-disable-line no-unused-vars
-    grid,         // eslint-disable-line no-unused-vars
-    id,           // eslint-disable-line no-unused-vars
-    label,        // eslint-disable-line no-unused-vars
-    name,         // eslint-disable-line no-unused-vars
-    onChange,     // eslint-disable-line no-unused-vars
-    parent,       // eslint-disable-line no-unused-vars
-    placeholder,  // eslint-disable-line no-unused-vars
-    value,        // eslint-disable-line no-unused-vars
     ...props
 }) =>
     !errorMessage ? nothing : (
-        <section className={classnames('panel panel-danger', className)} {...props}>
+        <section className={classnames('panel panel-danger', className)} {...filterDOMProps(props)}>
             <section className="panel-body">
                 {children ? (
                     children

diff --git a/packages/uniforms-bootstrap3/src/components/fields/HiddenField.js b/packages/uniforms-bootstrap3/src/components/fields/HiddenField.js
@@ -1,6 +1,7 @@
-import React       from 'react';
-import {BaseField} from 'uniforms';
-import {nothing}   from 'uniforms';
+import React            from 'react';
+import {BaseField}      from 'uniforms';
+import {filterDOMProps} from 'uniforms';
+import {nothing}        from 'uniforms';
 
 export default class HiddenField extends BaseField {
     componentWillReceiveProps ({value: valueDesired}) {
@@ -19,14 +20,7 @@ export default class HiddenField extends BaseField {
 
         return (
             props.noDOM ? nothing : (
-                <input
-                    disabled={props.disabled}
-                    id={props.id}
-                    name={props.name}
-                    ref={props.inputRef}
-                    type="hidden"
-                    value={props.value}
-                />
+                <input ref={props.inputRef} type="hidden" value={props.value} {...filterDOMProps(props)} />
             )
         );
     }

diff --git a/packages/uniforms-bootstrap3/src/components/fields/ListAddField.js b/packages/uniforms-bootstrap3/src/components/fields/ListAddField.js
@@ -1,38 +1,22 @@
-import React          from 'react';
-import classnames     from 'classnames';
-import {connectField} from 'uniforms';
+import React            from 'react';
+import classnames       from 'classnames';
+import {connectField}   from 'uniforms';
+import {filterDOMProps} from 'uniforms';
 
 const ListAdd = ({
-    changed,      // eslint-disable-line no-unused-vars
-    changedMap,   // eslint-disable-line no-unused-vars
     className,
-    disabled,     // eslint-disable-line no-unused-vars
-    error,        // eslint-disable-line no-unused-vars
-    errorMessage, // eslint-disable-line no-unused-vars
-    field,        // eslint-disable-line no-unused-vars
-    fieldType,    // eslint-disable-line no-unused-vars
-    fields,       // eslint-disable-line no-unused-vars
-    findError,    // eslint-disable-line no-unused-vars
-    findField,    // eslint-disable-line no-unused-vars
-    findValue,    // eslint-disable-line no-unused-vars
-    grid,         // eslint-disable-line no-unused-vars
-    id,           // eslint-disable-line no-unused-vars
-    initialCount, // eslint-disable-line no-unused-vars
-    label,        // eslint-disable-line no-unused-vars
-    name,         // eslint-disable-line no-unused-vars
-    onChange,     // eslint-disable-line no-unused-vars
+    disabled,
     parent,
-    placeholder,  // eslint-disable-line no-unused-vars
     value,
     ...props
 }) => {
-    const limitNotReached = !(parent.maxCount <= parent.value.length);
+    const limitNotReached = !disabled && !(parent.maxCount <= parent.value.length);
 
     return (
         <section
             className={classnames('badge pull-right', className)}
             onClick={() => limitNotReached && parent.onChange(parent.value.concat([value]))}
-            {...props}
+            {...filterDOMProps(props)}
         >
             {/* TODO: configure to alternate icon */}
             <i className="glyphicon glyphicon-plus" />

diff --git a/packages/uniforms-bootstrap3/src/components/fields/ListDelField.js b/packages/uniforms-bootstrap3/src/components/fields/ListDelField.js
@@ -1,32 +1,17 @@
-import React          from 'react';
-import classnames     from 'classnames';
-import {connectField} from 'uniforms';
+import React            from 'react';
+import classnames       from 'classnames';
+import {connectField}   from 'uniforms';
+import {filterDOMProps} from 'uniforms';
 
 const ListDel = ({
-    changed,      // eslint-disable-line no-unused-vars
-    changedMap,   // eslint-disable-line no-unused-vars
     className,
-    disabled,     // eslint-disable-line no-unused-vars
-    error,        // eslint-disable-line no-unused-vars
-    errorMessage, // eslint-disable-line no-unused-vars
-    field,        // eslint-disable-line no-unused-vars
-    fieldType,    // eslint-disable-line no-unused-vars
-    fields,       // eslint-disable-line no-unused-vars
-    findError,    // eslint-disable-line no-unused-vars
-    findField,    // eslint-disable-line no-unused-vars
-    findValue,    // eslint-disable-line no-unused-vars
-    grid,         // eslint-disable-line no-unused-vars
-    id,           // eslint-disable-line no-unused-vars
-    label,        // eslint-disable-line no-unused-vars
+    disabled,
     name,
-    onChange,     // eslint-disable-line no-unused-vars
     parent,
-    placeholder,  // eslint-disable-line no-unused-vars
-    value,        // eslint-disable-line no-unused-vars
     ...props
 }) => {
     const fieldIndex      = +name.slice(1 + name.lastIndexOf('.'));
-    const limitNotReached = !(parent.minCount >= parent.value.length);
+    const limitNotReached = !disabled && !(parent.minCount >= parent.value.length);
 
     return (
         <span
@@ -35,7 +20,7 @@ const ListDel = ({
                 [].concat(parent.value.slice(0,  fieldIndex))
                   .concat(parent.value.slice(1 + fieldIndex))
             )}
-            {...props}
+            {...filterDOMProps(props)}
         >
             {/* TODO: configure to alternate icon */}
             <i className="glyphicon glyphicon-minus" />

diff --git a/packages/uniforms-bootstrap3/src/components/fields/ListField.js b/packages/uniforms-bootstrap3/src/components/fields/ListField.js
@@ -1,41 +1,28 @@
-import React          from 'react';
-import classnames     from 'classnames';
-import {Children}     from 'react';
-import {connectField} from 'uniforms';
-import {joinName}     from 'uniforms';
+import React            from 'react';
+import classnames       from 'classnames';
+import {Children}       from 'react';
+import {connectField}   from 'uniforms';
+import {filterDOMProps} from 'uniforms';
+import {joinName}       from 'uniforms';
 
 import ListAddField  from './ListAddField';
 import ListItemField from './ListItemField';
 
 const List = ({
-    changed,      // eslint-disable-line no-unused-vars
-    changedMap,   // eslint-disable-line no-unused-vars
     children,
     className,
-    disabled,     // eslint-disable-line no-unused-vars
     error,
-    errorMessage, // eslint-disable-line no-unused-vars
-    field,        // eslint-disable-line no-unused-vars
-    fieldType,    // eslint-disable-line no-unused-vars
-    fields,       // eslint-disable-line no-unused-vars
-    findError,    // eslint-disable-line no-unused-vars
-    findField,    // eslint-disable-line no-unused-vars
-    findValue,    // eslint-disable-line no-unused-vars
-    grid,         // eslint-disable-line no-unused-vars
-    id,           // eslint-disable-line no-unused-vars
     initialCount,
     itemProps,
     label,
-    maxCount,     // eslint-disable-line no-unused-vars
-    minCount,     // eslint-disable-line no-unused-vars
     name,
-    onChange,     // eslint-disable-line no-unused-vars
-    parent,       // eslint-disable-line no-unused-vars
-    placeholder,  // eslint-disable-line no-unused-vars
     value,
     ...props
 }) =>
-    <section className={classnames('panel panel-default', {'panel-danger': error}, className)} {...props}>
+    <section
+        className={classnames('panel panel-default', {'panel-danger': error}, className)}
+        {...filterDOMProps(props)}
+    >
         <section className="panel-body">
             {label && (
                 <section className="panel-heading">

diff --git a/packages/uniforms-bootstrap3/src/components/fields/NestField.js b/packages/uniforms-bootstrap3/src/components/fields/NestField.js
@@ -1,34 +1,19 @@
-import React          from 'react';
-import {connectField} from 'uniforms';
-import {injectName}   from 'uniforms';
-import {joinName}     from 'uniforms';
+import React            from 'react';
+import {connectField}   from 'uniforms';
+import {filterDOMProps} from 'uniforms';
+import {injectName}     from 'uniforms';
+import {joinName}       from 'uniforms';
 
 import AutoField from './AutoField';
 
 const Nest = ({
-    changed,      // eslint-disable-line no-unused-vars
-    changedMap,   // eslint-disable-line no-unused-vars
     children,
-    disabled,     // eslint-disable-line no-unused-vars
-    error,        // eslint-disable-line no-unused-vars
-    errorMessage, // eslint-disable-line no-unused-vars
-    field,        // eslint-disable-line no-unused-vars
-    fieldType,    // eslint-disable-line no-unused-vars
     fields,
-    findError,    // eslint-disable-line no-unused-vars
-    findField,    // eslint-disable-line no-unused-vars
-    findValue,    // eslint-disable-line no-unused-vars
-    grid,         // eslint-disable-line no-unused-vars
-    id,           // eslint-disable-line no-unused-vars
     label,
     name,
-    onChange,     // eslint-disable-line no-unused-vars
-    parent,       // eslint-disable-line no-unused-vars
-    placeholder,  // eslint-disable-line no-unused-vars
-    value,        // eslint-disable-line no-unused-vars
     ...props
 }) =>
-    <section {...props}>
+    <section {...filterDOMProps(props)}>
         {label && (
             <label>
                 {label}