From 666240d955bcd22b95600bc7c2d2c99645d11e2b Mon Sep 17 00:00:00 2001 From: Gareth Jones Date: Wed, 18 Apr 2018 12:32:34 -0400 Subject: [PATCH 1/3] Add support for nodes as a proptype for errors. --- src/components/form/form.js | 2 +- src/components/form/form_row/form_row.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/form/form.js b/src/components/form/form.js index 41fccf7fd20..b596ddc7549 100644 --- a/src/components/form/form.js +++ b/src/components/form/form.js @@ -54,5 +54,5 @@ export const EuiForm = ({ EuiForm.propTypes = { isInvalid: PropTypes.bool, - error: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string)]), + error: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string), PropTypes.node]), }; diff --git a/src/components/form/form_row/form_row.js b/src/components/form/form_row/form_row.js index fefd9874166..2d69c7cd3de 100644 --- a/src/components/form/form_row/form_row.js +++ b/src/components/form/form_row/form_row.js @@ -150,7 +150,7 @@ EuiFormRow.propTypes = { label: PropTypes.node, id: PropTypes.string, isInvalid: PropTypes.bool, - error: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string)]), + error: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string), PropTypes.node]), helpText: PropTypes.node, hasEmptyLabelSpace: PropTypes.bool, fullWidth: PropTypes.bool, From e047033f8dac8687e8c31baa57703e512c56b28a Mon Sep 17 00:00:00 2001 From: Gareth Jones Date: Wed, 18 Apr 2018 12:42:35 -0400 Subject: [PATCH 2/3] Updating the changelog.md. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 391459e7fc5..a1454cb8b77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## [`master`](https://github.com/elastic/eui/tree/master) - Added `status` prop to `EuiStep` for additional styling ([#673](https://github.com/elastic/eui/pull/673)) +- Add support for node as a proptype for EuiForm and EuiFormRow errors. ([#685](https://github.com/elastic/eui/pull/685)) **Bug fixes** From 0befd36a5dfd08c2621b1e1355dc1cb69f5163d5 Mon Sep 17 00:00:00 2001 From: Gareth Jones Date: Wed, 18 Apr 2018 13:43:56 -0400 Subject: [PATCH 3/3] Updating code based on feedback. --- CHANGELOG.md | 2 +- src/components/form/form.js | 2 +- src/components/form/form_row/form_row.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1454cb8b77..9629e439cea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ ## [`master`](https://github.com/elastic/eui/tree/master) - Added `status` prop to `EuiStep` for additional styling ([#673](https://github.com/elastic/eui/pull/673)) -- Add support for node as a proptype for EuiForm and EuiFormRow errors. ([#685](https://github.com/elastic/eui/pull/685)) +- `EuiForm` and `EuiFormRow` now accept nodes for `errors` prop ([#685](https://github.com/elastic/eui/pull/685)) **Bug fixes** diff --git a/src/components/form/form.js b/src/components/form/form.js index b596ddc7549..0af76cc4d7b 100644 --- a/src/components/form/form.js +++ b/src/components/form/form.js @@ -54,5 +54,5 @@ export const EuiForm = ({ EuiForm.propTypes = { isInvalid: PropTypes.bool, - error: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string), PropTypes.node]), + error: PropTypes.oneOfType([PropTypes.node, PropTypes.arrayOf(PropTypes.node)]), }; diff --git a/src/components/form/form_row/form_row.js b/src/components/form/form_row/form_row.js index 2d69c7cd3de..2ef39080da0 100644 --- a/src/components/form/form_row/form_row.js +++ b/src/components/form/form_row/form_row.js @@ -150,7 +150,7 @@ EuiFormRow.propTypes = { label: PropTypes.node, id: PropTypes.string, isInvalid: PropTypes.bool, - error: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string), PropTypes.node]), + error: PropTypes.oneOfType([PropTypes.node, PropTypes.arrayOf(PropTypes.node)]), helpText: PropTypes.node, hasEmptyLabelSpace: PropTypes.bool, fullWidth: PropTypes.bool,