From 09c56567038987a996d90a296dbe45e88ac9668f Mon Sep 17 00:00:00 2001
From: Tom Robinson <tlrobinson@gmail.com>
Date: Wed, 21 Dec 2016 15:50:02 -0800
Subject: [PATCH] Disable esc to dismiss aggregation popover
---
frontend/src/metabase/components/Popover.jsx | 2 +-
.../src/metabase/query_builder/components/AggregationWidget.jsx | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/frontend/src/metabase/components/Popover.jsx b/frontend/src/metabase/components/Popover.jsx
index fd31dbff496..164a806f712 100644
--- a/frontend/src/metabase/components/Popover.jsx
+++ b/frontend/src/metabase/components/Popover.jsx
@@ -86,7 +86,7 @@ export default class Popover extends Component {
_popoverComponent() {
return (
- <OnClickOutsideWrapper handleDismissal={this.handleDismissal}>
+ <OnClickOutsideWrapper handleDismissal={this.handleDismissal} dismissOnEscape={this.props.dismissOnEscape} dismissOnClickOutside={this.props.dismissOnClickOutside}>
<div id={this.props.id} className={cx("PopoverBody", { "PopoverBody--withArrow": this.props.hasArrow }, this.props.className)}>
{ typeof this.props.children === "function" ?
this.props.children()
diff --git a/frontend/src/metabase/query_builder/components/AggregationWidget.jsx b/frontend/src/metabase/query_builder/components/AggregationWidget.jsx
index 01a8782828c..96c9e0425e1 100644
--- a/frontend/src/metabase/query_builder/components/AggregationWidget.jsx
+++ b/frontend/src/metabase/query_builder/components/AggregationWidget.jsx
@@ -98,6 +98,7 @@ export default class AggregationWidget extends Component {
className="FilterPopover"
isInitiallyOpen={true}
onClose={this.close}
+ dismissOnEscape={false} // disable for expression editor
>
<AggregationPopover
aggregation={aggregation}
--
GitLab