@hyphen/hyphen-components 2.15.2 → 2.15.3

package/dist/hyphen-components.esm.js

@@ -2329,9 +2329,8 @@ var SelectInput = function SelectInput(_ref) {
   })), error && typeof error !== 'boolean' && React.createElement(InputValidationMessage, null, error));
 };
 
-var _excluded$j = ["field", "form", "onChange", "id", "label", "options"];
+var _excluded$j = ["field", "form", "onChange", "id", "label", "options", "error"];
 var FormikSelectInput = function FormikSelectInput(_ref) {
-  var _errorMessage$label;
   var _ref$field = _ref.field,
     name = _ref$field.name,
     onBlur = _ref$field.onBlur,
@@ -2344,11 +2343,18 @@ var FormikSelectInput = function FormikSelectInput(_ref) {
     id = _ref.id,
     label = _ref.label,
     options = _ref.options,
+    errorProp = _ref.error,
     props = _objectWithoutPropertiesLoose(_ref, _excluded$j);
-  var error = getIn(errors, name);
-  var errorMessage = typeof error !== 'string' && (error == null ? void 0 : error.find(function (error) {
-    return error == null ? void 0 : error.label;
-  }));
+  var errorMessage;
+  var error = errorProp != null ? errorProp : getIn(touched, name) && getIn(errors, name);
+  if (typeof error === 'string') {
+    errorMessage = error;
+  } else if (error && typeof error !== 'string') {
+    var _error$find;
+    errorMessage = error == null || (_error$find = error.find(function (err) {
+      return err == null ? void 0 : err.label;
+    })) == null ? void 0 : _error$find.label;
+  }
   return React.createElement(SelectInput, _extends({
     id: id,
     label: label,
@@ -2357,7 +2363,7 @@ var FormikSelectInput = function FormikSelectInput(_ref) {
     onBlur: onBlur,
     onChange: onChange != null ? onChange : formikOnChange,
     value: value,
-    error: (_errorMessage$label = errorMessage == null ? void 0 : errorMessage.label) != null ? _errorMessage$label : getIn(touched, name) && error
+    error: errorMessage
   }, props));
 };