From 93e7f2890387c5db20b6e1ec8cedf8a4cb384800 Mon Sep 17 00:00:00 2001
From: Beto Dealmeida <roberto@dealmeida.net>
Date: Mon, 12 Mar 2018 12:37:54 -0700
Subject: [PATCH 1/2] Pass width in props

---
 .../assets/javascripts/explore/components/ExploreChartPanel.jsx  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/superset/assets/javascripts/explore/components/ExploreChartPanel.jsx b/superset/assets/javascripts/explore/components/ExploreChartPanel.jsx
index bfb24fff7f1ec..1ccab1afa3edf 100644
--- a/superset/assets/javascripts/explore/components/ExploreChartPanel.jsx
+++ b/superset/assets/javascripts/explore/components/ExploreChartPanel.jsx
@@ -44,6 +44,7 @@ class ExploreChartPanel extends React.PureComponent {
         datasource={this.props.datasource}
         formData={this.props.form_data}
         height={this.getHeight()}
+        width={parseInt(this.props.width, 10)}
         slice={this.props.slice}
         chartKey={this.props.chart.chartKey}
         setControlValue={this.props.actions.setControlValue}

From 25ecd09f6cede50fea3b4a9a516d3b9b637b2d4c Mon Sep 17 00:00:00 2001
From: Beto Dealmeida <roberto@dealmeida.net>
Date: Mon, 12 Mar 2018 13:30:14 -0700
Subject: [PATCH 2/2] Only load overlay if container is set

---
 superset/assets/javascripts/chart/Chart.jsx                      | 1 +
 .../assets/javascripts/explore/components/ExploreChartPanel.jsx  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset/assets/javascripts/chart/Chart.jsx b/superset/assets/javascripts/chart/Chart.jsx
index 54736e53cbf91..4b4410640abe1 100644
--- a/superset/assets/javascripts/chart/Chart.jsx
+++ b/superset/assets/javascripts/chart/Chart.jsx
@@ -223,6 +223,7 @@ class Chart extends React.PureComponent {
           !this.props.chartAlert &&
           this.props.refreshOverlayVisible &&
           !this.props.errorMessage &&
+          this.container &&
           <RefreshChartOverlay
             height={this.height()}
             width={this.width()}
diff --git a/superset/assets/javascripts/explore/components/ExploreChartPanel.jsx b/superset/assets/javascripts/explore/components/ExploreChartPanel.jsx
index 1ccab1afa3edf..bfb24fff7f1ec 100644
--- a/superset/assets/javascripts/explore/components/ExploreChartPanel.jsx
+++ b/superset/assets/javascripts/explore/components/ExploreChartPanel.jsx
@@ -44,7 +44,6 @@ class ExploreChartPanel extends React.PureComponent {
         datasource={this.props.datasource}
         formData={this.props.form_data}
         height={this.getHeight()}
-        width={parseInt(this.props.width, 10)}
         slice={this.props.slice}
         chartKey={this.props.chart.chartKey}
         setControlValue={this.props.actions.setControlValue}