Merge pull request #11990 from influxdata/feat/time-range-calendar

feat(ui): Add custom time range option in time range dropdown
influxdata · Feb 20, 2019 · d895f5a · d895f5a
2 parents ec1019b + f9aab0f
commit d895f5a
Show file tree

Hide file tree

Showing 14 changed files with 649 additions and 265 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### Features
 1. [11954](https://github.com/influxdata/influxdb/pull/11954): Add the ability to run a task manually from tasks page
+1. [11990](https://github.com/influxdata/influxdb/pull/11990): Add the ability to select a custom time range in explorer and dashboard
 
 ### Bug Fixes
 

diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -161,6 +161,7 @@
     "react": "^16.8.0",
     "react-codemirror2": "^4.2.1",
     "react-copy-to-clipboard": "^5.0.1",
+    "react-datepicker": "^2.1.0",
     "react-dimensions": "^1.2.0",
     "react-dnd": "^2.6.0",
     "react-dnd-html5-backend": "^2.6.0",

diff --git a/ui/src/shared/components/ClickOutside.tsx b/ui/src/shared/components/ClickOutside.tsx
@@ -10,11 +10,11 @@ interface Props {
 @ErrorHandling
 export class ClickOutside extends PureComponent<Props> {
   public componentDidMount() {
-    document.addEventListener('click', this.handleClickOutside, true)
+    document.addEventListener('mousedown', this.handleClickOutside, true)
   }
 
   public componentWillUnmount() {
-    document.removeEventListener('click', this.handleClickOutside, true)
+    document.removeEventListener('mousedown', this.handleClickOutside, true)
   }
 
   public render() {