diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ff86fb1..6fa3bec5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
### Added
- Added support for React 18
- `Form` - Added placeholder option for datepicker
+- `Form` - Added description option for select
+- `Form` - Added error description option for select
+- `Form` - Added error description option for datepicker
### Fixed
- Made sure no extra space is created when flyout is closed
diff --git a/packages/form/Readme.md b/packages/form/Readme.md
index bc868f41..59d45b1d 100644
--- a/packages/form/Readme.md
+++ b/packages/form/Readme.md
@@ -323,6 +323,7 @@ const optionsDistrict = [
{description && {description}}
+ {errorDescription && {errorDescription}}
;
}
diff --git a/packages/form/src/Select/Select.js b/packages/form/src/Select/Select.js
index da739c99..9e5caabb 100644
--- a/packages/form/src/Select/Select.js
+++ b/packages/form/src/Select/Select.js
@@ -31,6 +31,8 @@ type Props = {
required?: boolean,
loading?: boolean,
placeholder?: string,
+ description?: string,
+ errorDescription?: string,
options?: Array,
onChange?: (e: object) => void,
value?: string,
@@ -51,6 +53,8 @@ class Select extends Component {
id,
label,
name,
+ description,
+ errorDescription,
inline,
className,
state,
@@ -103,6 +107,8 @@ class Select extends Component {
))}
+ {description ? {description} : null}
+ {errorDescription && {errorDescription}}
{loading ? : }