Merge branch 'release/2.0.0-alpha.3'

twisty · Sep 11, 2019 · db069ca · db069ca
2 parents cef6609 + 6afea95
commit db069ca
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "formsy-react-components",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.3",
   "description": "Bootstrap components for a formsy-react form.",
   "scripts": {
     "test": "jest",
@@ -37,7 +37,7 @@
     "url": "https://github.com/twisty/formsy-react-components/issues"
   },
   "peerDependencies": {
-    "formsy-react": "^2.0.0-beta.2",
+    "formsy-react": "formsy/formsy-react#cbce6b1",
     "react": "^16.3.0"
   },
   "dependencies": {
@@ -62,7 +62,7 @@
     "eslint-plugin-jsx-a11y": "^6.2.1",
     "eslint-plugin-prettier": "^3.0.0",
     "eslint-plugin-react": "^7.14.2",
-    "formsy-react": "^2.0.0-beta.2",
+    "formsy-react": "formsy/formsy-react#cbce6b1",
     "gh-pages": "^2.0.0",
     "jest": "^24.1.0",
     "prettier": "^1.6.1",

diff --git a/src/components/select.tsx b/src/components/select.tsx
@@ -1,4 +1,5 @@
 import * as React from 'react';
+import classNames from 'classnames/dedupe';
 import {componentDefaultProps} from './component-common';
 import ErrorMessages from './error-messages';
 import Help from './help';
@@ -47,21 +48,26 @@ class Select extends React.Component<SelectProps, {}> {
 
   public render(): JSX.Element {
     const {
+      className,
       errorMessages,
       help,
       id,
       layout,
       name,
+      required,
       showErrors,
       ...inputProps
     } = this.props;
     Object.keys(componentDefaultProps).forEach((key): void => {
       delete inputProps[key];
     });
 
+    const markAsInvalid = showErrors && (errorMessages.length > 0 || required);
+
     const control = (
       <SelectControl
         {...inputProps}
+        className={classNames(markAsInvalid ? ['is-invalid', className] : className)}
         elementRef={this.props.elementRef}
         id={id}
         name={name}

diff --git a/yarn.lock b/yarn.lock
@@ -2828,10 +2828,9 @@ form-data@~2.3.2:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
-formsy-react@^2.0.0-beta.2:
+formsy-react@formsy/formsy-react#cbce6b1:
   version "2.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/formsy-react/-/formsy-react-2.0.0-beta.4.tgz#14c95f26c2d607f1d1a447362680e73a692d20b3"
-  integrity sha512-6o42LbZ6IO8UQIBGQaOoo0yjYfr1rDSv2fKNgRXZHQTGWoZU8vnBe7RttCCIxYp5AeTO67A86SGiAmsKsqh+/A==
+  resolved "https://codeload.github.com/formsy/formsy-react/tar.gz/cbce6b1f7ff8b3721ccf22d05f3aba0b7c9185f4"
   dependencies:
     form-data-to-object "^0.2.0"
     prop-types "^15.7.2"