ywana-core8 0.1.22 → 0.1.23

package/dist/index.cjs

@@ -1865,19 +1865,19 @@ var ResetPasswordBox = function ResetPasswordBox(_ref) {
   function validateUser(user) {
     var error = "";
     var isValid = user && user.length > 0;
-    error = /*#__PURE__*/React__default["default"].createElement(Text, null, "User is required.");
+    if (!isValid) error = "User is required.";
     return [isValid, error];
   }
   function validateOldPassword(oldPassword) {
     var error = "";
     var isValid = oldPassword && oldPassword.length > 0;
-    error = /*#__PURE__*/React__default["default"].createElement(Text, null, "Old password is required.");
+    if (!isValid) error = "Old password is required.";
     return [isValid, error];
   }
   function validateNewPassword(password) {
     var hasPassword = password && password.length > 0;
     if (!hasPassword) {
-      var _error = /*#__PURE__*/React__default["default"].createElement(Text, null, "Password is required");
+      var _error = "Password is required";
       return [false, _error];
     }
     var _ref2 = validator && typeof validator === 'function' ? validator(password) : validatePassword(password),
@@ -1891,7 +1891,7 @@ var ResetPasswordBox = function ResetPasswordBox(_ref) {
   function validatePasswordsMatch(password1, password2) {
     var error = "";
     var isValid = password1 === password2;
-    error = /*#__PURE__*/React__default["default"].createElement(Text, null, "Passwords do not match.");
+    if (!isValid) error = "Passwords do not match.";
     return [isValid, error];
   }
   function validate(form) {
@@ -1949,6 +1949,7 @@ var ResetPasswordBox = function ResetPasswordBox(_ref) {
   var oldPasswordStyle = errors.oldPassword ? "error" : "";
   var password1Style = errors.password1 ? "error" : "";
   var password2Style = errors.password2 ? "error" : "";
+  console.log("ResetPasswordBox", errors);
   return /*#__PURE__*/React__default["default"].createElement("div", {
     className: "reset-password-box"
   }, /*#__PURE__*/React__default["default"].createElement("header", null, title ? /*#__PURE__*/React__default["default"].createElement("div", {
@@ -1966,7 +1967,7 @@ var ResetPasswordBox = function ResetPasswordBox(_ref) {
     onEnter: ok
   }) : null, userRequired ? errors.user ? /*#__PURE__*/React__default["default"].createElement("div", {
     className: "error-message"
-  }, errors.user) : null : null, oldPwdRequired ? /*#__PURE__*/React__default["default"].createElement(TextField, {
+  }, /*#__PURE__*/React__default["default"].createElement(Text, null, errors.user)) : null : null, oldPwdRequired ? /*#__PURE__*/React__default["default"].createElement(TextField, {
     id: "oldPassword",
     className: oldPasswordStyle,
     outlined: true,
@@ -1978,7 +1979,7 @@ var ResetPasswordBox = function ResetPasswordBox(_ref) {
     onEnter: ok
   }) : null, oldPwdRequired ? errors.oldPassword ? /*#__PURE__*/React__default["default"].createElement("div", {
     className: "error-message"
-  }, errors.oldPassword) : null : null, /*#__PURE__*/React__default["default"].createElement(TextField, {
+  }, /*#__PURE__*/React__default["default"].createElement(Text, null, errors.oldPassword)) : null : null, /*#__PURE__*/React__default["default"].createElement(TextField, {
     id: "password1",
     className: password1Style,
     outlined: true,
@@ -1990,7 +1991,7 @@ var ResetPasswordBox = function ResetPasswordBox(_ref) {
     onEnter: ok
   }), errors.password1 ? /*#__PURE__*/React__default["default"].createElement("div", {
     className: "error-message"
-  }, errors.password1) : null, children, /*#__PURE__*/React__default["default"].createElement(TextField, {
+  }, /*#__PURE__*/React__default["default"].createElement(Text, null, errors.password1)) : null, children, /*#__PURE__*/React__default["default"].createElement(TextField, {
     id: "password2",
     className: password2Style,
     outlined: true,
@@ -2002,7 +2003,7 @@ var ResetPasswordBox = function ResetPasswordBox(_ref) {
     onEnter: ok
   }), errors.password2 ? /*#__PURE__*/React__default["default"].createElement("div", {
     className: "error-message"
-  }, errors.password2) : null), /*#__PURE__*/React__default["default"].createElement("footer", null, /*#__PURE__*/React__default["default"].createElement(Button, {
+  }, /*#__PURE__*/React__default["default"].createElement(Text, null, errors.password2)) : null), /*#__PURE__*/React__default["default"].createElement("footer", null, /*#__PURE__*/React__default["default"].createElement(Button, {
     label: okLabel,
     raised: true,
     disabled: !isValid,