Revert "[Vega] Fix vega controls layout (elastic#130954)"

This reverts commit 8e09cdc.
flash1293 · Oct 11, 2022 · cd753c3 · cd753c3
1 parent a2f2bc5
commit cd753c3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 23 deletions.
diff --git a/src/plugins/vis_types/vega/public/__snapshots__/vega_visualization.test.js.snap b/src/plugins/vis_types/vega/public/__snapshots__/vega_visualization.test.js.snap
diff --git a/src/plugins/vis_types/vega/public/components/vega_vis.scss b/src/plugins/vis_types/vega/public/components/vega_vis.scss
@@ -14,21 +14,15 @@
   // flex-direction determined by js
 }
 
-.vgaVis--autoresize {
-  @include euiScrollBar;
-  max-width: 100%;
-  max-height: 100%;
-  overflow: auto;
-  .vgaVis__view {
-    overflow: hidden;
-  }
-}
-
 .vgaVis__view {
   z-index: 0;
   flex: 1 1 100%;
 
   display: block;
+  max-width: 100%;
+  max-height: 100%;
+  width: 100%;
+  height: 100%;
 
   canvas {
     display: block;

diff --git a/src/plugins/vis_types/vega/public/vega_view/vega_base_view.js b/src/plugins/vis_types/vega/public/vega_view/vega_base_view.js
@@ -99,11 +99,6 @@ export class VegaBaseView {
     this._initialized = true;
 
     try {
-      if (this._parser.useResize) {
-        this._$parentEl.addClass('vgaVis--autoresize');
-      } else {
-        this._$parentEl.removeClass('vgaVis--autoresize');
-      }
       this._$parentEl.empty().addClass(`vgaVis`).css('flex-direction', this._parser.containerDir);
 
       // bypass the onWarn warning checks - in some cases warnings may still need to be shown despite being disabled
@@ -116,7 +111,10 @@ export class VegaBaseView {
         return;
       }
 
-      this._$container = $('<div class="vgaVis__view">').appendTo(this._$parentEl);
+      this._$container = $('<div class="vgaVis__view">')
+        // Force a height here because css is not loaded in mocha test
+        .css('height', '100%')
+        .appendTo(this._$parentEl);
       this._$controls = $(
         `<div class="vgaVis__controls vgaVis__controls--${this._parser.controlsDir}">`
       ).appendTo(this._$parentEl);
@@ -267,9 +265,9 @@ export class VegaBaseView {
     }
   }
 
-  async resize() {
+  async resize(dimensions) {
     if (this._parser.useResize && this._view) {
-      this.updateVegaSize(this._view);
+      this.updateVegaSize(this._view, dimensions);
       await this._view.runAsync();
 
       // The derived class should create this method

diff --git a/src/plugins/vis_types/vega/public/vega_view/vega_view.js b/src/plugins/vis_types/vega/public/vega_view/vega_view.js
@@ -18,8 +18,6 @@ export class VegaView extends VegaBaseView {
 
     if (this._parser.useResize) this.updateVegaSize(view);
     view.initialize(this._$container.get(0), this._$controls.get(0));
-    // resize again to take controls into account
-    if (this._parser.useResize) this.updateVegaSize(view);
 
     if (this._parser.useHover) view.hover();