From 077599d1ccb9d7fe17ab42d3dd927a660eb1d474 Mon Sep 17 00:00:00 2001
From: Daniel <50356015+danny007in@users.noreply.github.com>
Date: Tue, 22 Dec 2020 14:47:18 +0530
Subject: [PATCH] Layout Height Fixed (#3214)

---
 build/js/Layout.js      | 28 +++++++---------------------
 build/scss/_layout.scss |  2 ++
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/build/js/Layout.js b/build/js/Layout.js
index ce0d68af8..0a752d7f4 100644
--- a/build/js/Layout.js
+++ b/build/js/Layout.js
@@ -50,8 +50,6 @@ class Layout {
   constructor(element, config) {
     this._config = config
     this._element = element
-
-    this._init()
   }
 
   // Public
@@ -90,10 +88,6 @@ class Layout {
         $contentSelector.css(this._config.panelAutoHeightMode, (max + offset) - heights.header)
       }
 
-      if (heights.controlSidebar + heights.footer >= heights.sidebar && heights.controlSidebar != 0) {
-        $contentSelector.css(this._config.panelAutoHeightMode, (heights.controlSidebar + offset))
-      }
-
       if (this._isFooterFixed()) {
         $contentSelector.css(this._config.panelAutoHeightMode, parseFloat($contentSelector.css(this._config.panelAutoHeightMode)) + heights.footer)
       }
@@ -103,10 +97,6 @@ class Layout {
       return
     }
 
-    if (offset !== false) {
-      $contentSelector.css(this._config.panelAutoHeightMode, (max + offset) - heights.header - heights.footer)
-    }
-
     if (typeof $.fn.overlayScrollbars !== 'undefined') {
       $(SELECTOR_SIDEBAR).overlayScrollbars({
         className: this._config.scrollbarTheme,
@@ -180,10 +170,6 @@ class Layout {
       this.fixLayoutHeight()
     })
 
-    $(document).ready(() => {
-      this.fixLayoutHeight()
-    })
-
     setTimeout(() => {
       $('body.hold-transition').removeClass('hold-transition')
     }, 50)
@@ -236,13 +222,13 @@ $(window).on('load', () => {
   Layout._jQueryInterface.call($('body'))
 })
 
-$(`${SELECTOR_SIDEBAR} a`).on('focusin', () => {
-  $(SELECTOR_MAIN_SIDEBAR).addClass(CLASS_NAME_SIDEBAR_FOCUSED)
-})
-
-$(`${SELECTOR_SIDEBAR} a`).on('focusout', () => {
-  $(SELECTOR_MAIN_SIDEBAR).removeClass(CLASS_NAME_SIDEBAR_FOCUSED)
-})
+$(`${SELECTOR_SIDEBAR} a`)
+  .on('focusin', () => {
+    $(SELECTOR_MAIN_SIDEBAR).addClass(CLASS_NAME_SIDEBAR_FOCUSED)
+  })
+  .on('focusout', () => {
+    $(SELECTOR_MAIN_SIDEBAR).removeClass(CLASS_NAME_SIDEBAR_FOCUSED)
+  })
 
 /**
  * jQuery API
diff --git a/build/scss/_layout.scss b/build/scss/_layout.scss
index b1798f293..88530dcd1 100644
--- a/build/scss/_layout.scss
+++ b/build/scss/_layout.scss
@@ -579,6 +579,8 @@ body:not(.layout-fixed) {
 
     .control-sidebar-content {
       height: calc(100vh - #{$main-header-height});
+      overflow-y: auto;
+      scrollbar-width: thin;
     }
   }
 }