From bd657e297f11da49fefcede2feb5a4080d2350f1 Mon Sep 17 00:00:00 2001
From: Greg Thompson <thompson.glowe@gmail.com>
Date: Tue, 3 Dec 2019 09:54:31 -0600
Subject: [PATCH 1/3] remove id from row element

---
 src/components/form/form_row/__snapshots__/form_row.test.js.snap | 1 -
 src/components/form/form_row/form_row.js                         | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/form/form_row/__snapshots__/form_row.test.js.snap b/src/components/form/form_row/__snapshots__/form_row.test.js.snap
index 85b29410e9c..638705fb96f 100644
--- a/src/components/form/form_row/__snapshots__/form_row.test.js.snap
+++ b/src/components/form/form_row/__snapshots__/form_row.test.js.snap
@@ -462,7 +462,6 @@ exports[`EuiFormRow props helpText is rendered 1`] = `
 exports[`EuiFormRow props id is rendered 1`] = `
 <div
   class="euiFormRow"
-  id="id"
 >
   <div
     class="euiFormRow__fieldWrapper"
diff --git a/src/components/form/form_row/form_row.js b/src/components/form/form_row/form_row.js
index 59f6a4e2d08..4dbe90ff0d6 100644
--- a/src/components/form/form_row/form_row.js
+++ b/src/components/form/form_row/form_row.js
@@ -77,6 +77,7 @@ export class EuiFormRow extends Component {
       display,
       displayOnly,
       hasChildLabel,
+      id: propsId,
       ...rest
     } = this.props;
 

From 03f2f3b01603fa8771526a6188b58bacda5ccb11 Mon Sep 17 00:00:00 2001
From: Michail Yasonik <michail.yasonik@elastic.co>
Date: Tue, 3 Dec 2019 16:14:12 -0600
Subject: [PATCH 2/3] adding generated id to EuiFormRow wrapping element

---
 .../described_form_group.test.js.snap         |  1 +
 .../__snapshots__/form_row.test.js.snap       | 25 +++++++++++++++++++
 src/components/form/form_row/form_row.js      |  2 +-
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/components/form/described_form_group/__snapshots__/described_form_group.test.js.snap b/src/components/form/described_form_group/__snapshots__/described_form_group.test.js.snap
index b26ca92ce1b..4e1616848fe 100644
--- a/src/components/form/described_form_group/__snapshots__/described_form_group.test.js.snap
+++ b/src/components/form/described_form_group/__snapshots__/described_form_group.test.js.snap
@@ -335,6 +335,7 @@ exports[`EuiDescribedFormGroup ties together parts for accessibility 1`] = `
             >
               <div
                 className="euiFormRow"
+                id="generated-id-row"
               >
                 <div
                   className="euiFormRow__labelWrapper"
diff --git a/src/components/form/form_row/__snapshots__/form_row.test.js.snap b/src/components/form/form_row/__snapshots__/form_row.test.js.snap
index 638705fb96f..02e6ad2c932 100644
--- a/src/components/form/form_row/__snapshots__/form_row.test.js.snap
+++ b/src/components/form/form_row/__snapshots__/form_row.test.js.snap
@@ -16,6 +16,7 @@ exports[`EuiFormRow behavior onBlur is called in child 1`] = `
 >
   <div
     className="euiFormRow"
+    id="generated-id-row"
   >
     <div
       className="euiFormRow__labelWrapper"
@@ -65,6 +66,7 @@ exports[`EuiFormRow behavior onBlur works in parent even if not in child 1`] = `
 >
   <div
     className="euiFormRow"
+    id="generated-id-row"
   >
     <div
       className="euiFormRow__labelWrapper"
@@ -114,6 +116,7 @@ exports[`EuiFormRow behavior onFocus is called in child 1`] = `
 >
   <div
     className="euiFormRow"
+    id="generated-id-row"
   >
     <div
       className="euiFormRow__labelWrapper"
@@ -163,6 +166,7 @@ exports[`EuiFormRow behavior onFocus works in parent even if not in child 1`] =
 >
   <div
     className="euiFormRow"
+    id="generated-id-row"
   >
     <div
       className="euiFormRow__labelWrapper"
