From a8d508b1217a268e3f9c8a473884c59a9592c1ba Mon Sep 17 00:00:00 2001
From: cchaos <caroline.horn@elastic.co>
Date: Fri, 25 Oct 2019 14:37:50 -0400
Subject: [PATCH] More layout fixes

- Hide chart if Empty not Loading
- Fix relative positioning for progress bar since className is no longer passed (super hacky)
---
 .../public/np_ready/public/_expression_renderer.scss      | 8 +++++---
 .../public/np_ready/public/expression_renderer.tsx        | 2 +-
 .../editor_frame/_expression_renderer.scss                | 5 +++++
 .../editor_frame/_suggestion_panel.scss                   | 5 ++++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/_expression_renderer.scss b/src/legacy/core_plugins/expressions/public/np_ready/public/_expression_renderer.scss
index 0842ced014c42..4f030384ed883 100644
--- a/src/legacy/core_plugins/expressions/public/np_ready/public/_expression_renderer.scss
+++ b/src/legacy/core_plugins/expressions/public/np_ready/public/_expression_renderer.scss
@@ -12,7 +12,9 @@
   height: 100%;
 }
 
-.expExpressionRenderer-isLoading .expExpressionRenderer__expression,
-.expExpressionRenderer-hasError .expExpressionRenderer__expression {
-  display: none;
+.expExpressionRenderer-isEmpty,
+.expExpressionRenderer-hasError {
+  .expExpressionRenderer__expression {
+    display: none;
+  }
 }
diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/expression_renderer.tsx b/src/legacy/core_plugins/expressions/public/np_ready/public/expression_renderer.tsx
index edb17dad211e3..8359663610f29 100644
--- a/src/legacy/core_plugins/expressions/public/np_ready/public/expression_renderer.tsx
+++ b/src/legacy/core_plugins/expressions/public/np_ready/public/expression_renderer.tsx
@@ -111,7 +111,7 @@ export const ExpressionRendererImplementation = ({
   }, []);
 
   const classes = classNames('expExpressionRenderer', {
-    'expExpressionRenderer-isLoading': state.isLoading,
+    'expExpressionRenderer-isEmpty': state.isEmpty,
     'expExpressionRenderer-hasError': !!state.error,
   });
 
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/_expression_renderer.scss b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/_expression_renderer.scss
index 582487d1125c1..8f8dc2323b0b7 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/_expression_renderer.scss
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/_expression_renderer.scss
@@ -1,7 +1,12 @@
 .lnsExpressionRenderer {
+  position: relative;
   width: 100%;
   height: 100%;
   display: flex;
   overflow-x: hidden;
   padding: $euiSize;
+
+  > .expExpressionRenderer {
+    position: static; // Let the progress indicator position itself against the outer parent
+  }
 }
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/_suggestion_panel.scss b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/_suggestion_panel.scss
index 5051feac7cd50..cb4ca425afc84 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/_suggestion_panel.scss
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/_suggestion_panel.scss
@@ -45,12 +45,15 @@
 }
 
 .lnsSuggestionPanel__chartWrapper {
-  position: static; // Let the progress indicator position itself against the button
   display: flex;
   height: 100%;
   width: 100%;
   pointer-events: none;
   padding: $euiSizeS;
+
+  > .expExpressionRenderer {
+    position: static; // Let the progress indicator position itself against the button
+  }
 }
 
 .lnsSuggestionPanel__chartWrapper--withLabel {