From f5a3e2374b169cd6c0b46a7084eb5085648d6332 Mon Sep 17 00:00:00 2001
From: Anish Aggarwal <anish17122000@gmail.com>
Date: Thu, 12 Mar 2020 12:16:12 +0530
Subject: [PATCH 1/9] added enter key functionality

---
 CHANGELOG.md                                              | 1 +
 .../__snapshots__/super_date_picker.test.js.snap          | 1 +
 .../date_picker/super_date_picker/super_date_picker.js    | 8 ++++++++
 3 files changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c55b85bcab9..9299e6cbe3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## [`master`](https://github.com/elastic/eui/tree/master)
 
+- Added `Enter` key press functionality to `EuiSuperDatePicker` ([#3043](https://github.com/elastic/eui/pull/3043))
 - Exported `dateFormatAliases` as a part of the public API ([#3043](https://github.com/elastic/eui/pull/3043))
 - Exported `EuiTextProps` type definition ([#3039](https://github.com/elastic/eui/pull/3039))
 - Removed `role` attribute from `EuiImage`([#3036](https://github.com/elastic/eui/pull/3036))
diff --git a/src/components/date_picker/super_date_picker/__snapshots__/super_date_picker.test.js.snap b/src/components/date_picker/super_date_picker/__snapshots__/super_date_picker.test.js.snap
index 391b5637789..eeaaddf75d5 100644
--- a/src/components/date_picker/super_date_picker/__snapshots__/super_date_picker.test.js.snap
+++ b/src/components/date_picker/super_date_picker/__snapshots__/super_date_picker.test.js.snap
@@ -4,6 +4,7 @@ exports[`EuiSuperDatePicker is rendered 1`] = `
 <EuiFlexGroup
   className="euiSuperDatePicker__flexWrapper"
   gutterSize="s"
+  onKeyPress={[Function]}
   responsive={false}
 >
   <EuiFlexItem>
diff --git a/src/components/date_picker/super_date_picker/super_date_picker.js b/src/components/date_picker/super_date_picker/super_date_picker.js
index 5ad5c5fe5c6..7f99e8ec389 100644
--- a/src/components/date_picker/super_date_picker/super_date_picker.js
+++ b/src/components/date_picker/super_date_picker/super_date_picker.js
@@ -312,6 +312,7 @@ export class EuiSuperDatePicker extends Component {
           isCustom
           startDateControl={<div />}
           endDateControl={<div />}
+          onKeyPress={this.handleKeyPress}
           readOnly>
           <span className="euiSuperDatePicker__prettyFormat">
             {prettyInterval(this.props.isPaused, this.props.refreshInterval)}
@@ -412,6 +413,12 @@ export class EuiSuperDatePicker extends Component {
     }
   };
 
+  handleKeyPress = event => {
+    if (event.key === 'Enter') {
+      this.handleClickUpdateButton();
+    }
+  };
+
   renderUpdateButton = () => {
     if (!this.props.showUpdateButton || this.props.isAutoRefreshOnly) {
       return;
@@ -461,6 +468,7 @@ export class EuiSuperDatePicker extends Component {
       <EuiFlexGroup
         gutterSize="s"
         responsive={false}
+        onKeyPress={this.handleKeyPress}
         className={flexWrapperClasses}>
         <EuiFlexItem>
           <EuiFormControlLayout

From 60cd9b7b61d937fcd2f9a513e5c9191b6cbdbac6 Mon Sep 17 00:00:00 2001
From: Anish Aggarwal <43617894+anishagg17@users.noreply.github.com>
Date: Thu, 12 Mar 2020 12:18:15 +0530
Subject: [PATCH 2/9] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9299e6cbe3b..8905af768b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## [`master`](https://github.com/elastic/eui/tree/master)
 
-- Added `Enter` key press functionality to `EuiSuperDatePicker` ([#3043](https://github.com/elastic/eui/pull/3043))
+- Added `Enter` key press functionality to `EuiSuperDatePicker` ([#3048](https://github.com/elastic/eui/pull/3048))
 - Exported `dateFormatAliases` as a part of the public API ([#3043](https://github.com/elastic/eui/pull/3043))
 - Exported `EuiTextProps` type definition ([#3039](https://github.com/elastic/eui/pull/3039))
 - Removed `role` attribute from `EuiImage`([#3036](https://github.com/elastic/eui/pull/3036))

From 4338b18d028d6fc3e2a6870ed3436532870f048f Mon Sep 17 00:00:00 2001
From: Anish Aggarwal <anish17122000@gmail.com>
Date: Fri, 13 Mar 2020 02:06:01 +0530
Subject: [PATCH 3/9] added it more strictly

---
 .../quick_select_popover/quick_select.js                 | 8 ++++++--
 .../quick_select_popover/refresh_interval.js             | 8 ++++++--
 .../date_picker/super_date_picker/super_date_picker.js   | 9 ---------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/components/date_picker/super_date_picker/quick_select_popover/quick_select.js b/src/components/date_picker/super_date_picker/quick_select_popover/quick_select.js
index 082760bd7bc..7a76dc2e052 100644
--- a/src/components/date_picker/super_date_picker/quick_select_popover/quick_select.js
+++ b/src/components/date_picker/super_date_picker/quick_select_popover/quick_select.js
@@ -57,6 +57,10 @@ export class EuiQuickSelect extends Component {
     });
   };
 
+  handelKeyDown = ({ key }) => {
+    if (key === 'Enter') this.applyQuickSelect();
+  };
+
   applyQuickSelect = () => {
     const { timeTense, timeValue, timeUnits } = this.state;
 
@@ -122,7 +126,7 @@ export class EuiQuickSelect extends Component {
     const legendId = this.generateId();
 
     return (
-      <fieldset>
+      <div onKeyDown={this.handelKeyDown}>
         <EuiI18n
           token="euiQuickSelect.legendText"
           default="Quick select a time range">
@@ -257,7 +261,7 @@ export class EuiQuickSelect extends Component {
             />
           </p>
         </EuiScreenReaderOnly>
-      </fieldset>
+      </div>
     );
   }
 }
diff --git a/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js b/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js
index 469433436b1..216514c6c60 100644
--- a/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js
+++ b/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js
@@ -90,6 +90,10 @@ export class EuiRefreshInterval extends Component {
     );
   };
 
+  handelKeyDown = ({ key }) => {
+    if (key === 'Enter') this.toogleRefresh();
+  };
+
   applyRefreshInterval = () => {
     if (this.state.value === '') {
       return;
@@ -123,7 +127,7 @@ export class EuiRefreshInterval extends Component {
     }
 
     return (
-      <fieldset>
+      <div onKeyDown={this.handelKeyDown}>
         <EuiTitle size="xxxs">
           <legend id={legendId}>
             <EuiI18n
@@ -186,7 +190,7 @@ export class EuiRefreshInterval extends Component {
             />
           </p>
         </EuiScreenReaderOnly>
-      </fieldset>
+      </div>
     );
   }
 }
diff --git a/src/components/date_picker/super_date_picker/super_date_picker.js b/src/components/date_picker/super_date_picker/super_date_picker.js
index 7f99e8ec389..790e8fe6d77 100644
--- a/src/components/date_picker/super_date_picker/super_date_picker.js
+++ b/src/components/date_picker/super_date_picker/super_date_picker.js
@@ -312,7 +312,6 @@ export class EuiSuperDatePicker extends Component {
           isCustom
           startDateControl={<div />}
           endDateControl={<div />}
-          onKeyPress={this.handleKeyPress}
           readOnly>
           <span className="euiSuperDatePicker__prettyFormat">
             {prettyInterval(this.props.isPaused, this.props.refreshInterval)}
@@ -413,12 +412,6 @@ export class EuiSuperDatePicker extends Component {
     }
   };
 
-  handleKeyPress = event => {
-    if (event.key === 'Enter') {
-      this.handleClickUpdateButton();
-    }
-  };
-
   renderUpdateButton = () => {
     if (!this.props.showUpdateButton || this.props.isAutoRefreshOnly) {
       return;
@@ -468,7 +461,6 @@ export class EuiSuperDatePicker extends Component {
       <EuiFlexGroup
         gutterSize="s"
         responsive={false}
-        onKeyPress={this.handleKeyPress}
         className={flexWrapperClasses}>
         <EuiFlexItem>
           <EuiFormControlLayout
@@ -478,7 +470,6 @@ export class EuiSuperDatePicker extends Component {
             {this.renderDatePickerRange()}
           </EuiFormControlLayout>
         </EuiFlexItem>
-
         {this.renderUpdateButton()}
       </EuiFlexGroup>
     );

From 2aa0e8cc030725c65cb909d6f78daa061f27320a Mon Sep 17 00:00:00 2001
From: Anish Aggarwal <anish17122000@gmail.com>
Date: Sat, 14 Mar 2020 02:00:19 +0530
Subject: [PATCH 4/9] restored fieldset , removed typos

---
 .../__snapshots__/super_date_picker.test.js.snap    |  1 -
 .../__snapshots__/quick_select.test.js.snap         |  8 ++++++--
 .../quick_select_popover/quick_select.js            |  7 ++++---
 .../quick_select_popover/refresh_interval.js        | 13 +++++++------
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/components/date_picker/super_date_picker/__snapshots__/super_date_picker.test.js.snap b/src/components/date_picker/super_date_picker/__snapshots__/super_date_picker.test.js.snap
index eeaaddf75d5..391b5637789 100644
--- a/src/components/date_picker/super_date_picker/__snapshots__/super_date_picker.test.js.snap
+++ b/src/components/date_picker/super_date_picker/__snapshots__/super_date_picker.test.js.snap
@@ -4,7 +4,6 @@ exports[`EuiSuperDatePicker is rendered 1`] = `
 <EuiFlexGroup
   className="euiSuperDatePicker__flexWrapper"
   gutterSize="s"
-  onKeyPress={[Function]}
   responsive={false}
 >
   <EuiFlexItem>
diff --git a/src/components/date_picker/super_date_picker/quick_select_popover/__snapshots__/quick_select.test.js.snap b/src/components/date_picker/super_date_picker/quick_select_popover/__snapshots__/quick_select.test.js.snap
index 5edeb5a2be3..a0a43ef1871 100644
--- a/src/components/date_picker/super_date_picker/quick_select_popover/__snapshots__/quick_select.test.js.snap
+++ b/src/components/date_picker/super_date_picker/quick_select_popover/__snapshots__/quick_select.test.js.snap
@@ -1,7 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`EuiQuickSelect is rendered 1`] = `
-<fieldset>
+<fieldset
+  onKeyDown={[Function]}
+>
   <EuiI18n
     default="Quick select a time range"
     token="euiQuickSelect.legendText"
@@ -127,7 +129,9 @@ exports[`EuiQuickSelect is rendered 1`] = `
 `;
 
 exports[`EuiQuickSelect prevQuickSelect 1`] = `
-<fieldset>
+<fieldset
+  onKeyDown={[Function]}
+>
   <EuiI18n
     default="Quick select a time range"
     token="euiQuickSelect.legendText"
diff --git a/src/components/date_picker/super_date_picker/quick_select_popover/quick_select.js b/src/components/date_picker/super_date_picker/quick_select_popover/quick_select.js
index 7a76dc2e052..546a113ea69 100644
--- a/src/components/date_picker/super_date_picker/quick_select_popover/quick_select.js
+++ b/src/components/date_picker/super_date_picker/quick_select_popover/quick_select.js
@@ -57,7 +57,7 @@ export class EuiQuickSelect extends Component {
     });
   };
 
-  handelKeyDown = ({ key }) => {
+  handleKeyDown = ({ key }) => {
     if (key === 'Enter') this.applyQuickSelect();
   };
 
@@ -126,7 +126,8 @@ export class EuiQuickSelect extends Component {
     const legendId = this.generateId();
 
     return (
-      <div onKeyDown={this.handelKeyDown}>
+      // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
+      <fieldset onKeyDown={this.handleKeyDown}>
         <EuiI18n
           token="euiQuickSelect.legendText"
           default="Quick select a time range">
@@ -261,7 +262,7 @@ export class EuiQuickSelect extends Component {
             />
           </p>
         </EuiScreenReaderOnly>
-      </div>
+      </fieldset>
     );
   }
 }
diff --git a/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js b/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js
index 216514c6c60..05ebe1b905e 100644
--- a/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js
+++ b/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js
@@ -90,8 +90,8 @@ export class EuiRefreshInterval extends Component {
     );
   };
 
-  handelKeyDown = ({ key }) => {
-    if (key === 'Enter') this.toogleRefresh();
+  handleKeyDown = ({ key }) => {
+    if (key === 'Enter') this.applyRefreshInterval();
   };
 
   applyRefreshInterval = () => {
@@ -110,7 +110,7 @@ export class EuiRefreshInterval extends Component {
     });
   };
 
-  toogleRefresh = () => {
+  toggleRefresh = () => {
     this.props.applyRefreshInterval({
       refreshInterval: toMilliseconds(this.state.units, this.state.value),
       isPaused: !this.props.isPaused,
@@ -127,7 +127,8 @@ export class EuiRefreshInterval extends Component {
     }
 
     return (
-      <div onKeyDown={this.handelKeyDown}>
+      //   eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
+      <fieldset onKeyDown={this.handleKeyDown}>
         <EuiTitle size="xxxs">
           <legend id={legendId}>
             <EuiI18n
@@ -164,7 +165,7 @@ export class EuiRefreshInterval extends Component {
               className="euiRefreshInterval__startButton"
               iconType={this.props.isPaused ? 'play' : 'stop'}
               size="s"
-              onClick={this.toogleRefresh}
+              onClick={this.toggleRefresh}
               disabled={value === '' || value <= 0}
               data-test-subj="superDatePickerToggleRefreshButton"
               aria-describedby={`${refreshSelectionId} ${legendId}`}>
@@ -190,7 +191,7 @@ export class EuiRefreshInterval extends Component {
             />
           </p>
         </EuiScreenReaderOnly>
-      </div>
+      </fieldset>
     );
   }
 }

From a3fdaba165fb85fb67e8a4224f44584e7e7132a7 Mon Sep 17 00:00:00 2001
From: Anish Aggarwal <anish17122000@gmail.com>
Date: Sat, 14 Mar 2020 02:06:48 +0530
Subject: [PATCH 5/9] used role and updated snap

---
 .../__snapshots__/quick_select.test.js.snap                    | 2 ++
 .../super_date_picker/quick_select_popover/quick_select.js     | 3 +--
 .../super_date_picker/quick_select_popover/refresh_interval.js | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/date_picker/super_date_picker/quick_select_popover/__snapshots__/quick_select.test.js.snap b/src/components/date_picker/super_date_picker/quick_select_popover/__snapshots__/quick_select.test.js.snap
index a0a43ef1871..dce8845c678 100644
--- a/src/components/date_picker/super_date_picker/quick_select_popover/__snapshots__/quick_select.test.js.snap
+++ b/src/components/date_picker/super_date_picker/quick_select_popover/__snapshots__/quick_select.test.js.snap
@@ -3,6 +3,7 @@
 exports[`EuiQuickSelect is rendered 1`] = `
 <fieldset
   onKeyDown={[Function]}
+  role="presentation"
 >
   <EuiI18n
     default="Quick select a time range"
@@ -131,6 +132,7 @@ exports[`EuiQuickSelect is rendered 1`] = `
 exports[`EuiQuickSelect prevQuickSelect 1`] = `
 <fieldset
   onKeyDown={[Function]}
+  role="presentation"
 >
   <EuiI18n
     default="Quick select a time range"
diff --git a/src/components/date_picker/super_date_picker/quick_select_popover/quick_select.js b/src/components/date_picker/super_date_picker/quick_select_popover/quick_select.js
index 546a113ea69..f9045b9186c 100644
--- a/src/components/date_picker/super_date_picker/quick_select_popover/quick_select.js
+++ b/src/components/date_picker/super_date_picker/quick_select_popover/quick_select.js
@@ -126,8 +126,7 @@ export class EuiQuickSelect extends Component {
     const legendId = this.generateId();
 
     return (
-      // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
-      <fieldset onKeyDown={this.handleKeyDown}>
+      <fieldset role="presentation" onKeyDown={this.handleKeyDown}>
         <EuiI18n
           token="euiQuickSelect.legendText"
           default="Quick select a time range">
diff --git a/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js b/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js
index 05ebe1b905e..0d5064c6813 100644
--- a/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js
+++ b/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js
@@ -127,8 +127,7 @@ export class EuiRefreshInterval extends Component {
     }
 
     return (
-      //   eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
-      <fieldset onKeyDown={this.handleKeyDown}>
+      <fieldset role="presentation" onKeyDown={this.handleKeyDown}>
         <EuiTitle size="xxxs">
           <legend id={legendId}>
             <EuiI18n

From 8ca522ab7b1b07069862131f04faa5e279007689 Mon Sep 17 00:00:00 2001
From: Anish Aggarwal <anish17122000@gmail.com>
Date: Mon, 16 Mar 2020 23:42:20 +0530
Subject: [PATCH 6/9] updated  functionality

---
 .../quick_select_popover/refresh_interval.js      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js b/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js
index 0d5064c6813..3b49da7c065 100644
--- a/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js
+++ b/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js
@@ -90,8 +90,21 @@ export class EuiRefreshInterval extends Component {
     );
   };
 
+  startRefresh = () => {
+    const { value, units } = this.state;
+    const isValid = value === '' || value <= 0;
+    if (isValid) {
+      this.props.applyRefreshInterval({
+        refreshInterval: toMilliseconds(units, value),
+        isPaused: false,
+      });
+    }
+  };
+
   handleKeyDown = ({ key }) => {
-    if (key === 'Enter') this.applyRefreshInterval();
+    if (key === 'Enter') {
+      this.startRefresh();
+    }
   };
 
   applyRefreshInterval = () => {

From 6d9b9039cfec99f8472bc9829037dc69225f937c Mon Sep 17 00:00:00 2001
From: Anish Aggarwal <anish17122000@gmail.com>
Date: Tue, 17 Mar 2020 11:57:17 +0530
Subject: [PATCH 7/9] removed keydown from fieldset

---
 .../__snapshots__/quick_select.test.js.snap          | 12 ++++--------
 .../quick_select_popover/quick_select.js             |  6 +++++-
 .../quick_select_popover/refresh_interval.js         |  5 ++++-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/components/date_picker/super_date_picker/quick_select_popover/__snapshots__/quick_select.test.js.snap b/src/components/date_picker/super_date_picker/quick_select_popover/__snapshots__/quick_select.test.js.snap
index dce8845c678..94280605f3f 100644
--- a/src/components/date_picker/super_date_picker/quick_select_popover/__snapshots__/quick_select.test.js.snap
+++ b/src/components/date_picker/super_date_picker/quick_select_popover/__snapshots__/quick_select.test.js.snap
@@ -1,10 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`EuiQuickSelect is rendered 1`] = `
-<fieldset
-  onKeyDown={[Function]}
-  role="presentation"
->
+<fieldset>
   <EuiI18n
     default="Quick select a time range"
     token="euiQuickSelect.legendText"
@@ -97,6 +94,7 @@ exports[`EuiQuickSelect is rendered 1`] = `
         className="euiQuickSelect__applyButton"
         disabled={false}
         onClick={[Function]}
+        onKeyDown={[Function]}
         size="s"
       >
         <EuiI18n
@@ -130,10 +128,7 @@ exports[`EuiQuickSelect is rendered 1`] = `
 `;
 
 exports[`EuiQuickSelect prevQuickSelect 1`] = `
-<fieldset
-  onKeyDown={[Function]}
-  role="presentation"
->
+<fieldset>
   <EuiI18n
     default="Quick select a time range"
     token="euiQuickSelect.legendText"
@@ -226,6 +221,7 @@ exports[`EuiQuickSelect prevQuickSelect 1`] = `
         className="euiQuickSelect__applyButton"
         disabled={false}
         onClick={[Function]}
+        onKeyDown={[Function]}
         size="s"
       >
         <EuiI18n
diff --git a/src/components/date_picker/super_date_picker/quick_select_popover/quick_select.js b/src/components/date_picker/super_date_picker/quick_select_popover/quick_select.js
index f9045b9186c..8c55fb4a50f 100644
--- a/src/components/date_picker/super_date_picker/quick_select_popover/quick_select.js
+++ b/src/components/date_picker/super_date_picker/quick_select_popover/quick_select.js
@@ -126,7 +126,7 @@ export class EuiQuickSelect extends Component {
     const legendId = this.generateId();
 
     return (
-      <fieldset role="presentation" onKeyDown={this.handleKeyDown}>
+      <fieldset>
         <EuiI18n
           token="euiQuickSelect.legendText"
           default="Quick select a time range">
@@ -198,6 +198,7 @@ export class EuiQuickSelect extends Component {
               {tenseLabel => (
                 <EuiSelect
                   compressed
+                  onKeyDown={this.handleKeyDown}
                   aria-label={tenseLabel}
                   aria-describedby={`${timeSelectionId} ${legendId}`}
                   value={timeTense}
@@ -212,6 +213,7 @@ export class EuiQuickSelect extends Component {
               {valueLabel => (
                 <EuiFieldNumber
                   compressed
+                  onKeyDown={this.handleKeyDown}
                   aria-describedby={`${timeSelectionId} ${legendId}`}
                   aria-label={valueLabel}
                   value={timeValue}
@@ -225,6 +227,7 @@ export class EuiQuickSelect extends Component {
               {unitLabel => (
                 <EuiSelect
                   compressed
+                  onKeyDown={this.handleKeyDown}
                   aria-label={unitLabel}
                   aria-describedby={`${timeSelectionId} ${legendId}`}
                   value={timeUnits}
@@ -237,6 +240,7 @@ export class EuiQuickSelect extends Component {
           <EuiFlexItem grow={false}>
             <EuiButton
               aria-describedby={`${timeSelectionId} ${legendId}`}
+              onKeyDown={this.handleKeyDown}
               className="euiQuickSelect__applyButton"
               size="s"
               onClick={this.applyQuickSelect}
diff --git a/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js b/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js
index 3b49da7c065..920db6d11ee 100644
--- a/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js
+++ b/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js
@@ -140,7 +140,7 @@ export class EuiRefreshInterval extends Component {
     }
 
     return (
-      <fieldset role="presentation" onKeyDown={this.handleKeyDown}>
+      <fieldset>
         <EuiTitle size="xxxs">
           <legend id={legendId}>
             <EuiI18n
@@ -156,6 +156,7 @@ export class EuiRefreshInterval extends Component {
               compressed
               value={value}
               onChange={this.onValueChange}
+              onKeyDown={this.handleKeyDown}
               aria-label="Refresh interval value"
               aria-describedby={`${refreshSelectionId} ${legendId}`}
               data-test-subj="superDatePickerRefreshIntervalInput"
@@ -169,6 +170,7 @@ export class EuiRefreshInterval extends Component {
               value={units}
               options={refreshUnitsOptions}
               onChange={this.onUnitsChange}
+              onKeyDown={this.handleKeyDown}
               data-test-subj="superDatePickerRefreshIntervalUnitsSelect"
             />
           </EuiFlexItem>
@@ -178,6 +180,7 @@ export class EuiRefreshInterval extends Component {
               iconType={this.props.isPaused ? 'play' : 'stop'}
               size="s"
               onClick={this.toggleRefresh}
+              onKeyDown={this.handleKeyDown}
               disabled={value === '' || value <= 0}
               data-test-subj="superDatePickerToggleRefreshButton"
               aria-describedby={`${refreshSelectionId} ${legendId}`}>

From e3f477cdc4597b84ff247a9f29c1f77fb76efb5b Mon Sep 17 00:00:00 2001
From: Anish Aggarwal <43617894+anishagg17@users.noreply.github.com>
Date: Tue, 17 Mar 2020 21:04:45 +0530
Subject: [PATCH 8/9] Update
 src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js

Co-Authored-By: Chandler Prall <chandler.prall@gmail.com>
---
 .../super_date_picker/quick_select_popover/refresh_interval.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js b/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js
index 920db6d11ee..f13f6fba5cb 100644
--- a/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js
+++ b/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js
@@ -92,7 +92,7 @@ export class EuiRefreshInterval extends Component {
 
   startRefresh = () => {
     const { value, units } = this.state;
-    const isValid = value === '' || value <= 0;
+    const isValid = value !== '' || value > 0;
     if (isValid) {
       this.props.applyRefreshInterval({
         refreshInterval: toMilliseconds(units, value),

From 26590e09ea950af1480cf25321de88a3e1ef2e19 Mon Sep 17 00:00:00 2001
From: Anish Aggarwal <anish17122000@gmail.com>
Date: Tue, 17 Mar 2020 21:15:12 +0530
Subject: [PATCH 9/9] removed uneccessary onKeyDown

---
 .../__snapshots__/quick_select.test.js.snap                     | 2 --
 .../super_date_picker/quick_select_popover/quick_select.js      | 1 -
 .../super_date_picker/quick_select_popover/refresh_interval.js  | 1 -
 3 files changed, 4 deletions(-)

diff --git a/src/components/date_picker/super_date_picker/quick_select_popover/__snapshots__/quick_select.test.js.snap b/src/components/date_picker/super_date_picker/quick_select_popover/__snapshots__/quick_select.test.js.snap
index 94280605f3f..5edeb5a2be3 100644
--- a/src/components/date_picker/super_date_picker/quick_select_popover/__snapshots__/quick_select.test.js.snap
+++ b/src/components/date_picker/super_date_picker/quick_select_popover/__snapshots__/quick_select.test.js.snap
@@ -94,7 +94,6 @@ exports[`EuiQuickSelect is rendered 1`] = `
         className="euiQuickSelect__applyButton"
         disabled={false}
         onClick={[Function]}
-        onKeyDown={[Function]}
         size="s"
       >
         <EuiI18n
@@ -221,7 +220,6 @@ exports[`EuiQuickSelect prevQuickSelect 1`] = `
         className="euiQuickSelect__applyButton"
         disabled={false}
         onClick={[Function]}
-        onKeyDown={[Function]}
         size="s"
       >
         <EuiI18n
diff --git a/src/components/date_picker/super_date_picker/quick_select_popover/quick_select.js b/src/components/date_picker/super_date_picker/quick_select_popover/quick_select.js
index 8c55fb4a50f..08a1cc5322e 100644
--- a/src/components/date_picker/super_date_picker/quick_select_popover/quick_select.js
+++ b/src/components/date_picker/super_date_picker/quick_select_popover/quick_select.js
@@ -240,7 +240,6 @@ export class EuiQuickSelect extends Component {
           <EuiFlexItem grow={false}>
             <EuiButton
               aria-describedby={`${timeSelectionId} ${legendId}`}
-              onKeyDown={this.handleKeyDown}
               className="euiQuickSelect__applyButton"
               size="s"
               onClick={this.applyQuickSelect}
diff --git a/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js b/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js
index f13f6fba5cb..92f8f17bda2 100644
--- a/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js
+++ b/src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js
@@ -180,7 +180,6 @@ export class EuiRefreshInterval extends Component {
               iconType={this.props.isPaused ? 'play' : 'stop'}
               size="s"
               onClick={this.toggleRefresh}
-              onKeyDown={this.handleKeyDown}
               disabled={value === '' || value <= 0}
               data-test-subj="superDatePickerToggleRefreshButton"
               aria-describedby={`${refreshSelectionId} ${legendId}`}>