@@ -201,6 +205,7 @@ exports[`EuiFormRow is rendered 1`] = `
   aria-label="aria-label"
   class="euiFormRow testClass1 testClass2"
   data-test-subj="test subject string"
+  id="generated-id-row"
 >
   <div
     class="euiFormRow__fieldWrapper"
@@ -215,6 +220,7 @@ exports[`EuiFormRow is rendered 1`] = `
 exports[`EuiFormRow props compressed is rendered 1`] = `
 <div
   class="euiFormRow euiFormRow--compressed"
+  id="generated-id-row"
 >
   <div
     class="euiFormRow__fieldWrapper"
@@ -229,6 +235,7 @@ exports[`EuiFormRow props compressed is rendered 1`] = `
 exports[`EuiFormRow props describedByIds is rendered 1`] = `
 <div
   className="euiFormRow"
+  id="generated-id-row"
 >
   <div
     className="euiFormRow__fieldWrapper"
@@ -246,6 +253,7 @@ exports[`EuiFormRow props describedByIds is rendered 1`] = `
 exports[`EuiFormRow props display type center is rendered 1`] = `
 <div
   class="euiFormRow"
+  id="generated-id-row"
 >
   <div
     class="euiFormRow__fieldWrapper euiFormRow__fieldWrapperDisplayOnly"
@@ -260,6 +268,7 @@ exports[`EuiFormRow props display type center is rendered 1`] = `
 exports[`EuiFormRow props display type centerCompressed is rendered 1`] = `
 <div
   class="euiFormRow euiFormRow--compressed"
+  id="generated-id-row"
 >
   <div
     class="euiFormRow__fieldWrapper euiFormRow__fieldWrapperDisplayOnly"
@@ -274,6 +283,7 @@ exports[`EuiFormRow props display type centerCompressed is rendered 1`] = `
 exports[`EuiFormRow props display type columnCompressed is rendered 1`] = `
 <div
   class="euiFormRow euiFormRow--compressed euiFormRow--horizontal"
+  id="generated-id-row"
 >
   <div
     class="euiFormRow__fieldWrapper"
@@ -288,6 +298,7 @@ exports[`EuiFormRow props display type columnCompressed is rendered 1`] = `
 exports[`EuiFormRow props display type columnCompressedSwitch is rendered 1`] = `
 <div
   class="euiFormRow euiFormRow--compressed euiFormRow--horizontal euiFormRow--hasSwitch"
+  id="generated-id-row"
 >
   <div
     class="euiFormRow__fieldWrapper"
@@ -302,6 +313,7 @@ exports[`EuiFormRow props display type columnCompressedSwitch is rendered 1`] =
 exports[`EuiFormRow props display type row is rendered 1`] = `
 <div
   class="euiFormRow"
+  id="generated-id-row"
 >
   <div
     class="euiFormRow__fieldWrapper"
@@ -316,6 +328,7 @@ exports[`EuiFormRow props display type row is rendered 1`] = `
 exports[`EuiFormRow props display type rowCompressed is rendered 1`] = `
 <div
   class="euiFormRow euiFormRow--compressed"
+  id="generated-id-row"
 >
   <div
     class="euiFormRow__fieldWrapper"
@@ -330,6 +343,7 @@ exports[`EuiFormRow props display type rowCompressed is rendered 1`] = `
 exports[`EuiFormRow props displayOnly is rendered 1`] = `
 <div
   class="euiFormRow"
+  id="generated-id-row"
 >
   <div
     class="euiFormRow__fieldWrapper euiFormRow__fieldWrapperDisplayOnly"
@@ -346,6 +360,7 @@ exports[`EuiFormRow props displayOnly is rendered 1`] = `
 exports[`EuiFormRow props error as array is rendered 1`] = `
 <div
   class="euiFormRow"
+  id="generated-id-row"
 >
   <div
     class="euiFormRow__fieldWrapper"
@@ -375,6 +390,7 @@ exports[`EuiFormRow props error as array is rendered 1`] = `
 exports[`EuiFormRow props error as string is rendered 1`] = `
 <div
   class="euiFormRow"
+  id="generated-id-row"
 >
   <div
     class="euiFormRow__fieldWrapper"
