merged #50

formsy · May 22, 2018 · ab91b0b · ab91b0b
2 parents 957d7e6 + 42dbcfb
commit ab91b0b
Show file tree

Hide file tree

Showing 22 changed files with 67 additions and 78 deletions.
diff --git a/lib/Wrapper.js b/lib/Wrapper.js
@@ -232,23 +232,23 @@ exports.default = function (Component) {
       value: function render() {
         var innerRef = this.props.innerRef;
 
-        var propsForElement = _extends({
-          getErrorMessage: this.getErrorMessage,
-          getErrorMessages: this.getErrorMessages,
-          getValue: this.getValue,
-          hasValue: this.hasValue,
-          isFormDisabled: this.isFormDisabled,
-          isValid: this.isValid,
-          isPristine: this.isPristine,
-          isFormSubmitted: this.isFormSubmitted,
-          isRequired: this.isRequired,
+        var propsForElement = _extends({}, this.props, {
+          errorMessage: this.getErrorMessage(),
+          errorMessages: this.getErrorMessages(),
+          hasValue: this.hasValue(),
+          isFormDisabled: this.isFormDisabled(),
+          isFormSubmitted: this.isFormSubmitted(),
+          isPristine: this.isPristine(),
+          isRequired: this.isRequired(),
+          isValid: this.isValid(),
           isValidValue: this.isValidValue,
           resetValue: this.resetValue,
           setValidations: this.setValidations,
           setValue: this.setValue,
-          showRequired: this.showRequired,
-          showError: this.showError
-        }, this.props);
+          showError: this.showError(),
+          showRequired: this.showRequired(),
+          value: this.getValue()
+        });
 
         if (innerRef) {
           propsForElement.ref = innerRef;

diff --git a/release/formsy-react.js b/release/formsy-react.js
diff --git a/release/formsy-react.js.map b/release/formsy-react.js.map
diff --git a/src/Wrapper.js b/src/Wrapper.js
@@ -175,22 +175,22 @@ export default (Component) => {
     render() {
       const { innerRef } = this.props;
       const propsForElement = {
-        getErrorMessage: this.getErrorMessage,
-        getErrorMessages: this.getErrorMessages,
-        getValue: this.getValue,
-        hasValue: this.hasValue,
-        isFormDisabled: this.isFormDisabled,
-        isValid: this.isValid,
-        isPristine: this.isPristine,
-        isFormSubmitted: this.isFormSubmitted,
-        isRequired: this.isRequired,
+        ...this.props,
+        errorMessage: this.getErrorMessage(),
+        errorMessages: this.getErrorMessages(),
+        hasValue: this.hasValue(),
+        isFormDisabled: this.isFormDisabled(),
+        isFormSubmitted: this.isFormSubmitted(),
+        isPristine: this.isPristine(),
+        isRequired: this.isRequired(),
+        isValid: this.isValid(),
         isValidValue: this.isValidValue,
         resetValue: this.resetValue,
         setValidations: this.setValidations,
         setValue: this.setValue,
-        showRequired: this.showRequired,
-        showError: this.showError,
-        ...this.props,
+        showError: this.showError(),
+        showRequired: this.showRequired(),
+        value: this.getValue(),
       };
 
       if (innerRef) {

diff --git a/tests/Element-spec.js b/tests/Element-spec.js
@@ -9,7 +9,7 @@ import immediate from './utils/immediate';
 
 export default {
 
-  'should return passed and setValue() value when using getValue()': function (test) {
+  'should pass down correct value prop after using setValue()': function (test) {
 
     const form = TestUtils.renderIntoDocument(
       <Formsy>
@@ -33,7 +33,7 @@ export default {
             this.props.setValue(event.target.value, false);
         }
         render() {
-            return <input type="text" value={this.props.getValue()} onChange={this.updateValue}/>;
+            return <input type="text" value={this.props.value} onChange={this.updateValue}/>;
         }
     })
     const form = TestUtils.renderIntoDocument(
@@ -60,7 +60,7 @@ export default {
             this.props.setValue(event.target.value, false);
         }
         render() {
-            return <input type="text" value={this.props.getValue()} onChange={this.updateValue}/>;
+            return <input type="text" value={this.props.value} onChange={this.updateValue}/>;
         }
     })
     const form = TestUtils.renderIntoDocument(
@@ -105,10 +105,10 @@ export default {
 
   'should return error message passed when calling getErrorMessage()': function (test) {
 
-    let getErrorMessage = null;
+    let errorMessage = null;
     const Input = InputFactory({
       componentDidMount: function() {
-        getErrorMessage = this.props.getErrorMessage;
+        errorMessage = this.props.errorMessage;
       }
     });
     TestUtils.renderIntoDocument(
@@ -117,7 +117,7 @@ export default {
       </Formsy>
     );
 
-    test.equal(getErrorMessage(), 'Has to be email');
+    test.equal(errorMessage, 'Has to be email');
 
     test.done();
 
@@ -127,8 +127,8 @@ export default {
 
     let isValid = null;
     const Input = InputFactory({
-      componentDidMount: function() {
-        isValid = this.props.isValid;
+      componentWillReceiveProps: function(nextProps) {
+        isValid = nextProps.isValid;
       }
     });
     const form = TestUtils.renderIntoDocument(
@@ -137,10 +137,10 @@ export default {
       </Formsy>
     );
 
-    test.equal(isValid(), false);
+    test.equal(isValid, false);
     const input = TestUtils.findRenderedDOMComponentWithTag(form, 'INPUT');
     TestUtils.Simulate.change(input, {target: {value: '[email protected]'}});
-    test.equal(isValid(), true);
+    test.equal(isValid, true);
 
     test.done();
 
@@ -162,9 +162,9 @@ export default {
       </Formsy>
     );
 
-    test.equal(isRequireds[0](), false);
-    test.equal(isRequireds[1](), true);
-    test.equal(isRequireds[2](), true);
+    test.equal(isRequireds[0], false);
+    test.equal(isRequireds[1], true);
+    test.equal(isRequireds[2], true);
 
     test.done();
 
@@ -186,9 +186,9 @@ export default {
       </Formsy>
     );
 
-    test.equal(showRequireds[0](), false);
-    test.equal(showRequireds[1](), true);
-    test.equal(showRequireds[2](), false);
+    test.equal(showRequireds[0], false);
+    test.equal(showRequireds[1], true);
+    test.equal(showRequireds[2], false);
 
     test.done();
 
@@ -198,8 +198,8 @@ export default {
 
     let isPristine = null;
     const Input = InputFactory({
-      componentDidMount: function() {
-        isPristine = this.props.isPristine;
+      componentWillReceiveProps: function(nextProps) {
+        isPristine = nextProps.isPristine;
       }
     });
     const form = TestUtils.renderIntoDocument(
@@ -208,10 +208,10 @@ export default {
       </Formsy>
     );
 
-    test.equal(isPristine(), true);
+    test.equal(isPristine, true);
     const input = TestUtils.findRenderedDOMComponentWithTag(form, 'INPUT');
     TestUtils.Simulate.change(input, {target: {value: 'foo'}});
-    test.equal(isPristine(), false);
+    test.equal(isPristine, false);
 
     test.done();
 
@@ -594,7 +594,7 @@ export default {
       shouldComponentUpdate: function() { return false },
       render: function() {
         renderSpy();
-        return <input type={this.props.type} value={this.props.getValue()} onChange={this.updateValue}/>;
+        return <input type={this.props.type} value={this.props.value} onChange={this.updateValue}/>;
       }
     });
 
@@ -613,21 +613,10 @@ export default {
   'binds all necessary methods': function (test) {
     const onInputRef = input => {
       [
-        'getErrorMessage',
-        'getErrorMessages',
-        'getValue',
-        'hasValue',
-        'isFormDisabled',
-        'isValid',
-        'isPristine',
-        'isFormSubmitted',
-        'isRequired',
         'isValidValue',
         'resetValue',
         'setValidations',
         'setValue',
-        'showRequired',
-        'showError',
       ].forEach(fnName => {
         const fn = input[fnName];
         try {

diff --git a/tests/Rules-equals-spec.js b/tests/Rules-equals-spec.js
@@ -7,7 +7,7 @@ import { InputFactory } from './utils/TestInput';
 
 const TestInput = InputFactory({
   render: function() {
-    return <input value={this.props.getValue()} readOnly />;
+    return <input value={this.props.value} readOnly />;
   }
 });
 

diff --git a/tests/Rules-isAlpha-spec.js b/tests/Rules-isAlpha-spec.js
@@ -6,7 +6,7 @@ import { InputFactory } from './utils/TestInput';
 
 const TestInput = InputFactory({
   render: function() {
-    return <input value={this.props.getValue()} readOnly />;
+    return <input value={this.props.value} readOnly />;
   }
 });
 

diff --git a/tests/Rules-isAlphanumeric-spec.js b/tests/Rules-isAlphanumeric-spec.js
@@ -6,7 +6,7 @@ import { InputFactory } from './utils/TestInput';
 
 const TestInput = InputFactory({
   render() {
-    return <input value={this.props.getValue()} readOnly/>;
+    return <input value={this.props.value} readOnly/>;
   }
 });
 

diff --git a/tests/Rules-isEmail-spec.js b/tests/Rules-isEmail-spec.js
@@ -6,7 +6,7 @@ import { InputFactory } from './utils/TestInput';
 
 const TestInput = InputFactory({
   render() {
-    return <input value={this.props.getValue()} readOnly/>;
+    return <input value={this.props.value} readOnly/>;
   }
 });
 

diff --git a/tests/Rules-isEmptyString-spec.js b/tests/Rules-isEmptyString-spec.js
@@ -6,7 +6,7 @@ import { InputFactory } from './utils/TestInput';
 
 const TestInput = InputFactory({
   render() {
-    return <input value={this.props.getValue()} readOnly/>;
+    return <input value={this.props.value} readOnly/>;
   }
 });
 

diff --git a/tests/Rules-isExisty-spec.js b/tests/Rules-isExisty-spec.js
@@ -6,7 +6,7 @@ import { InputFactory } from './utils/TestInput';
 
 const TestInput = InputFactory({
   render() {
-    return <input value={this.props.getValue()} readOnly/>;
+    return <input value={this.props.value} readOnly/>;
   }
 });
 

diff --git a/tests/Rules-isFloat-spec.js b/tests/Rules-isFloat-spec.js
@@ -6,7 +6,7 @@ import { InputFactory } from './utils/TestInput';
 
 const TestInput = InputFactory({
   render() {
-    return <input value={this.props.getValue()} readOnly/>;
+    return <input value={this.props.value} readOnly/>;
   }
 });
 

diff --git a/tests/Rules-isInt-spec.js b/tests/Rules-isInt-spec.js
@@ -6,7 +6,7 @@ import { InputFactory } from './utils/TestInput';
 
 const TestInput = InputFactory({
   render() {
-    return <input value={this.props.getValue()} readOnly/>;
+    return <input value={this.props.value} readOnly/>;
   }
 });
 

diff --git a/tests/Rules-isLength-spec.js b/tests/Rules-isLength-spec.js
@@ -6,7 +6,7 @@ import { InputFactory } from './utils/TestInput';
 
 const TestInput = InputFactory({
   render() {
-    return <input value={this.props.getValue()} readOnly/>;
+    return <input value={this.props.value} readOnly/>;
   }
 });
 

diff --git a/tests/Rules-isNumeric-spec.js b/tests/Rules-isNumeric-spec.js
@@ -6,7 +6,7 @@ import { InputFactory } from './utils/TestInput';
 
 const TestInput = InputFactory({
   render() {
-    return <input value={this.props.getValue()} readOnly/>;
+    return <input value={this.props.value} readOnly/>;
   }
 });
 

diff --git a/tests/Rules-isUrl-spec.js b/tests/Rules-isUrl-spec.js
@@ -6,7 +6,7 @@ import { InputFactory } from './utils/TestInput';
 
 const TestInput = InputFactory({
   render() {
-    return <input value={this.props.getValue()} readOnly/>;
+    return <input value={this.props.value} readOnly/>;
   }
 });
 

diff --git a/tests/Rules-isWords-spec.js b/tests/Rules-isWords-spec.js
@@ -6,7 +6,7 @@ import { InputFactory } from './utils/TestInput';
 
 const TestInput = InputFactory({
   render() {
-    return <input value={this.props.getValue()} readOnly/>;
+    return <input value={this.props.value} readOnly/>;
   }
 });
 

diff --git a/tests/Rules-maxLength-spec.js b/tests/Rules-maxLength-spec.js
@@ -6,7 +6,7 @@ import { InputFactory } from './utils/TestInput';
 
 const TestInput = InputFactory({
   render() {
-    return <input value={this.props.getValue()} readOnly/>;
+    return <input value={this.props.value} readOnly/>;
   }
 });
 

diff --git a/tests/Rules-minLength-spec.js b/tests/Rules-minLength-spec.js
@@ -6,7 +6,7 @@ import { InputFactory } from './utils/TestInput';
 
 const TestInput = InputFactory({
   render() {
-    return <input value={this.props.getValue()} readOnly/>;
+    return <input value={this.props.value} readOnly/>;
   }
 });
 

diff --git a/tests/Validation-spec.js b/tests/Validation-spec.js
@@ -14,7 +14,7 @@ class MyTest extends React.Component {
     }
 
     render() {
-      return <input type={this.props.type} value={this.props.getValue()} onChange={this.handleChange}/>;
+      return <input type={this.props.type} value={this.props.value} onChange={this.handleChange}/>;
     }
 }
 const FormsyTest = withFormsy(MyTest);
@@ -125,7 +125,7 @@ export default {
     let isValid = false;
     const CustomInput = InputFactory({
       componentDidMount: function() {
-        isValid = this.props.isValid();
+        isValid = this.props.isValid;
       }
     });
     const form = TestUtils.renderIntoDocument(

diff --git a/tests/ValidationDeprecated-spec.js b/tests/ValidationDeprecated-spec.js
@@ -14,7 +14,7 @@ class MyTest extends React.Component {
     }
 
     render() {
-      return <input type={this.props.type} value={this.props.getValue()} onChange={this.handleChange}/>;
+      return <input type={this.props.type} value={this.props.value} onChange={this.handleChange}/>;
     }
 }
 const FormsyTest = Wrapper(MyTest);
@@ -108,7 +108,7 @@ export default {
     let isValid = false;
     const CustomInput = InputFactory({
       componentDidMount: function() {
-        isValid = this.props.isValid();
+        isValid = this.props.isValid;
       }
     });
     const form = TestUtils.renderIntoDocument(

diff --git a/tests/utils/TestInput.js b/tests/utils/TestInput.js
@@ -9,7 +9,7 @@ class TestInput extends React.Component {
     }
 
     render() {
-        return <input type={this.props.type} value={this.props.getValue()} onChange={this.updateValue}/>;
+        return <input type={this.props.type} value={this.props.value} onChange={this.updateValue}/>;
     }
 }