Merge pull request getredash#2372 from kravets-levko/fix/dancing-widgets

Fix: dashboard "dancing" widgets (when auto-height enabled)
KiiCorp · Mar 6, 2018 · 88deb5f · 88deb5f
2 parents 051f12c + 27c7e86
commit 88deb5f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/client/app/directives/gridster-auto-height.js b/client/app/directives/gridster-auto-height.js
@@ -50,7 +50,9 @@ function gridsterAutoHeight($timeout, $parse) {
               }))
               .value();
 
-            const additionalHeight = 100 + _.last(controller.gridster.margins);
+            // Height of controls outside visualization area
+            const additionalHeight = $element[0].offsetHeight - element.offsetHeight
+              + _.last(controller.gridster.margins);
             const contentsHeight = childrenBounds.bottom - childrenBounds.top;
             $timeout(() => {
               const sizeY = Math.ceil((contentsHeight + additionalHeight) /

diff --git a/client/app/pages/dashboards/dashboard.less b/client/app/pages/dashboards/dashboard.less
@@ -106,5 +106,9 @@
     .spinner {
       position: static;
     }
+
+    .scrollbox {
+      overflow-y: hidden;
+    }
   }
 }