@@ -397,6 +413,7 @@ exports[`EuiFormRow props error as string is rendered 1`] = `
 exports[`EuiFormRow props error is not rendered if isInvalid is false 1`] = `
 <div
   class="euiFormRow"
+  id="generated-id-row"
 >
   <div
     class="euiFormRow__fieldWrapper"
@@ -411,6 +428,7 @@ exports[`EuiFormRow props error is not rendered if isInvalid is false 1`] = `
 exports[`EuiFormRow props fullWidth is rendered 1`] = `
 <div
   class="euiFormRow euiFormRow--fullWidth"
+  id="generated-id-row"
 >
   <div
     class="euiFormRow__fieldWrapper"
@@ -425,6 +443,7 @@ exports[`EuiFormRow props fullWidth is rendered 1`] = `
 exports[`EuiFormRow props hasEmptyLabelSpace is rendered 1`] = `
 <div
   class="euiFormRow euiFormRow--hasEmptyLabelSpace"
+  id="generated-id-row"
 >
   <div
     class="euiFormRow__fieldWrapper"
@@ -439,6 +458,7 @@ exports[`EuiFormRow props hasEmptyLabelSpace is rendered 1`] = `
 exports[`EuiFormRow props helpText is rendered 1`] = `
 <div
   class="euiFormRow"
+  id="generated-id-row"
 >
   <div
     class="euiFormRow__fieldWrapper"
@@ -462,6 +482,7 @@ exports[`EuiFormRow props helpText is rendered 1`] = `
 exports[`EuiFormRow props id is rendered 1`] = `
 <div
   class="euiFormRow"
+  id="id-row"
 >
   <div
     class="euiFormRow__fieldWrapper"
@@ -476,6 +497,7 @@ exports[`EuiFormRow props id is rendered 1`] = `
 exports[`EuiFormRow props isInvalid is rendered 1`] = `
 <div
   class="euiFormRow"
+  id="generated-id-row"
 >
   <div
     class="euiFormRow__labelWrapper"
@@ -501,6 +523,7 @@ exports[`EuiFormRow props isInvalid is rendered 1`] = `
 exports[`EuiFormRow props label append is rendered 1`] = `
 <div
   className="euiFormRow"
+  id="generated-id-row"
 >
   <div
     className="euiFormRow__labelWrapper"
@@ -531,6 +554,7 @@ exports[`EuiFormRow props label append is rendered 1`] = `
 exports[`EuiFormRow props label is rendered 1`] = `
 <div
   className="euiFormRow"
+  id="generated-id-row"
 >
   <div
     className="euiFormRow__labelWrapper"
@@ -559,6 +583,7 @@ exports[`EuiFormRow props label is rendered 1`] = `
 exports[`EuiFormRow props label renders as a legend and subsquently a fieldset wrapper 1`] = `
 <fieldset
   className="euiFormRow"
+  id="generated-id-row"
 >
   <div
     className="euiFormRow__labelWrapper"
diff --git a/src/components/form/form_row/form_row.js b/src/components/form/form_row/form_row.js
index 4dbe90ff0d6..b67d4bcb793 100644
--- a/src/components/form/form_row/form_row.js
+++ b/src/components/form/form_row/form_row.js
@@ -190,7 +190,7 @@ export class EuiFormRow extends Component {
     const Element = labelType === 'legend' ? 'fieldset' : 'div';
 
     return (
-      <Element className={classes} {...rest}>
+      <Element className={classes} id={`${id}-row`} {...rest}>
         {optionalLabel}
         <div className={fieldWrapperClasses}>
           {field}

From 26e4a59a59023235a26812cd8bc95c4321e26a80 Mon Sep 17 00:00:00 2001
From: Greg Thompson <thompson.glowe@gmail.com>
Date: Wed, 4 Dec 2019 10:10:03 -0600
Subject: [PATCH 3/3] CL

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97b9c03e478..2935dec5969 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 ## [`master`](https://github.com/elastic/eui/tree/master)
 
-No public interface changes since `16.2.0`.
+**Breaking changes**
+
+- Changed to generated `id` value for `EuiFormRow` to ensure uniqueness  ([#2588](https://github.com/elastic/eui/pull/2588))
 
 ## [`16.2.0`](https://github.com/elastic/eui/tree/v16.2.0)