From ac301f89508ee3d0fca15f037d56fcf916c99abb Mon Sep 17 00:00:00 2001
From: CT Wu <wu.chingting@gmail.com>
Date: Thu, 19 Jan 2017 05:31:02 +0800
Subject: [PATCH] fix: show the default validation message when there is a
 required error (#386)

* Show the default validation error message when required is invalid

* Fix showError
---
 src/Mixin.js | 2 +-
 src/main.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Mixin.js b/src/Mixin.js
index d615fc7..4568815 100644
--- a/src/Mixin.js
+++ b/src/Mixin.js
@@ -166,7 +166,7 @@ module.exports = {
     return this.state._isRequired;
   },
   showError: function () {
-    return !this.showRequired() && !this.isValid();
+    return this.showRequired() && !this.isValid();
   },
   isValidValue: function (value) {
     return this.context.formsy.isValidValue.call(null, this, value);
diff --git a/src/main.js b/src/main.js
index f7b5e8e..6043583 100644
--- a/src/main.js
+++ b/src/main.js
@@ -278,7 +278,7 @@ Formsy.Form = React.createClass({
         }
 
         if (isRequired) {
-          var error = validationErrors[requiredResults.success[0]];
+          var error = validationErrors[requiredResults.success[0]] || validationError;
           return error ? [error] : null;
         }